Bump version to 2026.4.0b10

Co-authored-by: Franck Nijhof <git@frenck.dev>
Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

.strict-typing

@@ -174,7 +174,6 @@ homeassistant.components.dnsip.*
 homeassistant.components.doorbird.*
 homeassistant.components.dormakaba_dkey.*
 homeassistant.components.downloader.*
-homeassistant.components.dropbox.*
 homeassistant.components.droplet.*
 homeassistant.components.dsmr.*
 homeassistant.components.duckdns.*

CODEOWNERS

@@ -401,8 +401,6 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
-/homeassistant/components/dropbox/ @bdr99
-/tests/components/dropbox/ @bdr99
 /homeassistant/components/droplet/ @sarahseidman
 /tests/components/droplet/ @sarahseidman
 /homeassistant/components/dsmr/ @Robbie1221

homeassistant/bootstrap.py

@@ -238,7 +238,9 @@ DEFAULT_INTEGRATIONS = {
     "timer",
     #
     # Base platforms:
-    *BASE_PLATFORMS,
+    # Note: Calendar and todo are not included to prevent them from registering
+    # their frontend panels when there are no calendar or todo integrations.
+    *(BASE_PLATFORMS - {"calendar", "todo"}),
     #
     # Integrations providing triggers and conditions for base platforms:
     "air_quality",

homeassistant/brands/bega.json

@@ -0,0 +1,5 @@
+{
+  "domain": "bega",
+  "name": "BEGA",
+  "iot_standards": ["zigbee"]
+}

homeassistant/components/air_quality/strings.json

@@ -1,25 +1,18 @@
 {
   "common": {
-    "condition_behavior_description": "How the value should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_co2_value": {
       "description": "Tests the carbon dioxide level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -29,7 +22,6 @@
       "description": "Tests if one or more carbon monoxide sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -39,7 +31,6 @@
       "description": "Tests if one or more carbon monoxide sensors are detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -49,11 +40,9 @@
       "description": "Tests the carbon monoxide level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -63,7 +52,6 @@
       "description": "Tests if one or more gas sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -73,7 +61,6 @@
       "description": "Tests if one or more gas sensors are detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -83,11 +70,9 @@
       "description": "Tests the nitrous oxide level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -97,11 +82,9 @@
       "description": "Tests the nitrogen dioxide level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -111,11 +94,9 @@
       "description": "Tests the nitrogen monoxide level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -125,11 +106,9 @@
       "description": "Tests the ozone level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -139,11 +118,9 @@
       "description": "Tests the PM10 level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -153,11 +130,9 @@
       "description": "Tests the PM1 level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -167,11 +142,9 @@
       "description": "Tests the PM2.5 level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -181,11 +154,9 @@
       "description": "Tests the PM4 level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -195,7 +166,6 @@
       "description": "Tests if one or more smoke sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -205,7 +175,6 @@
       "description": "Tests if one or more smoke sensors are detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -215,11 +184,9 @@
       "description": "Tests the sulphur dioxide level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -229,11 +196,9 @@
       "description": "Tests the volatile organic compounds ratio of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -243,11 +208,9 @@
       "description": "Tests the volatile organic compounds level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
@@ -275,7 +238,6 @@
       "description": "Triggers after one or more carbon dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -285,11 +247,9 @@
       "description": "Triggers after one or more carbon dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -299,7 +259,6 @@
       "description": "Triggers after one or more carbon monoxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -309,7 +268,6 @@
       "description": "Triggers after one or more carbon monoxide sensors stop detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -319,11 +277,9 @@
       "description": "Triggers after one or more carbon monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -333,7 +289,6 @@
       "description": "Triggers after one or more carbon monoxide sensors start detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -343,7 +298,6 @@
       "description": "Triggers after one or more gas sensors stop detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -353,7 +307,6 @@
       "description": "Triggers after one or more gas sensors start detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -363,7 +316,6 @@
       "description": "Triggers after one or more nitrous oxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -373,11 +325,9 @@
       "description": "Triggers after one or more nitrous oxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -387,7 +337,6 @@
       "description": "Triggers after one or more nitrogen dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -397,11 +346,9 @@
       "description": "Triggers after one or more nitrogen dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -411,7 +358,6 @@
       "description": "Triggers after one or more nitrogen monoxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -421,11 +367,9 @@
       "description": "Triggers after one or more nitrogen monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -435,7 +379,6 @@
       "description": "Triggers after one or more ozone levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -445,11 +388,9 @@
       "description": "Triggers after one or more ozone levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -459,7 +400,6 @@
       "description": "Triggers after one or more PM10 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -469,11 +409,9 @@
       "description": "Triggers after one or more PM10 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -483,7 +421,6 @@
       "description": "Triggers after one or more PM1 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -493,11 +430,9 @@
       "description": "Triggers after one or more PM1 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -507,7 +442,6 @@
       "description": "Triggers after one or more PM2.5 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -517,11 +451,9 @@
       "description": "Triggers after one or more PM2.5 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -531,7 +463,6 @@
       "description": "Triggers after one or more PM4 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -541,11 +472,9 @@
       "description": "Triggers after one or more PM4 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -555,7 +484,6 @@
       "description": "Triggers after one or more smoke sensors stop detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -565,7 +493,6 @@
       "description": "Triggers after one or more smoke sensors start detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -575,7 +502,6 @@
       "description": "Triggers after one or more sulphur dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -585,11 +511,9 @@
       "description": "Triggers after one or more sulphur dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -599,7 +523,6 @@
       "description": "Triggers after one or more volatile organic compound levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -609,11 +532,9 @@
       "description": "Triggers after one or more volatile organic compounds levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -623,7 +544,6 @@
       "description": "Triggers after one or more volatile organic compound ratios change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -633,11 +553,9 @@
       "description": "Triggers after one or more volatile organic compounds ratios cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },

homeassistant/components/alarm_control_panel/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted alarms.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted alarms to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_armed": {
       "description": "Tests if one or more alarms are armed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more alarms are armed in away mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more alarms are armed in home mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more alarms are armed in night mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more alarms are armed in vacation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -60,7 +53,6 @@
       "description": "Tests if one or more alarms are disarmed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -70,7 +62,6 @@
       "description": "Tests if one or more alarms are triggered.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -242,7 +233,6 @@
       "description": "Triggers after one or more alarms become armed, regardless of the mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -252,7 +242,6 @@
       "description": "Triggers after one or more alarms become armed in away mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -262,7 +251,6 @@
       "description": "Triggers after one or more alarms become armed in home mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -272,7 +260,6 @@
       "description": "Triggers after one or more alarms become armed in night mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -282,7 +269,6 @@
       "description": "Triggers after one or more alarms become armed in vacation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -292,7 +278,6 @@
       "description": "Triggers after one or more alarms become disarmed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -302,7 +287,6 @@
       "description": "Triggers after one or more alarms become triggered.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/analytics_insights/__init__.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 from python_homeassistant_analytics import (
+    Environment,
     HomeassistantAnalyticsClient,
     HomeassistantAnalyticsConnectionError,
 )
@@ -38,7 +39,7 @@ async def async_setup_entry(
     client = HomeassistantAnalyticsClient(session=async_get_clientsession(hass))
 
     try:
-        integrations = await client.get_integrations()
+        integrations = await client.get_integrations(Environment.NEXT)
     except HomeassistantAnalyticsConnectionError as ex:
         raise ConfigEntryNotReady("Could not fetch integration list") from ex
 

homeassistant/components/assist_satellite/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted Assist satellites.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_idle": {
       "description": "Tests if one or more Assist satellites are idle.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more Assist satellites are listening.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more Assist satellites are processing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more Assist satellites are responding.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -165,7 +159,6 @@
       "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -175,7 +168,6 @@
       "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -185,7 +177,6 @@
       "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -195,7 +186,6 @@
       "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/automation/__init__.py

@@ -122,7 +122,9 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "alarm_control_panel",
     "assist_satellite",
     "battery",
+    "calendar",
     "climate",
+    "counter",
     "cover",
     "device_tracker",
     "door",
@@ -147,7 +149,9 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "switch",
     "temperature",
     "text",
+    "timer",
     "vacuum",
+    "valve",
     "water_heater",
     "window",
 }
@@ -190,6 +194,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "todo",
     "update",
     "vacuum",
+    "valve",
     "water_heater",
     "window",
 }

homeassistant/components/backup/manager.py

@@ -12,7 +12,7 @@ import hashlib
 import io
 from itertools import chain
 import json
-from pathlib import Path, PurePath
+from pathlib import Path, PurePath, PureWindowsPath
 import shutil
 import sys
 import tarfile
@@ -1957,7 +1957,10 @@ class CoreBackupReaderWriter(BackupReaderWriter):
         suggested_filename: str,
     ) -> WrittenBackup:
         """Receive a backup."""
-        temp_file = Path(self.temp_backup_dir, suggested_filename)
+        safe_filename = PureWindowsPath(suggested_filename).name
+        if not safe_filename or safe_filename == "..":
+            safe_filename = "backup.tar"
+        temp_file = Path(self.temp_backup_dir, safe_filename)
 
         async_add_executor_job = self._hass.async_add_executor_job
         await async_add_executor_job(make_backup_dir, self.temp_backup_dir)

homeassistant/components/battery/strings.json

@@ -1,21 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted batteries.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted batteries to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_charging": {
       "description": "Tests if one or more batteries are charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -25,11 +19,9 @@
       "description": "Tests the battery level of one or more batteries.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::battery::common::condition_threshold_description%]",
           "name": "[%key:component::battery::common::condition_threshold_name%]"
         }
       },
@@ -39,7 +31,6 @@
       "description": "Tests if one or more batteries are low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -49,7 +40,6 @@
       "description": "Tests if one or more batteries are not charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -59,7 +49,6 @@
       "description": "Tests if one or more batteries are not low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -87,7 +76,6 @@
       "description": "Triggers after the battery level of one or more batteries changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::battery::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::battery::common::trigger_threshold_name%]"
         }
       },
@@ -97,11 +85,9 @@
       "description": "Triggers after the battery level of one or more batteries crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::battery::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::battery::common::trigger_threshold_name%]"
         }
       },
@@ -111,7 +97,6 @@
       "description": "Triggers after one or more batteries become low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
         }
       },
@@ -121,7 +106,6 @@
       "description": "Triggers after one or more batteries are no longer low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
         }
       },
@@ -131,7 +115,6 @@
       "description": "Triggers after one or more batteries start charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
         }
       },
@@ -141,7 +124,6 @@
       "description": "Triggers after one or more batteries stop charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/bmw_connected_drive/__init__.py

@@ -0,0 +1,41 @@
+"""The BMW Connected Drive integration."""
+
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+
+DOMAIN = "bmw_connected_drive"
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up BMW Connected Drive from a config entry."""
+    ir.async_create_issue(
+        hass,
+        DOMAIN,
+        DOMAIN,
+        is_fixable=False,
+        severity=ir.IssueSeverity.ERROR,
+        translation_key="integration_removed",
+        translation_placeholders={
+            "entries": "/config/integrations/integration/bmw_connected_drive",
+            "custom_component_url": "https://github.com/kvanbiesen/bmw-cardata-ha",
+        },
+    )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))

homeassistant/components/bmw_connected_drive/config_flow.py

@@ -0,0 +1,9 @@
+"""The BMW Connected Drive integration config flow."""
+
+from homeassistant.config_entries import ConfigFlow
+
+from . import DOMAIN
+
+
+class BMWConnectedDriveConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for BMW Connected Drive."""

homeassistant/components/bmw_connected_drive/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "bmw_connected_drive",
+  "name": "BMW Connected Drive",
+  "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
+  "integration_type": "system",
+  "iot_class": "cloud_polling",
+  "quality_scale": "legacy",
+  "requirements": []
+}

homeassistant/components/bmw_connected_drive/strings.json

@@ -0,0 +1,8 @@
+{
+  "issues": {
+    "integration_removed": {
+      "description": "The BMW Connected Drive integration has been removed from Home Assistant.\n\nIn September 2025, BMW blocked third-party access to their servers by adding additional security measures. For EU-registered cars, a community-developed [custom component]({custom_component_url}) using BMW's CarData API is available as an alternative.\n\nTo resolve this issue, please remove the (now defunct) integration entries from your Home Assistant setup. [Click here to see your existing BMW Connected Drive integration entries]({entries}).",
+      "title": "The BMW Connected Drive integration has been removed"
+    }
+  }
+}

homeassistant/components/calendar/condition.py

@@ -0,0 +1,16 @@
+"""Provides conditions for calendars."""
+
+from homeassistant.const import STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
+
+from .const import DOMAIN
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_event_active": make_entity_state_condition(DOMAIN, STATE_ON),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the calendar conditions."""
+    return CONDITIONS

homeassistant/components/calendar/conditions.yaml

@@ -0,0 +1,14 @@
+is_event_active:
+  target:
+    entity:
+      - domain: calendar
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any

homeassistant/components/calendar/icons.json

@@ -1,4 +1,9 @@
 {
+  "conditions": {
+    "is_event_active": {
+      "condition": "mdi:calendar-check"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:calendar",

homeassistant/components/calendar/strings.json

@@ -1,4 +1,18 @@
 {
+  "common": {
+    "condition_behavior_name": "Condition passes if"
+  },
+  "conditions": {
+    "is_event_active": {
+      "description": "Tests if one or more calendars have an active event.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::calendar::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Calendar event is active"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::calendar::title%]",
@@ -46,6 +60,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_offset_type": {
       "options": {
         "after": "After",

homeassistant/components/chess_com/config_flow.py

@@ -30,6 +30,7 @@ class ChessConfigFlow(ConfigFlow, domain=DOMAIN):
             client = ChessComClient(session=session)
             try:
                 user = await client.get_player(user_input[CONF_USERNAME])
+                await client.get_player_stats(user_input[CONF_USERNAME])
             except NotFoundError:
                 errors["base"] = "player_not_found"
             except Exception:

homeassistant/components/climate/strings.json

@@ -1,21 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted climate-control devices.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted climates to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_cooling": {
       "description": "Tests if one or more climate-control devices are cooling.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -25,7 +19,6 @@
       "description": "Tests if one or more climate-control devices are drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -35,7 +28,6 @@
       "description": "Tests if one or more climate-control devices are heating.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -45,7 +37,6 @@
       "description": "Tests if one or more climate-control devices are set to a specific HVAC mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
         "hvac_mode": {
@@ -59,7 +50,6 @@
       "description": "Tests if one or more climate-control devices are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -69,7 +59,6 @@
       "description": "Tests if one or more climate-control devices are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -79,11 +68,9 @@
       "description": "Tests the humidity setpoint of one or more climate-control devices.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::condition_threshold_description%]",
           "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
       },
@@ -93,11 +80,9 @@
       "description": "Tests the temperature setpoint of one or more climate-control devices.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::condition_threshold_description%]",
           "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
       },
@@ -398,7 +383,6 @@
       "description": "Triggers after the mode of one or more climate-control devices changes.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "hvac_mode": {
@@ -412,7 +396,6 @@
       "description": "Triggers after one or more climate-control devices start cooling.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -422,7 +405,6 @@
       "description": "Triggers after one or more climate-control devices start drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -432,7 +414,6 @@
       "description": "Triggers after one or more climate-control devices start heating.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -442,7 +423,6 @@
       "description": "Triggers after the humidity setpoint of one or more climate-control devices changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -452,11 +432,9 @@
       "description": "Triggers after the humidity setpoint of one or more climate-control devices crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -466,7 +444,6 @@
       "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -476,11 +453,9 @@
       "description": "Triggers after the temperature setpoint of one or more climate-control devices crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -490,7 +465,6 @@
       "description": "Triggers after one or more climate-control devices turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -500,7 +474,6 @@
       "description": "Triggers after one or more climate-control devices turn on, regardless of the mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/counter/condition.py

@@ -0,0 +1,15 @@
+"""Provides conditions for counters."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_numerical_condition
+
+DOMAIN = "counter"
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_value": make_entity_numerical_condition(DOMAIN),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the conditions for counters."""
+    return CONDITIONS

homeassistant/components/counter/conditions.yaml

@@ -0,0 +1,25 @@
+is_value:
+  target:
+    entity:
+      - domain: counter
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity:
+            - domain: counter
+            - domain: input_number
+            - domain: number
+          mode: is
+          number:
+            mode: box

homeassistant/components/counter/icons.json

@@ -1,4 +1,9 @@
 {
+  "conditions": {
+    "is_value": {
+      "condition": "mdi:counter"
+    }
+  },
   "services": {
     "decrement": {
       "service": "mdi:numeric-negative-1"

homeassistant/components/counter/strings.json

@@ -1,7 +1,20 @@
 {
   "common": {
-    "trigger_behavior_description": "The behavior of the targeted counters to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "trigger_behavior_name": "Trigger when"
+  },
+  "conditions": {
+    "is_value": {
+      "description": "Tests the value of one or more counters.",
+      "fields": {
+        "behavior": {
+          "name": "Condition passes if"
+        },
+        "threshold": {
+          "name": "Threshold type"
+        }
+      },
+      "name": "Counter value"
+    }
   },
   "entity_component": {
     "_": {
@@ -30,6 +43,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -76,7 +95,6 @@
       "description": "Triggers after one or more counters reach their maximum value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },
@@ -86,7 +104,6 @@
       "description": "Triggers after one or more counters reach their minimum value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },
@@ -96,7 +113,6 @@
       "description": "Triggers after one or more counters are reset.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/cover/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted covers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted covers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "awning_is_closed": {
       "description": "Tests if one or more awnings are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more awnings are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more blinds are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more blinds are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more curtains are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -60,7 +53,6 @@
       "description": "Tests if one or more curtains are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -70,7 +62,6 @@
       "description": "Tests if one or more shades are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -80,7 +71,6 @@
       "description": "Tests if one or more shades are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -90,7 +80,6 @@
       "description": "Tests if one or more shutters are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -100,7 +89,6 @@
       "description": "Tests if one or more shutters are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -265,7 +253,6 @@
       "description": "Triggers after one or more awnings close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -275,7 +262,6 @@
       "description": "Triggers after one or more awnings open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -285,7 +271,6 @@
       "description": "Triggers after one or more blinds close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -295,7 +280,6 @@
       "description": "Triggers after one or more blinds open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -305,7 +289,6 @@
       "description": "Triggers after one or more curtains close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -315,7 +298,6 @@
       "description": "Triggers after one or more curtains open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -325,7 +307,6 @@
       "description": "Triggers after one or more shades close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -335,7 +316,6 @@
       "description": "Triggers after one or more shades open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -345,7 +325,6 @@
       "description": "Triggers after one or more shutters close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -355,7 +334,6 @@
       "description": "Triggers after one or more shutters open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/date/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the date.",
+      "description": "Sets the value of a date.",
       "fields": {
         "date": {
           "description": "The date to set.",

homeassistant/components/datetime/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the date/time for a datetime entity.",
+      "description": "Sets the value of a date/time.",
       "fields": {
         "datetime": {
           "description": "The date/time to set. The time zone of the Home Assistant instance is assumed.",

homeassistant/components/device_tracker/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted device trackers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted device trackers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_home": {
       "description": "Tests if one or more device trackers are home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::condition_behavior_description%]",
           "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more device trackers are not home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::condition_behavior_description%]",
           "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
         }
       },
@@ -129,7 +125,6 @@
       "description": "Triggers when one or more device trackers enter home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
           "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
         }
       },
@@ -139,7 +134,6 @@
       "description": "Triggers when one or more device trackers leave home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
           "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/door/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted doors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted doors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more doors are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
           "name": "[%key:component::door::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more doors are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
           "name": "[%key:component::door::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more doors close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::trigger_behavior_description%]",
           "name": "[%key:component::door::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more doors open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::trigger_behavior_description%]",
           "name": "[%key:component::door::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/dropbox/__init__.py

@@ -1,64 +0,0 @@
-"""The Dropbox integration."""
-
-from __future__ import annotations
-
-from python_dropbox_api import (
-    DropboxAPIClient,
-    DropboxAuthException,
-    DropboxUnknownException,
-)
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.config_entry_oauth2_flow import (
-    ImplementationUnavailableError,
-    OAuth2Session,
-    async_get_config_entry_implementation,
-)
-
-from .auth import DropboxConfigEntryAuth
-from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
-
-type DropboxConfigEntry = ConfigEntry[DropboxAPIClient]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: DropboxConfigEntry) -> bool:
-    """Set up Dropbox from a config entry."""
-    try:
-        oauth2_implementation = await async_get_config_entry_implementation(hass, entry)
-    except ImplementationUnavailableError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="oauth2_implementation_unavailable",
-        ) from err
-    oauth2_session = OAuth2Session(hass, entry, oauth2_implementation)
-
-    auth = DropboxConfigEntryAuth(
-        aiohttp_client.async_get_clientsession(hass), oauth2_session
-    )
-
-    client = DropboxAPIClient(auth)
-
-    try:
-        await client.get_account_info()
-    except DropboxAuthException as err:
-        raise ConfigEntryAuthFailed from err
-    except (DropboxUnknownException, TimeoutError) as err:
-        raise ConfigEntryNotReady from err
-
-    entry.runtime_data = client
-
-    def async_notify_backup_listeners() -> None:
-        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
-            listener()
-
-    entry.async_on_unload(entry.async_on_state_change(async_notify_backup_listeners))
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: DropboxConfigEntry) -> bool:
-    """Unload a config entry."""
-    return True

homeassistant/components/dropbox/application_credentials.py

@@ -1,38 +0,0 @@
-"""Application credentials platform for the Dropbox integration."""
-
-from homeassistant.components.application_credentials import ClientCredential
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.config_entry_oauth2_flow import (
-    AbstractOAuth2Implementation,
-    LocalOAuth2ImplementationWithPkce,
-)
-
-from .const import OAUTH2_AUTHORIZE, OAUTH2_SCOPES, OAUTH2_TOKEN
-
-
-async def async_get_auth_implementation(
-    hass: HomeAssistant, auth_domain: str, credential: ClientCredential
-) -> AbstractOAuth2Implementation:
-    """Return custom auth implementation."""
-    return DropboxOAuth2Implementation(
-        hass,
-        auth_domain,
-        credential.client_id,
-        OAUTH2_AUTHORIZE,
-        OAUTH2_TOKEN,
-        credential.client_secret,
-    )
-
-
-class DropboxOAuth2Implementation(LocalOAuth2ImplementationWithPkce):
-    """Custom Dropbox OAuth2 implementation to add the necessary authorize url parameters."""
-
-    @property
-    def extra_authorize_data(self) -> dict:
-        """Extra data that needs to be appended to the authorize url."""
-        data: dict = {
-            "token_access_type": "offline",
-            "scope": " ".join(OAUTH2_SCOPES),
-        }
-        data.update(super().extra_authorize_data)
-        return data

homeassistant/components/dropbox/auth.py

@@ -1,44 +0,0 @@
-"""Authentication for Dropbox."""
-
-from typing import cast
-
-from aiohttp import ClientSession
-from python_dropbox_api import Auth
-
-from homeassistant.helpers.config_entry_oauth2_flow import OAuth2Session
-
-
-class DropboxConfigEntryAuth(Auth):
-    """Provide Dropbox authentication tied to an OAuth2 based config entry."""
-
-    def __init__(
-        self,
-        websession: ClientSession,
-        oauth_session: OAuth2Session,
-    ) -> None:
-        """Initialize DropboxConfigEntryAuth."""
-        super().__init__(websession)
-        self._oauth_session = oauth_session
-
-    async def async_get_access_token(self) -> str:
-        """Return a valid access token."""
-        await self._oauth_session.async_ensure_token_valid()
-
-        return cast(str, self._oauth_session.token["access_token"])
-
-
-class DropboxConfigFlowAuth(Auth):
-    """Provide authentication tied to a fixed token for the config flow."""
-
-    def __init__(
-        self,
-        websession: ClientSession,
-        token: str,
-    ) -> None:
-        """Initialize DropboxConfigFlowAuth."""
-        super().__init__(websession)
-        self._token = token
-
-    async def async_get_access_token(self) -> str:
-        """Return the fixed access token."""
-        return self._token

homeassistant/components/dropbox/backup.py

@@ -1,230 +0,0 @@
-"""Backup platform for the Dropbox integration."""
-
-from collections.abc import AsyncIterator, Callable, Coroutine
-from functools import wraps
-import json
-import logging
-from typing import Any, Concatenate
-
-from python_dropbox_api import (
-    DropboxAPIClient,
-    DropboxAuthException,
-    DropboxFileOrFolderNotFoundException,
-    DropboxUnknownException,
-)
-
-from homeassistant.components.backup import (
-    AgentBackup,
-    BackupAgent,
-    BackupAgentError,
-    BackupNotFound,
-    suggested_filename,
-)
-from homeassistant.core import HomeAssistant, callback
-
-from . import DropboxConfigEntry
-from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def _suggested_filenames(backup: AgentBackup) -> tuple[str, str]:
-    """Return the suggested filenames for the backup and metadata."""
-    base_name = suggested_filename(backup).rsplit(".", 1)[0]
-    return f"{base_name}.tar", f"{base_name}.metadata.json"
-
-
-async def _async_string_iterator(content: str) -> AsyncIterator[bytes]:
-    """Yield a string as a single bytes chunk."""
-    yield content.encode()
-
-
-def handle_backup_errors[_R, **P](
-    func: Callable[Concatenate[DropboxBackupAgent, P], Coroutine[Any, Any, _R]],
-) -> Callable[Concatenate[DropboxBackupAgent, P], Coroutine[Any, Any, _R]]:
-    """Handle backup errors."""
-
-    @wraps(func)
-    async def wrapper(
-        self: DropboxBackupAgent, *args: P.args, **kwargs: P.kwargs
-    ) -> _R:
-        try:
-            return await func(self, *args, **kwargs)
-        except DropboxFileOrFolderNotFoundException as err:
-            raise BackupNotFound(
-                f"Failed to {func.__name__.removeprefix('async_').replace('_', ' ')}"
-            ) from err
-        except DropboxAuthException as err:
-            self._entry.async_start_reauth(self._hass)
-            raise BackupAgentError("Authentication error") from err
-        except DropboxUnknownException as err:
-            _LOGGER.error(
-                "Error during %s: %s",
-                func.__name__,
-                err,
-            )
-            _LOGGER.debug("Full error: %s", err, exc_info=True)
-            raise BackupAgentError(
-                f"Failed to {func.__name__.removeprefix('async_').replace('_', ' ')}"
-            ) from err
-
-    return wrapper
-
-
-async def async_get_backup_agents(
-    hass: HomeAssistant,
-    **kwargs: Any,
-) -> list[BackupAgent]:
-    """Return a list of backup agents."""
-    entries = hass.config_entries.async_loaded_entries(DOMAIN)
-    return [DropboxBackupAgent(hass, entry) for entry in entries]
-
-
-@callback
-def async_register_backup_agents_listener(
-    hass: HomeAssistant,
-    *,
-    listener: Callable[[], None],
-    **kwargs: Any,
-) -> Callable[[], None]:
-    """Register a listener to be called when agents are added or removed.
-
-    :return: A function to unregister the listener.
-    """
-    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
-
-    @callback
-    def remove_listener() -> None:
-        """Remove the listener."""
-        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
-        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
-            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
-
-    return remove_listener
-
-
-class DropboxBackupAgent(BackupAgent):
-    """Backup agent for the Dropbox integration."""
-
-    domain = DOMAIN
-
-    def __init__(self, hass: HomeAssistant, entry: DropboxConfigEntry) -> None:
-        """Initialize the backup agent."""
-        super().__init__()
-        self._hass = hass
-        self._entry = entry
-        self.name = entry.title
-        assert entry.unique_id
-        self.unique_id = entry.unique_id
-        self._api: DropboxAPIClient = entry.runtime_data
-
-    async def _async_get_backups(self) -> list[tuple[AgentBackup, str]]:
-        """Get backups and their corresponding file names."""
-        files = await self._api.list_folder("")
-
-        tar_files = {f.name for f in files if f.name.endswith(".tar")}
-        metadata_files = [f for f in files if f.name.endswith(".metadata.json")]
-
-        backups: list[tuple[AgentBackup, str]] = []
-        for metadata_file in metadata_files:
-            tar_name = metadata_file.name.removesuffix(".metadata.json") + ".tar"
-            if tar_name not in tar_files:
-                _LOGGER.warning(
-                    "Found metadata file '%s' without matching backup file",
-                    metadata_file.name,
-                )
-                continue
-
-            metadata_stream = self._api.download_file(f"/{metadata_file.name}")
-            raw = b"".join([chunk async for chunk in metadata_stream])
-            try:
-                data = json.loads(raw)
-                backup = AgentBackup.from_dict(data)
-            except (json.JSONDecodeError, ValueError, TypeError, KeyError) as err:
-                _LOGGER.warning(
-                    "Skipping invalid metadata file '%s': %s",
-                    metadata_file.name,
-                    err,
-                )
-                continue
-            backups.append((backup, tar_name))
-
-        return backups
-
-    @handle_backup_errors
-    async def async_upload_backup(
-        self,
-        *,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        backup: AgentBackup,
-        **kwargs: Any,
-    ) -> None:
-        """Upload a backup."""
-        backup_filename, metadata_filename = _suggested_filenames(backup)
-        backup_path = f"/{backup_filename}"
-        metadata_path = f"/{metadata_filename}"
-
-        file_stream = await open_stream()
-        await self._api.upload_file(backup_path, file_stream)
-
-        metadata_stream = _async_string_iterator(json.dumps(backup.as_dict()))
-
-        try:
-            await self._api.upload_file(metadata_path, metadata_stream)
-        except (
-            DropboxAuthException,
-            DropboxUnknownException,
-        ):
-            await self._api.delete_file(backup_path)
-            raise
-
-    @handle_backup_errors
-    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
-        """List backups."""
-        return [backup for backup, _ in await self._async_get_backups()]
-
-    @handle_backup_errors
-    async def async_download_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AsyncIterator[bytes]:
-        """Download a backup file."""
-        backups = await self._async_get_backups()
-        for backup, filename in backups:
-            if backup.backup_id == backup_id:
-                return self._api.download_file(f"/{filename}")
-
-        raise BackupNotFound(f"Backup {backup_id} not found")
-
-    @handle_backup_errors
-    async def async_get_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AgentBackup:
-        """Return a backup."""
-        backups = await self._async_get_backups()
-
-        for backup, _ in backups:
-            if backup.backup_id == backup_id:
-                return backup
-
-        raise BackupNotFound(f"Backup {backup_id} not found")
-
-    @handle_backup_errors
-    async def async_delete_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> None:
-        """Delete a backup file."""
-        backups = await self._async_get_backups()
-        for backup, tar_filename in backups:
-            if backup.backup_id == backup_id:
-                metadata_filename = tar_filename.removesuffix(".tar") + ".metadata.json"
-                await self._api.delete_file(f"/{tar_filename}")
-                await self._api.delete_file(f"/{metadata_filename}")
-                return
-
-        raise BackupNotFound(f"Backup {backup_id} not found")

homeassistant/components/dropbox/config_flow.py

@@ -1,60 +0,0 @@
-"""Config flow for Dropbox."""
-
-from collections.abc import Mapping
-import logging
-from typing import Any
-
-from python_dropbox_api import DropboxAPIClient
-
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
-
-from .auth import DropboxConfigFlowAuth
-from .const import DOMAIN
-
-
-class DropboxConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
-    """Config flow to handle Dropbox OAuth2 authentication."""
-
-    DOMAIN = DOMAIN
-
-    @property
-    def logger(self) -> logging.Logger:
-        """Return logger."""
-        return logging.getLogger(__name__)
-
-    async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
-        """Create an entry for the flow, or update existing entry."""
-        access_token = data[CONF_TOKEN][CONF_ACCESS_TOKEN]
-
-        auth = DropboxConfigFlowAuth(async_get_clientsession(self.hass), access_token)
-
-        client = DropboxAPIClient(auth)
-        account_info = await client.get_account_info()
-
-        await self.async_set_unique_id(account_info.account_id)
-        if self.source == SOURCE_REAUTH:
-            self._abort_if_unique_id_mismatch(reason="wrong_account")
-            return self.async_update_reload_and_abort(
-                self._get_reauth_entry(), data=data
-            )
-
-        self._abort_if_unique_id_configured()
-
-        return self.async_create_entry(title=account_info.email, data=data)
-
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Perform reauth upon an API authentication error."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Dialog that informs the user that reauth is required."""
-        if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
-        return await self.async_step_user()

homeassistant/components/dropbox/const.py

@@ -1,19 +0,0 @@
-"""Constants for the Dropbox integration."""
-
-from collections.abc import Callable
-
-from homeassistant.util.hass_dict import HassKey
-
-DOMAIN = "dropbox"
-
-OAUTH2_AUTHORIZE = "https://www.dropbox.com/oauth2/authorize"
-OAUTH2_TOKEN = "https://api.dropboxapi.com/oauth2/token"
-OAUTH2_SCOPES = [
-    "account_info.read",
-    "files.content.read",
-    "files.content.write",
-]
-
-DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
-    f"{DOMAIN}.backup_agent_listeners"
-)

homeassistant/components/dropbox/manifest.json

@@ -1,13 +0,0 @@
-{
-  "domain": "dropbox",
-  "name": "Dropbox",
-  "after_dependencies": ["backup"],
-  "codeowners": ["@bdr99"],
-  "config_flow": true,
-  "dependencies": ["application_credentials"],
-  "documentation": "https://www.home-assistant.io/integrations/dropbox",
-  "integration_type": "service",
-  "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
-  "requirements": ["python-dropbox-api==0.1.3"]
-}

homeassistant/components/dropbox/quality_scale.yaml

@@ -1,112 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: Integration does not register any actions.
-  appropriate-polling:
-    status: exempt
-    comment: Integration does not poll.
-  brands: done
-  common-modules:
-    status: exempt
-    comment: Integration does not have any entities or coordinators.
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: Integration does not register any actions.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-unique-id:
-    status: exempt
-    comment: Integration does not have any entities.
-  has-entity-name:
-    status: exempt
-    comment: Integration does not have any entities.
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: Integration does not register any actions.
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: exempt
-    comment: Integration does not have any configuration parameters.
-  docs-installation-parameters: done
-  entity-unavailable:
-    status: exempt
-    comment: Integration does not have any entities.
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates:
-    status: exempt
-    comment: Integration does not make any entity updates.
-  reauthentication-flow: done
-  test-coverage: done
-
-  # Gold
-  devices:
-    status: exempt
-    comment: Integration does not have any entities.
-  diagnostics:
-    status: exempt
-    comment: Integration does not have any data to diagnose.
-  discovery-update-info:
-    status: exempt
-    comment: Integration is a service.
-  discovery:
-    status: exempt
-    comment: Integration is a service.
-  docs-data-update:
-    status: exempt
-    comment: Integration does not update any data.
-  docs-examples:
-    status: exempt
-    comment: Integration only provides backup functionality.
-  docs-known-limitations: todo
-  docs-supported-devices:
-    status: exempt
-    comment: Integration does not support any devices.
-  docs-supported-functions: done
-  docs-troubleshooting: todo
-  docs-use-cases: done
-  dynamic-devices:
-    status: exempt
-    comment: Integration does not use any devices.
-  entity-category:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-device-class:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-disabled-by-default:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-translations:
-    status: exempt
-    comment: Integration does not have any entities.
-  exception-translations: todo
-  icon-translations:
-    status: exempt
-    comment: Integration does not have any entities.
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: Integration does not have any repairs.
-  stale-devices:
-    status: exempt
-    comment: Integration does not have any devices.
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: done

homeassistant/components/dropbox/strings.json

@@ -1,35 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
-      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
-      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
-      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
-      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
-      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
-      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
-      "wrong_account": "Wrong account: Please authenticate with the correct account."
-    },
-    "create_entry": {
-      "default": "[%key:common::config_flow::create_entry::authenticated%]"
-    },
-    "step": {
-      "pick_implementation": {
-        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
-      },
-      "reauth_confirm": {
-        "description": "The Dropbox integration needs to re-authenticate your account.",
-        "title": "[%key:common::config_flow::title::reauth%]"
-      }
-    }
-  },
-  "exceptions": {
-    "oauth2_implementation_unavailable": {
-      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
-    }
-  }
-}

homeassistant/components/econet/water_heater.py

@@ -45,6 +45,13 @@ SUPPORT_FLAGS_HEATER = (
 )
 
 
+def _operation_mode_to_ha(mode: WaterHeaterOperationMode | None) -> str:
+    """Translate an EcoNet operation mode to a Home Assistant state."""
+    if mode in (None, WaterHeaterOperationMode.VACATION):
+        return STATE_OFF
+    return ECONET_STATE_TO_HA[mode]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EconetConfigEntry,
@@ -80,26 +87,22 @@ class EcoNetWaterHeater(EcoNetEntity[WaterHeater], WaterHeaterEntity):
     @property
     def current_operation(self) -> str:
         """Return current operation."""
-        econet_mode = self.water_heater.mode
-        _current_op = STATE_OFF
-        if econet_mode is not None:
-            _current_op = ECONET_STATE_TO_HA[econet_mode]
-
-        return _current_op
+        return _operation_mode_to_ha(self.water_heater.mode)
 
     @property
     def operation_list(self) -> list[str]:
         """List of available operation modes."""
-        econet_modes = self.water_heater.modes
-        operation_modes = set()
-        for mode in econet_modes:
-            if (
-                mode is not WaterHeaterOperationMode.UNKNOWN
-                and mode is not WaterHeaterOperationMode.VACATION
-            ):
-                ha_mode = ECONET_STATE_TO_HA[mode]
-                operation_modes.add(ha_mode)
-        return list(operation_modes)
+        return list(
+            dict.fromkeys(
+                ECONET_STATE_TO_HA[mode]
+                for mode in self.water_heater.modes
+                if mode
+                not in (
+                    WaterHeaterOperationMode.UNKNOWN,
+                    WaterHeaterOperationMode.VACATION,
+                )
+            )
+        )
 
     @property
     def supported_features(self) -> WaterHeaterEntityFeature:

homeassistant/components/fan/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted fans.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted fans to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_off": {
       "description": "Tests if one or more fans are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::condition_behavior_description%]",
           "name": "[%key:component::fan::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more fans are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::condition_behavior_description%]",
           "name": "[%key:component::fan::common::condition_behavior_name%]"
         }
       },
@@ -199,7 +195,6 @@
       "description": "Triggers after one or more fans turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },
@@ -209,7 +204,6 @@
       "description": "Triggers after one or more fans turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/fing/config_flow.py

@@ -10,6 +10,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_IP_ADDRESS, CONF_PORT
+from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import DOMAIN, UPNP_AVAILABLE
 
@@ -40,6 +41,7 @@ class FingConfigFlow(ConfigFlow, domain=DOMAIN):
                 ip=user_input[CONF_IP_ADDRESS],
                 port=int(user_input[CONF_PORT]),
                 key=user_input[CONF_API_KEY],
+                client=get_async_client(self.hass),
             )
 
             try:

homeassistant/components/fing/coordinator.py

@@ -11,6 +11,7 @@ import httpx
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_IP_ADDRESS, CONF_PORT
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, UPNP_AVAILABLE
@@ -38,6 +39,7 @@ class FingDataUpdateCoordinator(DataUpdateCoordinator[FingDataObject]):
             ip=config_entry.data[CONF_IP_ADDRESS],
             port=int(config_entry.data[CONF_PORT]),
             key=config_entry.data[CONF_API_KEY],
+            client=get_async_client(hass),
         )
         self._upnp_available = config_entry.data[UPNP_AVAILABLE]
         update_interval = timedelta(seconds=30)

homeassistant/components/fing/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["fing_agent_api==1.0.3"]
+  "requirements": ["fing_agent_api==1.1.0"]
 }

homeassistant/components/fing/quality_scale.yaml

@@ -68,5 +68,5 @@ rules:
 
   # Platinum
   async-dependency: todo
-  inject-websession: todo
+  inject-websession: done
   strict-typing: todo

homeassistant/components/frontend/manifest.json

@@ -21,5 +21,5 @@
   "integration_type": "system",
   "preview_features": { "winter_mode": {} },
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260325.2"]
+  "requirements": ["home-assistant-frontend==20260325.5"]
 }

homeassistant/components/garage_door/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted garage doors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted garage doors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more garage doors are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
           "name": "[%key:component::garage_door::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more garage doors are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
           "name": "[%key:component::garage_door::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more garage doors close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::trigger_behavior_description%]",
           "name": "[%key:component::garage_door::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more garage doors open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::trigger_behavior_description%]",
           "name": "[%key:component::garage_door::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/gate/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted gates.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted gates to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more gates are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
           "name": "[%key:component::gate::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more gates are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
           "name": "[%key:component::gate::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more gates close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::trigger_behavior_description%]",
           "name": "[%key:component::gate::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more gates open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::trigger_behavior_description%]",
           "name": "[%key:component::gate::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/humidifier/strings.json

@@ -1,18 +1,14 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted humidifiers.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted humidifiers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_drying": {
       "description": "Tests if one or more humidifiers are drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
@@ -22,7 +18,6 @@
       "description": "Tests if one or more humidifiers are humidifying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
@@ -32,7 +27,6 @@
       "description": "Tests if one or more humidifiers are set to a specific mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         },
         "mode": {
@@ -46,7 +40,6 @@
       "description": "Tests if one or more humidifiers are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
@@ -56,7 +49,6 @@
       "description": "Tests if one or more humidifiers are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
@@ -66,11 +58,9 @@
       "description": "Tests the target humidity of one or more humidifiers.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::humidifier::common::condition_threshold_description%]",
           "name": "[%key:component::humidifier::common::condition_threshold_name%]"
         }
       },
@@ -219,7 +209,6 @@
       "description": "Triggers after the operation mode of one or more humidifiers changes.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         },
         "mode": {
@@ -233,7 +222,6 @@
       "description": "Triggers after one or more humidifiers start drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },
@@ -243,7 +231,6 @@
       "description": "Triggers after one or more humidifiers start humidifying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },
@@ -253,7 +240,6 @@
       "description": "Triggers after one or more humidifiers turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },
@@ -263,7 +249,6 @@
       "description": "Triggers after one or more humidifiers turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/humidity/strings.json

@@ -1,25 +1,18 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_value": {
       "description": "Tests if a relative humidity value is above a threshold, below a threshold, or in a range of values.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidity::common::condition_behavior_description%]",
           "name": "[%key:component::humidity::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::humidity::common::condition_threshold_description%]",
           "name": "[%key:component::humidity::common::condition_threshold_name%]"
         }
       },
@@ -47,7 +40,6 @@
       "description": "Triggers after one or more relative humidity values change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::humidity::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::humidity::common::trigger_threshold_name%]"
         }
       },
@@ -57,11 +49,9 @@
       "description": "Triggers after one or more relative humidity values cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidity::common::trigger_behavior_description%]",
           "name": "[%key:component::humidity::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::humidity::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::humidity::common::trigger_threshold_name%]"
         }
       },

homeassistant/components/illuminance/strings.json

@@ -1,21 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_detected": {
       "description": "Tests if light is currently detected.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::condition_behavior_description%]",
           "name": "[%key:component::illuminance::common::condition_behavior_name%]"
         }
       },
@@ -25,7 +19,6 @@
       "description": "Tests if light is currently not detected.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::condition_behavior_description%]",
           "name": "[%key:component::illuminance::common::condition_behavior_name%]"
         }
       },
@@ -35,11 +28,9 @@
       "description": "Tests the illuminance value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::condition_behavior_description%]",
           "name": "[%key:component::illuminance::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::illuminance::common::condition_threshold_description%]",
           "name": "[%key:component::illuminance::common::condition_threshold_name%]"
         }
       },
@@ -67,7 +58,6 @@
       "description": "Triggers after one or more illuminance values change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::illuminance::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::illuminance::common::trigger_threshold_name%]"
         }
       },
@@ -77,7 +67,6 @@
       "description": "Triggers after one or more light sensors stop detecting light.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::trigger_behavior_description%]",
           "name": "[%key:component::illuminance::common::trigger_behavior_name%]"
         }
       },
@@ -87,11 +76,9 @@
       "description": "Triggers after one or more illuminance values cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::trigger_behavior_description%]",
           "name": "[%key:component::illuminance::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::illuminance::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::illuminance::common::trigger_threshold_name%]"
         }
       },
@@ -101,7 +88,6 @@
       "description": "Triggers after one or more light sensors start detecting light.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::trigger_behavior_description%]",
           "name": "[%key:component::illuminance::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/ista_ecotrend/__init__.py

@@ -23,7 +23,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: IstaConfigEntry) -> bool
     ista = PyEcotrendIsta(
         entry.data[CONF_EMAIL],
         entry.data[CONF_PASSWORD],
-        _LOGGER,
     )
 
     coordinator = IstaCoordinator(hass, entry, ista)

homeassistant/components/ista_ecotrend/config_flow.py

@@ -51,7 +51,6 @@ class IstaConfigFlow(ConfigFlow, domain=DOMAIN):
             ista = PyEcotrendIsta(
                 user_input[CONF_EMAIL],
                 user_input[CONF_PASSWORD],
-                _LOGGER,
             )
             try:
                 await self.hass.async_add_executor_job(ista.login)
@@ -102,7 +101,6 @@ class IstaConfigFlow(ConfigFlow, domain=DOMAIN):
             ista = PyEcotrendIsta(
                 user_input[CONF_EMAIL],
                 user_input[CONF_PASSWORD],
-                _LOGGER,
             )
 
             def get_consumption_units() -> set[str]:

homeassistant/components/ista_ecotrend/coordinator.py

@@ -94,10 +94,8 @@ class IstaCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         result = self.ista.get_consumption_unit_details()
 
         return {
-            consumption_unit: next(
-                details
-                for details in result["consumptionUnits"]
-                if details["id"] == consumption_unit
-            )
+            consumption_unit: details
             for consumption_unit in self.ista.get_uuids()
+            for details in result["consumptionUnits"]
+            if details["id"] == consumption_unit
         }

homeassistant/components/lacrosse_view/coordinator.py

@@ -73,31 +73,45 @@ class LaCrosseUpdateCoordinator(DataUpdateCoordinator[list[Sensor]]):
             except HTTPError as error:
                 raise UpdateFailed from error
 
-        try:
-            # Fetch last hour of data
-            for sensor in self.devices:
+        # Fetch last hour of data
+        for sensor in self.devices:
+            try:
                 data = await self.api.get_sensor_status(
                     sensor=sensor,
                     tz=self.hass.config.time_zone,
                 )
-                _LOGGER.debug("Got data: %s", data)
+            except HTTPError as error:
+                error_data = error.args[1] if len(error.args) > 1 else None
+                if (
+                    isinstance(error_data, dict)
+                    and error_data.get("error") == "no_readings"
+                ):
+                    sensor.data = None
+                    _LOGGER.debug("No readings for %s", sensor.name)
+                    continue
+                raise UpdateFailed(
+                    translation_domain=DOMAIN, translation_key="update_error"
+                ) from error
 
-                if data_error := data.get("error"):
-                    if data_error == "no_readings":
-                        sensor.data = None
-                        _LOGGER.debug("No readings for %s", sensor.name)
-                        continue
-                    _LOGGER.debug("Error: %s", data_error)
-                    raise UpdateFailed(
-                        translation_domain=DOMAIN, translation_key="update_error"
-                    )
+            _LOGGER.debug("Got data: %s", data)
 
-                sensor.data = data["data"]["current"]
+            if data_error := data.get("error"):
+                if data_error == "no_readings":
+                    sensor.data = None
+                    _LOGGER.debug("No readings for %s", sensor.name)
+                    continue
+                _LOGGER.debug("Error: %s", data_error)
+                raise UpdateFailed(
+                    translation_domain=DOMAIN, translation_key="update_error"
+                )
 
-        except HTTPError as error:
-            raise UpdateFailed(
-                translation_domain=DOMAIN, translation_key="update_error"
-            ) from error
+            current_data = data.get("data", {}).get("current")
+            if current_data is None:
+                sensor.data = None
+                _LOGGER.debug("No current data payload for %s", sensor.name)
+                continue
+
+            sensor.data = current_data
 
         # Verify that we have permission to read the sensors
         for sensor in self.devices:

homeassistant/components/lawn_mower/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted lawn mowers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted lawn mowers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_docked": {
       "description": "Tests if one or more lawn mowers are docked.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more lawn mowers are encountering an error.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more lawn mowers are mowing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more lawn mowers are paused.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more lawn mowers are returning to the dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -104,7 +97,6 @@
       "description": "Triggers after one or more lawn mowers have returned to dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -114,7 +106,6 @@
       "description": "Triggers after one or more lawn mowers encounter an error.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -124,7 +115,6 @@
       "description": "Triggers after one or more lawn mowers pause mowing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -134,7 +124,6 @@
       "description": "Triggers after one or more lawn mowers start mowing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -144,7 +133,6 @@
       "description": "Triggers after one or more lawn mowers start returning to dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/led_ble/manifest.json

@@ -36,5 +36,5 @@
   "documentation": "https://www.home-assistant.io/integrations/led_ble",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["bluetooth-data-tools==1.28.4", "led-ble==1.1.7"]
+  "requirements": ["bluetooth-data-tools==1.28.4", "led-ble==1.1.8"]
 }

homeassistant/components/light/strings.json

@@ -1,9 +1,7 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted lights.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
     "field_brightness_description": "Number indicating brightness, where 0 turns the light off, 1 is the minimum brightness, and 255 is the maximum brightness.",
     "field_brightness_name": "Brightness value",
     "field_brightness_pct_description": "Number indicating the percentage of full brightness, where 0 turns the light off, 1 is the minimum brightness, and 100 is the maximum brightness.",
@@ -37,22 +35,17 @@
     "field_xy_color_description": "Color in XY-format. A list of two decimal numbers between 0 and 1.",
     "field_xy_color_name": "XY-color",
     "section_advanced_fields_name": "Advanced options",
-    "trigger_behavior_description": "The behavior of the targeted lights to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_brightness": {
       "description": "Tests the brightness of one or more lights.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::light::common::condition_behavior_description%]",
           "name": "[%key:component::light::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::light::common::condition_threshold_description%]",
           "name": "[%key:component::light::common::condition_threshold_name%]"
         }
       },
@@ -62,7 +55,6 @@
       "description": "Tests if one or more lights are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::light::common::condition_behavior_description%]",
           "name": "[%key:component::light::common::condition_behavior_name%]"
         }
       },
@@ -72,7 +64,6 @@
       "description": "Tests if one or more lights are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::light::common::condition_behavior_description%]",
           "name": "[%key:component::light::common::condition_behavior_name%]"
         }
       },
@@ -513,7 +504,6 @@
       "description": "Triggers after the brightness of one or more lights changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::light::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::light::common::trigger_threshold_name%]"
         }
       },
@@ -523,11 +513,9 @@
       "description": "Triggers after the brightness of one or more lights crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::light::common::trigger_behavior_description%]",
           "name": "[%key:component::light::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::light::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::light::common::trigger_threshold_name%]"
         }
       },
@@ -537,7 +525,6 @@
       "description": "Triggers after one or more lights turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::light::common::trigger_behavior_description%]",
           "name": "[%key:component::light::common::trigger_behavior_name%]"
         }
       },
@@ -547,7 +534,6 @@
       "description": "Triggers after one or more lights turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::light::common::trigger_behavior_description%]",
           "name": "[%key:component::light::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/lock/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted locks.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted locks to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_jammed": {
       "description": "Tests if one or more locks are jammed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
           "name": "[%key:component::lock::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more locks are locked.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
           "name": "[%key:component::lock::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more locks are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
           "name": "[%key:component::lock::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more locks are unlocked.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::condition_behavior_description%]",
           "name": "[%key:component::lock::common::condition_behavior_name%]"
         }
       },
@@ -151,7 +145,6 @@
       "description": "Triggers after one or more locks jam.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::trigger_behavior_description%]",
           "name": "[%key:component::lock::common::trigger_behavior_name%]"
         }
       },
@@ -161,7 +154,6 @@
       "description": "Triggers after one or more locks lock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::trigger_behavior_description%]",
           "name": "[%key:component::lock::common::trigger_behavior_name%]"
         }
       },
@@ -171,7 +163,6 @@
       "description": "Triggers after one or more locks open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::trigger_behavior_description%]",
           "name": "[%key:component::lock::common::trigger_behavior_name%]"
         }
       },
@@ -181,7 +172,6 @@
       "description": "Triggers after one or more locks unlock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lock::common::trigger_behavior_description%]",
           "name": "[%key:component::lock::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/media_player/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted media players.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted media players to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_not_playing": {
       "description": "Tests if one or more media players are not playing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::media_player::common::condition_behavior_description%]",
           "name": "[%key:component::media_player::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more media players are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::media_player::common::condition_behavior_description%]",
           "name": "[%key:component::media_player::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more media players are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::media_player::common::condition_behavior_description%]",
           "name": "[%key:component::media_player::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more media players are paused.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::media_player::common::condition_behavior_description%]",
           "name": "[%key:component::media_player::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more media players are playing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::media_player::common::condition_behavior_description%]",
           "name": "[%key:component::media_player::common::condition_behavior_name%]"
         }
       },
@@ -444,7 +437,6 @@
       "description": "Triggers after one or more media players stop playing media.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::media_player::common::trigger_behavior_description%]",
           "name": "[%key:component::media_player::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/moisture/strings.json

@@ -1,21 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_detected": {
       "description": "Tests if one or more moisture sensors are detecting moisture.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::moisture::common::condition_behavior_description%]",
           "name": "[%key:component::moisture::common::condition_behavior_name%]"
         }
       },
@@ -25,7 +19,6 @@
       "description": "Tests if one or more moisture sensors are not detecting moisture.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::moisture::common::condition_behavior_description%]",
           "name": "[%key:component::moisture::common::condition_behavior_name%]"
         }
       },
@@ -35,11 +28,9 @@
       "description": "Tests the moisture level of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::moisture::common::condition_behavior_description%]",
           "name": "[%key:component::moisture::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::moisture::common::condition_threshold_description%]",
           "name": "[%key:component::moisture::common::condition_threshold_name%]"
         }
       },
@@ -67,7 +58,6 @@
       "description": "Triggers after one or more moisture content values change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::moisture::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::moisture::common::trigger_threshold_name%]"
         }
       },
@@ -77,7 +67,6 @@
       "description": "Triggers after one or more moisture sensors stop detecting moisture.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::moisture::common::trigger_behavior_description%]",
           "name": "[%key:component::moisture::common::trigger_behavior_name%]"
         }
       },
@@ -87,11 +76,9 @@
       "description": "Triggers after one or more moisture content values cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::moisture::common::trigger_behavior_description%]",
           "name": "[%key:component::moisture::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::moisture::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::moisture::common::trigger_threshold_name%]"
         }
       },
@@ -101,7 +88,6 @@
       "description": "Triggers after one or more moisture sensors start detecting moisture.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::moisture::common::trigger_behavior_description%]",
           "name": "[%key:component::moisture::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/motion/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted motion sensors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted motion sensors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_detected": {
       "description": "Tests if one or more motion sensors are detecting motion.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::motion::common::condition_behavior_description%]",
           "name": "[%key:component::motion::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more motion sensors are not detecting motion.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::motion::common::condition_behavior_description%]",
           "name": "[%key:component::motion::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more motion sensors stop detecting motion.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::motion::common::trigger_behavior_description%]",
           "name": "[%key:component::motion::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more motion sensors start detecting motion.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::motion::common::trigger_behavior_description%]",
           "name": "[%key:component::motion::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/nrgkick/number.py

@@ -87,19 +87,18 @@ NUMBERS: tuple[NRGkickNumberEntityDescription, ...] = (
             int(value)
         ),
     ),
-    NRGkickNumberEntityDescription(
-        key="phase_count",
-        translation_key="phase_count",
-        native_min_value=1,
-        native_max_value=3,
-        native_step=1,
-        mode=NumberMode.SLIDER,
-        value_fn=lambda data: data.control.get(CONTROL_KEY_PHASE_COUNT),
-        set_value_fn=lambda coordinator, value: coordinator.api.set_phase_count(
-            int(value)
-        ),
-        max_value_fn=_get_phase_count_max,
-    ),
+)
+
+PHASE_COUNT_DESCRIPTION = NRGkickNumberEntityDescription(
+    key="phase_count",
+    translation_key="phase_count",
+    native_min_value=1,
+    native_max_value=3,
+    native_step=1,
+    mode=NumberMode.SLIDER,
+    value_fn=lambda data: data.control.get(CONTROL_KEY_PHASE_COUNT),
+    set_value_fn=lambda coordinator, value: coordinator.api.set_phase_count(int(value)),
+    max_value_fn=_get_phase_count_max,
 )
 
 
@@ -111,9 +110,11 @@ async def async_setup_entry(
     """Set up NRGkick number entities based on a config entry."""
     coordinator = entry.runtime_data
 
-    async_add_entities(
+    entities: list[NRGkickNumber] = [
         NRGkickNumber(coordinator, description) for description in NUMBERS
-    )
+    ]
+    entities.append(NRGkickPhaseCountNumber(coordinator, PHASE_COUNT_DESCRIPTION))
+    async_add_entities(entities)
 
 
 class NRGkickNumber(NRGkickEntity, NumberEntity):
@@ -153,3 +154,26 @@ class NRGkickNumber(NRGkickEntity, NumberEntity):
         await self._async_call_api(
             self.entity_description.set_value_fn(self.coordinator, value)
         )
+
+
+class NRGkickPhaseCountNumber(NRGkickNumber):
+    """Phase count number entity with optimistic state.
+
+    The device briefly reports 0 phases while switching. This subclass
+    caches the last valid value to avoid exposing the transient state.
+    """
+
+    _last_phase_count: float | None = None
+
+    @property
+    def native_value(self) -> float | None:
+        """Return the current value, filtering transient zeros."""
+        value = super().native_value
+        if value is not None and value != 0:
+            self._last_phase_count = value
+        return self._last_phase_count
+
+    async def async_set_native_value(self, value: float) -> None:
+        """Set phase count with optimistic update."""
+        self._last_phase_count = int(value)
+        await super().async_set_native_value(value)

homeassistant/components/ntfy/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aiontfy"],
   "quality_scale": "platinum",
-  "requirements": ["aiontfy==0.8.1"]
+  "requirements": ["aiontfy==0.8.4"]
 }

homeassistant/components/occupancy/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted occupancy sensors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted occupancy sensors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_detected": {
       "description": "Tests if one or more occupancy sensors are detecting occupancy.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::occupancy::common::condition_behavior_description%]",
           "name": "[%key:component::occupancy::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more occupancy sensors are not detecting occupancy.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::occupancy::common::condition_behavior_description%]",
           "name": "[%key:component::occupancy::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more occupancy sensors stop detecting occupancy.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::occupancy::common::trigger_behavior_description%]",
           "name": "[%key:component::occupancy::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more occupancy sensors start detecting occupancy.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::occupancy::common::trigger_behavior_description%]",
           "name": "[%key:component::occupancy::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/openai_conversation/entity.py

@@ -346,7 +346,9 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                             id=event.item.id,
                             tool_name="web_search_call",
                             tool_args={
-                                "action": event.item.action.to_dict(),
+                                "action": event.item.action.to_dict()
+                                if event.item.action
+                                else None,
                             },
                             external=True,
                         )
@@ -360,6 +362,10 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                 }
                 last_role = "tool_result"
             elif isinstance(event.item, ImageGenerationCall):
+                if last_summary_index is not None:
+                    yield {"role": "assistant"}
+                    last_role = "assistant"
+                    last_summary_index = None
                 yield {"native": event.item}
                 last_summary_index = -1  # Trigger new assistant message on next turn
         elif isinstance(event, ResponseTextDeltaEvent):

homeassistant/components/person/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted persons.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted persons to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_home": {
       "description": "Tests if one or more persons are home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::person::common::condition_behavior_description%]",
           "name": "[%key:component::person::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more persons are not home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::person::common::condition_behavior_description%]",
           "name": "[%key:component::person::common::condition_behavior_name%]"
         }
       },
@@ -80,7 +76,6 @@
       "description": "Triggers when one or more persons enter home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::person::common::trigger_behavior_description%]",
           "name": "[%key:component::person::common::trigger_behavior_name%]"
         }
       },
@@ -90,7 +85,6 @@
       "description": "Triggers when one or more persons leave home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::person::common::trigger_behavior_description%]",
           "name": "[%key:component::person::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/power/strings.json

@@ -1,25 +1,18 @@
 {
   "common": {
-    "condition_behavior_description": "How the power value should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_value": {
       "description": "Tests the power value of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::power::common::condition_behavior_description%]",
           "name": "[%key:component::power::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::power::common::condition_threshold_description%]",
           "name": "[%key:component::power::common::condition_threshold_name%]"
         }
       },
@@ -47,7 +40,6 @@
       "description": "Triggers after one or more power values change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::power::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::power::common::trigger_threshold_name%]"
         }
       },
@@ -57,11 +49,9 @@
       "description": "Triggers after one or more power values cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::power::common::trigger_behavior_description%]",
           "name": "[%key:component::power::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::power::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::power::common::trigger_threshold_name%]"
         }
       },

homeassistant/components/remote/strings.json

@@ -1,7 +1,6 @@
 {
   "common": {
-    "trigger_behavior_description": "The behavior of the targeted remotes to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "trigger_behavior_name": "Trigger when"
   },
   "device_automation": {
     "action_type": {
@@ -132,7 +131,6 @@
       "description": "Triggers when one or more remotes turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::remote::common::trigger_behavior_description%]",
           "name": "[%key:component::remote::common::trigger_behavior_name%]"
         }
       },
@@ -142,7 +140,6 @@
       "description": "Triggers when one or more remotes turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::remote::common::trigger_behavior_description%]",
           "name": "[%key:component::remote::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/roborock/strings.json

@@ -103,7 +103,7 @@
         "name": "Reset side brush consumable"
       },
       "shutdown": {
-        "name": "Shutdown"
+        "name": "Shut down"
       },
       "start": {
         "name": "Start"

homeassistant/components/schedule/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted schedules.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted schedules to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_off": {
       "description": "Tests if one or more schedule blocks are currently not active.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::schedule::common::condition_behavior_description%]",
           "name": "[%key:component::schedule::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more schedule blocks are currently active.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::schedule::common::condition_behavior_description%]",
           "name": "[%key:component::schedule::common::condition_behavior_name%]"
         }
       },
@@ -79,7 +75,6 @@
       "description": "Triggers when a schedule block ends.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::schedule::common::trigger_behavior_description%]",
           "name": "[%key:component::schedule::common::trigger_behavior_name%]"
         }
       },
@@ -89,7 +84,6 @@
       "description": "Triggers when a schedule block starts.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::schedule::common::trigger_behavior_description%]",
           "name": "[%key:component::schedule::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/select/strings.json

@@ -4,8 +4,7 @@
       "description": "Tests if one or more dropdowns have a specific option selected.",
       "fields": {
         "behavior": {
-          "description": "Whether the condition should pass when any or all targeted entities match.",
-          "name": "Behavior"
+          "name": "Condition passes if"
         },
         "option": {
           "description": "The options to check for.",

homeassistant/components/siren/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted sirens.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted sirens to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_off": {
       "description": "Tests if one or more sirens are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::siren::common::condition_behavior_description%]",
           "name": "[%key:component::siren::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more sirens are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::siren::common::condition_behavior_description%]",
           "name": "[%key:component::siren::common::condition_behavior_name%]"
         }
       },
@@ -90,7 +86,6 @@
       "description": "Triggers after one or more sirens turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::siren::common::trigger_behavior_description%]",
           "name": "[%key:component::siren::common::trigger_behavior_name%]"
         }
       },
@@ -100,7 +95,6 @@
       "description": "Triggers after one or more sirens turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::siren::common::trigger_behavior_description%]",
           "name": "[%key:component::siren::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/solarlog/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["solarlog_cli"],
   "quality_scale": "platinum",
-  "requirements": ["solarlog_cli==0.7.0"]
+  "requirements": ["solarlog_cli==0.7.1"]
 }

homeassistant/components/srp_energy/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["srpenergy"],
-  "requirements": ["srpenergy==1.3.6"]
+  "requirements": ["srpenergy==1.3.8"]
 }

homeassistant/components/surepetcare/sensor.py

@@ -73,8 +73,8 @@ class SureBattery(SurePetcareEntity, SensorEntity):
         try:
             per_battery_voltage = state["battery"] / 4
             voltage_diff = per_battery_voltage - SURE_BATT_VOLTAGE_LOW
-            self._attr_native_value = min(
-                int(voltage_diff / SURE_BATT_VOLTAGE_DIFF * 100), 100
+            self._attr_native_value = max(
+                0, min(int(voltage_diff / SURE_BATT_VOLTAGE_DIFF * 100), 100)
             )
         except KeyError, TypeError:
             self._attr_native_value = None

homeassistant/components/switch/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted switches.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted switches to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_off": {
       "description": "Tests if one or more switches are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::switch::common::condition_behavior_description%]",
           "name": "[%key:component::switch::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more switches are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::switch::common::condition_behavior_description%]",
           "name": "[%key:component::switch::common::condition_behavior_name%]"
         }
       },
@@ -104,7 +100,6 @@
       "description": "Triggers after one or more switches turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::switch::common::trigger_behavior_description%]",
           "name": "[%key:component::switch::common::trigger_behavior_name%]"
         }
       },
@@ -114,7 +109,6 @@
       "description": "Triggers after one or more switches turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::switch::common::trigger_behavior_description%]",
           "name": "[%key:component::switch::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/temperature/strings.json

@@ -1,25 +1,18 @@
 {
   "common": {
-    "condition_behavior_description": "How the temperature should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_value": {
       "description": "Tests the temperature of one or more entities.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::temperature::common::condition_behavior_description%]",
           "name": "[%key:component::temperature::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::temperature::common::condition_threshold_description%]",
           "name": "[%key:component::temperature::common::condition_threshold_name%]"
         }
       },
@@ -47,7 +40,6 @@
       "description": "Triggers after one or more temperatures change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::temperature::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::temperature::common::trigger_threshold_name%]"
         }
       },
@@ -57,11 +49,9 @@
       "description": "Triggers after one or more temperatures cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::temperature::common::trigger_behavior_description%]",
           "name": "[%key:component::temperature::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::temperature::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::temperature::common::trigger_threshold_name%]"
         }
       },

homeassistant/components/tesla_fleet/__init__.py

@@ -16,7 +16,7 @@ from tesla_fleet_api.exceptions import (
 from tesla_fleet_api.tesla import VehicleFleet
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN, Platform
+from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import (
     ConfigEntryAuthFailed,
@@ -121,7 +121,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
         )
         raise ConfigEntryAuthFailed from e
 
-    access_token = entry.data[CONF_TOKEN][CONF_ACCESS_TOKEN]
+    oauth_session = OAuth2Session(hass, entry, implementation)
+    try:
+        await oauth_session.async_ensure_token_valid()
+    except OAuth2TokenRequestReauthError as err:
+        raise ConfigEntryAuthFailed from err
+    except OAuth2TokenRequestError as err:
+        raise ConfigEntryNotReady from err
+
+    access_token = oauth_session.token[CONF_ACCESS_TOKEN]
     session = async_get_clientsession(hass)
 
     token = jwt.decode(access_token, options={"verify_signature": False})
@@ -129,8 +137,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
     region_code = token["ou_code"].lower()
     region = region_code if is_valid_region(region_code) else None
 
-    oauth_session = OAuth2Session(hass, entry, implementation)
-
     async def _get_access_token() -> str:
         await oauth_session.async_ensure_token_valid()
         token: str = oauth_session.token[CONF_ACCESS_TOKEN]

homeassistant/components/text/strings.json

@@ -1,14 +1,12 @@
 {
   "common": {
-    "condition_behavior_description": "The behavior of the targeted texts to check.",
-    "condition_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if"
   },
   "conditions": {
     "is_equal_to": {
       "description": "Tests if one or more texts are equal to a specified value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::text::common::condition_behavior_description%]",
           "name": "[%key:component::text::common::condition_behavior_name%]"
         },
         "value": {
@@ -60,14 +58,14 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the value.",
+      "description": "Sets the value of a text entity.",
       "fields": {
         "value": {
           "description": "Enter your text.",
           "name": "Value"
         }
       },
-      "name": "Set value"
+      "name": "Set text value"
     }
   },
   "title": "Text",

homeassistant/components/time/strings.json

@@ -6,14 +6,14 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the time.",
+      "description": "Sets the value of a time entity.",
       "fields": {
         "time": {
           "description": "The time to set.",
           "name": "Time"
         }
       },
-      "name": "Set Time"
+      "name": "Set time"
     }
   },
   "title": "Time"

homeassistant/components/timer/condition.py

@@ -0,0 +1,17 @@
+"""Provides conditions for timers."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
+
+from . import DOMAIN, STATUS_ACTIVE, STATUS_IDLE, STATUS_PAUSED
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_active": make_entity_state_condition(DOMAIN, STATUS_ACTIVE),
+    "is_paused": make_entity_state_condition(DOMAIN, STATUS_PAUSED),
+    "is_idle": make_entity_state_condition(DOMAIN, STATUS_IDLE),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the timer conditions."""
+    return CONDITIONS

homeassistant/components/timer/conditions.yaml

@@ -0,0 +1,18 @@
+.condition_common: &condition_common
+  target:
+    entity:
+      - domain: timer
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+
+is_active: *condition_common
+is_paused: *condition_common
+is_idle: *condition_common

homeassistant/components/timer/icons.json

@@ -1,4 +1,15 @@
 {
+  "conditions": {
+    "is_active": {
+      "condition": "mdi:timer"
+    },
+    "is_idle": {
+      "condition": "mdi:timer-off"
+    },
+    "is_paused": {
+      "condition": "mdi:timer-pause"
+    }
+  },
   "services": {
     "cancel": {
       "service": "mdi:cancel"

homeassistant/components/timer/strings.json

@@ -1,4 +1,36 @@
 {
+  "common": {
+    "condition_behavior_name": "Condition passes if"
+  },
+  "conditions": {
+    "is_active": {
+      "description": "Tests if one or more timers are active.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::timer::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Timer is active"
+    },
+    "is_idle": {
+      "description": "Tests if one or more timers are idle.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::timer::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Timer is idle"
+    },
+    "is_paused": {
+      "description": "Tests if one or more timers are paused.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::timer::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Timer is paused"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "Timer",
@@ -30,6 +62,14 @@
       }
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    }
+  },
   "services": {
     "cancel": {
       "description": "Resets a timer's duration to the last known initial value without firing the timer finished event.",

homeassistant/components/update/strings.json

@@ -1,7 +1,6 @@
 {
   "common": {
-    "trigger_behavior_description": "The behavior of the targeted updates to become available.",
-    "trigger_behavior_name": "Behavior"
+    "trigger_behavior_name": "Trigger when"
   },
   "device_automation": {
     "extra_fields": {
@@ -98,7 +97,6 @@
       "description": "Triggers after one or more updates become available.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::update::common::trigger_behavior_description%]",
           "name": "[%key:component::update::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/vacuum/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted vacuum cleaners.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted vacuum cleaners to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_cleaning": {
       "description": "Tests if one or more vacuum cleaners are cleaning.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::condition_behavior_description%]",
           "name": "[%key:component::vacuum::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more vacuum cleaners are docked.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::condition_behavior_description%]",
           "name": "[%key:component::vacuum::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more vacuum cleaners are encountering an error.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::condition_behavior_description%]",
           "name": "[%key:component::vacuum::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more vacuum cleaners are paused.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::condition_behavior_description%]",
           "name": "[%key:component::vacuum::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more vacuum cleaners are returning to the dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::condition_behavior_description%]",
           "name": "[%key:component::vacuum::common::condition_behavior_name%]"
         }
       },
@@ -197,7 +190,6 @@
       "description": "Triggers after one or more vacuums have returned to dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::trigger_behavior_description%]",
           "name": "[%key:component::vacuum::common::trigger_behavior_name%]"
         }
       },
@@ -207,7 +199,6 @@
       "description": "Triggers after one or more vacuums encounter an error.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::trigger_behavior_description%]",
           "name": "[%key:component::vacuum::common::trigger_behavior_name%]"
         }
       },
@@ -217,7 +208,6 @@
       "description": "Triggers after one or more vacuums pause cleaning.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::trigger_behavior_description%]",
           "name": "[%key:component::vacuum::common::trigger_behavior_name%]"
         }
       },
@@ -227,7 +217,6 @@
       "description": "Triggers after one or more vacuums start cleaning.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::trigger_behavior_description%]",
           "name": "[%key:component::vacuum::common::trigger_behavior_name%]"
         }
       },
@@ -237,7 +226,6 @@
       "description": "Triggers after one or more vacuums start returning to dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::vacuum::common::trigger_behavior_description%]",
           "name": "[%key:component::vacuum::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/valve/condition.py

@@ -0,0 +1,20 @@
+"""Provides conditions for valves."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
+
+from . import ATTR_IS_CLOSED
+from .const import DOMAIN
+
+VALVE_DOMAIN_SPECS = {DOMAIN: DomainSpec(value_source=ATTR_IS_CLOSED)}
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_open": make_entity_state_condition(VALVE_DOMAIN_SPECS, False),
+    "is_closed": make_entity_state_condition(VALVE_DOMAIN_SPECS, True),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the valve conditions."""
+    return CONDITIONS

homeassistant/components/valve/conditions.yaml

@@ -0,0 +1,17 @@
+.condition_common: &condition_common
+  target:
+    entity:
+      - domain: valve
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+
+is_open: *condition_common
+is_closed: *condition_common

homeassistant/components/valve/icons.json

@@ -1,4 +1,12 @@
 {
+  "conditions": {
+    "is_closed": {
+      "condition": "mdi:valve-closed"
+    },
+    "is_open": {
+      "condition": "mdi:valve-open"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:valve-open",
@@ -32,5 +40,13 @@
     "toggle": {
       "service": "mdi:valve-open"
     }
+  },
+  "triggers": {
+    "closed": {
+      "trigger": "mdi:valve-closed"
+    },
+    "opened": {
+      "trigger": "mdi:valve-open"
+    }
   }
 }

homeassistant/components/valve/strings.json

@@ -1,4 +1,28 @@
 {
+  "common": {
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
+  },
+  "conditions": {
+    "is_closed": {
+      "description": "Tests if one or more valves are closed.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::valve::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Valve is closed"
+    },
+    "is_open": {
+      "description": "Tests if one or more valves are open.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::valve::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Valve is open"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::valve::title%]",
@@ -22,6 +46,21 @@
       "name": "Water"
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "close_valve": {
       "description": "Closes a valve.",
@@ -50,5 +89,25 @@
       "name": "Toggle valve"
     }
   },
-  "title": "Valve"
+  "title": "Valve",
+  "triggers": {
+    "closed": {
+      "description": "Triggers after one or more valves close.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::valve::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Valve closed"
+    },
+    "opened": {
+      "description": "Triggers after one or more valves open.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::valve::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Valve opened"
+    }
+  }
 }

homeassistant/components/valve/trigger.py

@@ -0,0 +1,24 @@
+"""Provides triggers for valves."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.trigger import Trigger, make_entity_transition_trigger
+
+from . import ATTR_IS_CLOSED, DOMAIN
+
+VALVE_DOMAIN_SPECS = {DOMAIN: DomainSpec(value_source=ATTR_IS_CLOSED)}
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "closed": make_entity_transition_trigger(
+        VALVE_DOMAIN_SPECS, from_states={False}, to_states={True}
+    ),
+    "opened": make_entity_transition_trigger(
+        VALVE_DOMAIN_SPECS, from_states={True}, to_states={False}
+    ),
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for valves."""
+    return TRIGGERS

homeassistant/components/valve/triggers.yaml

@@ -0,0 +1,18 @@
+.trigger_common: &trigger_common
+  target:
+    entity:
+      domain: valve
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: trigger_behavior
+          options:
+            - first
+            - last
+            - any
+
+closed: *trigger_common
+opened: *trigger_common

homeassistant/components/victron_ble/manifest.json

@@ -15,5 +15,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "quality_scale": "bronze",
-  "requirements": ["victron-ble-ha-parser==0.6.2"]
+  "requirements": ["victron-ble-ha-parser==0.6.3"]
 }

homeassistant/components/victron_ble/strings.json

@@ -145,7 +145,7 @@
           "input_current": "Input overcurrent",
           "input_power": "Input overpower",
           "input_shutdown_current": "Input shutdown (current flow during off mode)",
-          "input_shutdown_failure": "PV input failed to shutdown",
+          "input_shutdown_failure": "PV input shutdown failed",
           "input_shutdown_voltage": "Input shutdown (battery overvoltage)",
           "input_voltage": "Input overvoltage",
           "internal_dc_voltage": "Internal DC voltage error",

homeassistant/components/water_heater/strings.json

@@ -1,21 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted water heaters.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted water heaters to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_off": {
       "description": "Tests if one or more water heaters are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::condition_behavior_description%]",
           "name": "[%key:component::water_heater::common::condition_behavior_name%]"
         }
       },
@@ -25,7 +19,6 @@
       "description": "Tests if one or more water heaters are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::condition_behavior_description%]",
           "name": "[%key:component::water_heater::common::condition_behavior_name%]"
         }
       },
@@ -35,7 +28,6 @@
       "description": "Tests if one or more water heaters are set to a specific operation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::condition_behavior_description%]",
           "name": "[%key:component::water_heater::common::condition_behavior_name%]"
         },
         "operation_mode": {
@@ -49,11 +41,9 @@
       "description": "Tests the temperature setpoint of one or more water heaters.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::condition_behavior_description%]",
           "name": "[%key:component::water_heater::common::condition_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::water_heater::common::condition_threshold_description%]",
           "name": "[%key:component::water_heater::common::condition_threshold_name%]"
         }
       },
@@ -192,7 +182,6 @@
       "description": "Triggers after the operation mode of one or more water heaters changes to a specific mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::trigger_behavior_description%]",
           "name": "[%key:component::water_heater::common::trigger_behavior_name%]"
         },
         "operation_mode": {
@@ -206,7 +195,6 @@
       "description": "Triggers after the temperature setpoint of one or more water heaters changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::water_heater::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::water_heater::common::trigger_threshold_name%]"
         }
       },
@@ -216,11 +204,9 @@
       "description": "Triggers after the temperature setpoint of one or more water heaters crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::trigger_behavior_description%]",
           "name": "[%key:component::water_heater::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::water_heater::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::water_heater::common::trigger_threshold_name%]"
         }
       },
@@ -230,7 +216,6 @@
       "description": "Triggers after one or more water heaters turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::trigger_behavior_description%]",
           "name": "[%key:component::water_heater::common::trigger_behavior_name%]"
         }
       },
@@ -240,7 +225,6 @@
       "description": "Triggers after one or more water heaters turn on, regardless of the operation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::water_heater::common::trigger_behavior_description%]",
           "name": "[%key:component::water_heater::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/window/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted windows.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted windows to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more windows are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::window::common::condition_behavior_description%]",
           "name": "[%key:component::window::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more windows are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::window::common::condition_behavior_description%]",
           "name": "[%key:component::window::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more windows close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::window::common::trigger_behavior_description%]",
           "name": "[%key:component::window::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more windows open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::window::common::trigger_behavior_description%]",
           "name": "[%key:component::window::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/zha/manifest.json

@@ -23,7 +23,7 @@
     "universal_silabs_flasher",
     "serialx"
   ],
-  "requirements": ["zha==1.1.0", "serialx==0.6.2"],
+  "requirements": ["zha==1.1.1", "serialx==0.6.2"],
   "usb": [
     {
       "description": "*2652*",

homeassistant/components/zwave_js/binary_sensor.py

@@ -17,18 +17,28 @@ from zwave_js_server.const.command_class.notification import (
     SmokeAlarmNotificationEvent,
 )
 from zwave_js_server.model.driver import Driver
+from zwave_js_server.model.value import Value as ZwaveValue
 
+from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_DOMAIN,
     BinarySensorDeviceClass,
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.components.script import scripts_with_entity
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.issue_registry import (
+    IssueSeverity,
+    async_create_issue,
+    async_delete_issue,
+)
+from homeassistant.helpers.start import async_at_started
 
 from .const import DOMAIN
 from .entity import NewZwaveDiscoveryInfo, ZWaveBaseEntity
@@ -72,8 +82,7 @@ ACCESS_CONTROL_DOOR_STATE_OPEN_REGULAR = 5632
 ACCESS_CONTROL_DOOR_STATE_OPEN_TILT = 5633
 
 
-# Numeric State values used by the "Opening state" notification variable.
-# This is only needed temporarily until the legacy Access Control door state binary sensors are removed.
+# Numeric State values used by the Opening state notification variable.
 class OpeningState(IntEnum):
     """Opening state values exposed by Access Control notifications."""
 
@@ -82,23 +91,23 @@ class OpeningState(IntEnum):
     TILTED = 2
 
 
-# parse_opening_state helpers for the DEPRECATED legacy Access Control binary sensors.
-def _legacy_is_closed(opening_state: OpeningState) -> bool:
+# parse_opening_state helpers.
+def _opening_state_is_closed(opening_state: OpeningState) -> bool:
     """Return if Opening state represents closed."""
     return opening_state is OpeningState.CLOSED
 
 
-def _legacy_is_open(opening_state: OpeningState) -> bool:
+def _opening_state_is_open(opening_state: OpeningState) -> bool:
     """Return if Opening state represents open."""
     return opening_state is OpeningState.OPEN
 
 
-def _legacy_is_open_or_tilted(opening_state: OpeningState) -> bool:
+def _opening_state_is_open_or_tilted(opening_state: OpeningState) -> bool:
     """Return if Opening state represents open or tilted."""
     return opening_state in (OpeningState.OPEN, OpeningState.TILTED)
 
 
-def _legacy_is_tilted(opening_state: OpeningState) -> bool:
+def _opening_state_is_tilted(opening_state: OpeningState) -> bool:
     """Return if Opening state represents tilted."""
     return opening_state is OpeningState.TILTED
 
@@ -127,12 +136,51 @@ class NewNotificationZWaveJSEntityDescription(BinarySensorEntityDescription):
 
 @dataclass(frozen=True, kw_only=True)
 class OpeningStateZWaveJSEntityDescription(BinarySensorEntityDescription):
-    """Describe a legacy Access Control binary sensor that derives state from Opening state."""
+    """Describe an Access Control binary sensor that derives state from Opening state."""
 
     state_key: int
     parse_opening_state: Callable[[OpeningState], bool]
 
 
+@dataclass(frozen=True, kw_only=True)
+class LegacyDoorStateRepairDescription:
+    """Describe how a legacy door state entity should be migrated."""
+
+    issue_translation_key: str
+    replacement_state_key: OpeningState
+
+
+LEGACY_DOOR_STATE_REPAIR_DESCRIPTIONS: dict[str, LegacyDoorStateRepairDescription] = {
+    "legacy_access_control_door_state_simple_open": LegacyDoorStateRepairDescription(
+        issue_translation_key="deprecated_legacy_door_open_state",
+        replacement_state_key=OpeningState.OPEN,
+    ),
+    "legacy_access_control_door_state_open": LegacyDoorStateRepairDescription(
+        issue_translation_key="deprecated_legacy_door_open_state",
+        replacement_state_key=OpeningState.OPEN,
+    ),
+    "legacy_access_control_door_state_open_regular": LegacyDoorStateRepairDescription(
+        issue_translation_key="deprecated_legacy_door_open_state",
+        replacement_state_key=OpeningState.OPEN,
+    ),
+    "legacy_access_control_door_state_open_tilt": LegacyDoorStateRepairDescription(
+        issue_translation_key="deprecated_legacy_door_tilt_state",
+        replacement_state_key=OpeningState.TILTED,
+    ),
+    "legacy_access_control_door_tilt_state_tilted": LegacyDoorStateRepairDescription(
+        issue_translation_key="deprecated_legacy_door_tilt_state",
+        replacement_state_key=OpeningState.TILTED,
+    ),
+}
+
+LEGACY_DOOR_STATE_REPAIR_ISSUE_KEYS = frozenset(
+    {
+        description.issue_translation_key
+        for description in LEGACY_DOOR_STATE_REPAIR_DESCRIPTIONS.values()
+    }
+)
+
+
 # Mappings for Notification sensors
 # https://github.com/zwave-js/specs/blob/master/Registries/Notification%20Command%20Class%2C%20list%20of%20assigned%20Notifications.xlsx
 #
@@ -389,6 +437,9 @@ BOOLEAN_SENSOR_MAPPINGS: dict[tuple[int, int | str], BinarySensorEntityDescripti
 }
 
 
+# This can likely be removed once the legacy notification binary sensor
+# discovery path is gone and Opening state is handled only by the dedicated
+# discovery schemas below.
 @callback
 def is_valid_notification_binary_sensor(
     info: ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo,
@@ -396,13 +447,111 @@ def is_valid_notification_binary_sensor(
     """Return if the notification CC Value is valid as binary sensor."""
     if not info.primary_value.metadata.states:
         return False
-    # Access Control - Opening state is exposed as a single enum sensor instead
-    # of fanning out one binary sensor per state.
+    # Opening state is handled by dedicated discovery schemas
     if is_opening_state_notification_value(info.primary_value):
         return False
     return len(info.primary_value.metadata.states) > 1
 
 
+@callback
+def _async_delete_legacy_entity_repairs(hass: HomeAssistant, entity_id: str) -> None:
+    """Delete all stale legacy door state repair issues for an entity."""
+    for issue_key in LEGACY_DOOR_STATE_REPAIR_ISSUE_KEYS:
+        async_delete_issue(hass, DOMAIN, f"{issue_key}.{entity_id}")
+
+
+@callback
+def _async_check_legacy_entity_repair(
+    hass: HomeAssistant,
+    driver: Driver,
+    entity: ZWaveLegacyDoorStateBinarySensor,
+) -> None:
+    """Schedule a repair issue check once HA has fully started."""
+
+    @callback
+    def _async_do_check(hass: HomeAssistant) -> None:
+        """Create or delete a repair issue for a deprecated legacy door state entity."""
+        ent_reg = er.async_get(hass)
+        if entity.unique_id is None:
+            return
+        entity_id = ent_reg.async_get_entity_id(
+            BINARY_SENSOR_DOMAIN, DOMAIN, entity.unique_id
+        )
+        if entity_id is None:
+            return
+
+        repair_description = LEGACY_DOOR_STATE_REPAIR_DESCRIPTIONS.get(
+            entity.entity_description.key
+        )
+        if repair_description is None:
+            _async_delete_legacy_entity_repairs(hass, entity_id)
+            return
+
+        entity_entry = ent_reg.async_get(entity_id)
+        if entity_entry is None or entity_entry.disabled:
+            _async_delete_legacy_entity_repairs(hass, entity_id)
+            return
+
+        entity_automations = automations_with_entity(hass, entity_id)
+        entity_scripts = scripts_with_entity(hass, entity_id)
+        if not entity_automations and not entity_scripts:
+            _async_delete_legacy_entity_repairs(hass, entity_id)
+            return
+
+        opening_state_value = get_opening_state_notification_value(
+            entity.info.node, entity.info.primary_value.endpoint
+        )
+        if opening_state_value is None:
+            _async_delete_legacy_entity_repairs(hass, entity_id)
+            return
+
+        replacement_unique_id = (
+            f"{driver.controller.home_id}.{opening_state_value.value_id}."
+            f"{repair_description.replacement_state_key}"
+        )
+        replacement_entity_id = ent_reg.async_get_entity_id(
+            BINARY_SENSOR_DOMAIN, DOMAIN, replacement_unique_id
+        )
+        if replacement_entity_id is None:
+            _async_delete_legacy_entity_repairs(hass, entity_id)
+            return
+
+        items = []
+        for domain, entity_ids in (
+            ("automation", entity_automations),
+            ("script", entity_scripts),
+        ):
+            for eid in entity_ids:
+                item = ent_reg.async_get(eid)
+                if item:
+                    items.append(
+                        f"- [{item.name or item.original_name or eid}]"
+                        f"(/config/{domain}/edit/{item.unique_id})"
+                    )
+                else:
+                    items.append(f"- {eid}")
+
+        async_create_issue(
+            hass,
+            DOMAIN,
+            f"{repair_description.issue_translation_key}.{entity_id}",
+            is_fixable=False,
+            is_persistent=False,
+            severity=IssueSeverity.WARNING,
+            translation_key=repair_description.issue_translation_key,
+            translation_placeholders={
+                "entity_id": entity_id,
+                "entity_name": (
+                    entity_entry.name or entity_entry.original_name or entity_id
+                ),
+                "replacement_entity_id": replacement_entity_id,
+                "items": "\n".join(items),
+            },
+        )
+
+    async_at_started(hass, _async_do_check)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ZwaveJSConfigEntry,
@@ -442,13 +591,21 @@ async def async_setup_entry(
             and info.entity_class is ZWaveBooleanBinarySensor
         ):
             entities.append(ZWaveBooleanBinarySensor(config_entry, driver, info))
+        elif (
+            isinstance(info, NewZwaveDiscoveryInfo)
+            and info.entity_class is ZWaveOpeningStateBinarySensor
+            and isinstance(
+                info.entity_description, OpeningStateZWaveJSEntityDescription
+            )
+        ):
+            entities.append(ZWaveOpeningStateBinarySensor(config_entry, driver, info))
         elif (
             isinstance(info, NewZwaveDiscoveryInfo)
             and info.entity_class is ZWaveLegacyDoorStateBinarySensor
         ):
-            entities.append(
-                ZWaveLegacyDoorStateBinarySensor(config_entry, driver, info)
-            )
+            entity = ZWaveLegacyDoorStateBinarySensor(config_entry, driver, info)
+            entities.append(entity)
+            _async_check_legacy_entity_repair(hass, driver, entity)
         elif isinstance(info, NewZwaveDiscoveryInfo):
             pass  # other entity classes are not migrated yet
         elif info.platform_hint == "notification":
@@ -632,6 +789,69 @@ class ZWaveLegacyDoorStateBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
             return None
 
 
+class ZWaveOpeningStateBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
+    """Representation of a binary sensor derived from Opening state."""
+
+    entity_description: OpeningStateZWaveJSEntityDescription
+    _known_states: set[str]
+
+    def __init__(
+        self,
+        config_entry: ZwaveJSConfigEntry,
+        driver: Driver,
+        info: NewZwaveDiscoveryInfo,
+    ) -> None:
+        """Initialize an Opening state binary sensor entity."""
+        super().__init__(config_entry, driver, info)
+        self._known_states = set(info.primary_value.metadata.states or ())
+        self._attr_unique_id = (
+            f"{self._attr_unique_id}.{self.entity_description.state_key}"
+        )
+
+    @callback
+    def should_rediscover_on_metadata_update(self) -> bool:
+        """Check if metadata states require adding the Tilt entity."""
+        return (
+            # Open and Tilt entities share the same underlying Opening state value.
+            # Only let the main Open entity trigger rediscovery when Tilt first
+            # appears so we can add the missing sibling without recreating the
+            # main entity and losing its registry customizations.
+            str(OpeningState.TILTED) not in self._known_states
+            and str(OpeningState.TILTED)
+            in set(self.info.primary_value.metadata.states or ())
+            and self.entity_description.state_key == OpeningState.OPEN
+        )
+
+    async def _async_remove_and_rediscover(self, value: ZwaveValue) -> None:
+        """Trigger re-discovery while preserving the main Opening state entity."""
+        assert self.device_entry is not None
+        controller_events = (
+            self.config_entry.runtime_data.driver_events.controller_events
+        )
+
+        # Unlike the base implementation, keep this entity in place so its
+        # registry entry and user customizations survive metadata rediscovery.
+        controller_events.discovered_value_ids[self.device_entry.id].discard(
+            value.value_id
+        )
+        node_events = controller_events.node_events
+        value_updates_disc_info = node_events.value_updates_disc_info[
+            value.node.node_id
+        ]
+        node_events.async_on_value_added(value_updates_disc_info, value)
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return if the sensor is on or off."""
+        value = self.info.primary_value.value
+        if value is None:
+            return None
+        try:
+            return self.entity_description.parse_opening_state(OpeningState(int(value)))
+        except TypeError, ValueError:
+            return None
+
+
 class ZWavePropertyBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
     """Representation of a Z-Wave binary_sensor from a property."""
 
@@ -730,11 +950,54 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
         ),
         entity_class=ZWaveNotificationBinarySensor,
     ),
+    NewZWaveDiscoverySchema(
+        platform=Platform.BINARY_SENSOR,
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={CommandClass.NOTIFICATION},
+            property={"Access Control"},
+            property_key={"Opening state"},
+            type={ValueType.NUMBER},
+            any_available_states_keys={OpeningState.TILTED},
+            any_available_cc_specific={
+                (CC_SPECIFIC_NOTIFICATION_TYPE, NotificationType.ACCESS_CONTROL)
+            },
+        ),
+        # Also derive the main binary sensor from the same value ID
+        allow_multi=True,
+        entity_description=OpeningStateZWaveJSEntityDescription(
+            key="access_control_opening_state_tilted",
+            name="Tilt",
+            state_key=OpeningState.TILTED,
+            parse_opening_state=_opening_state_is_tilted,
+        ),
+        entity_class=ZWaveOpeningStateBinarySensor,
+    ),
+    NewZWaveDiscoverySchema(
+        platform=Platform.BINARY_SENSOR,
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={CommandClass.NOTIFICATION},
+            property={"Access Control"},
+            property_key={"Opening state"},
+            type={ValueType.NUMBER},
+            any_available_states_keys={OpeningState.OPEN},
+            any_available_cc_specific={
+                (CC_SPECIFIC_NOTIFICATION_TYPE, NotificationType.ACCESS_CONTROL)
+            },
+        ),
+        entity_description=OpeningStateZWaveJSEntityDescription(
+            key="access_control_opening_state_open",
+            state_key=OpeningState.OPEN,
+            parse_opening_state=_opening_state_is_open_or_tilted,
+            device_class=BinarySensorDeviceClass.DOOR,
+        ),
+        entity_class=ZWaveOpeningStateBinarySensor,
+    ),
     # -------------------------------------------------------------------
     # DEPRECATED legacy Access Control door/window binary sensors.
     # These schemas exist only for backwards compatibility with users who
     # already have these entities registered. New integrations should use
-    # the Opening state enum sensor instead. Do not add new schemas here.
+    # the dedicated Opening state binary sensors instead. Do not add new
+    # schemas here.
     # All schemas below use ZWaveLegacyDoorStateBinarySensor and are
     # disabled by default (entity_registry_enabled_default=False).
     # -------------------------------------------------------------------
@@ -758,7 +1021,7 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
             key="legacy_access_control_door_state_simple_open",
             name="Window/door is open",
             state_key=AccessControlNotificationEvent.DOOR_STATE_WINDOW_DOOR_IS_OPEN,
-            parse_opening_state=_legacy_is_open_or_tilted,
+            parse_opening_state=_opening_state_is_open_or_tilted,
             device_class=BinarySensorDeviceClass.DOOR,
             entity_registry_enabled_default=False,
         ),
@@ -784,7 +1047,7 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
             key="legacy_access_control_door_state_simple_closed",
             name="Window/door is closed",
             state_key=AccessControlNotificationEvent.DOOR_STATE_WINDOW_DOOR_IS_CLOSED,
-            parse_opening_state=_legacy_is_closed,
+            parse_opening_state=_opening_state_is_closed,
             entity_registry_enabled_default=False,
         ),
         entity_class=ZWaveLegacyDoorStateBinarySensor,
@@ -809,7 +1072,7 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
             key="legacy_access_control_door_state_open",
             name="Window/door is open",
             state_key=AccessControlNotificationEvent.DOOR_STATE_WINDOW_DOOR_IS_OPEN,
-            parse_opening_state=_legacy_is_open,
+            parse_opening_state=_opening_state_is_open,
             device_class=BinarySensorDeviceClass.DOOR,
             entity_registry_enabled_default=False,
         ),
@@ -835,7 +1098,7 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
             key="legacy_access_control_door_state_closed",
             name="Window/door is closed",
             state_key=AccessControlNotificationEvent.DOOR_STATE_WINDOW_DOOR_IS_CLOSED,
-            parse_opening_state=_legacy_is_closed,
+            parse_opening_state=_opening_state_is_closed,
             entity_registry_enabled_default=False,
         ),
         entity_class=ZWaveLegacyDoorStateBinarySensor,
@@ -858,7 +1121,7 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
             key="legacy_access_control_door_state_open_regular",
             name="Window/door is open in regular position",
             state_key=ACCESS_CONTROL_DOOR_STATE_OPEN_REGULAR,
-            parse_opening_state=_legacy_is_open,
+            parse_opening_state=_opening_state_is_open,
             entity_registry_enabled_default=False,
         ),
         entity_class=ZWaveLegacyDoorStateBinarySensor,
@@ -881,7 +1144,7 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
             key="legacy_access_control_door_state_open_tilt",
             name="Window/door is open in tilt position",
             state_key=ACCESS_CONTROL_DOOR_STATE_OPEN_TILT,
-            parse_opening_state=_legacy_is_tilted,
+            parse_opening_state=_opening_state_is_tilted,
             entity_registry_enabled_default=False,
         ),
         entity_class=ZWaveLegacyDoorStateBinarySensor,
@@ -904,7 +1167,7 @@ DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
             key="legacy_access_control_door_tilt_state_tilted",
             name="Window/door is tilted",
             state_key=OpeningState.OPEN,
-            parse_opening_state=_legacy_is_tilted,
+            parse_opening_state=_opening_state_is_tilted,
             entity_registry_enabled_default=False,
         ),
         entity_class=ZWaveLegacyDoorStateBinarySensor,

homeassistant/components/zwave_js/strings.json

@@ -303,6 +303,14 @@
     }
   },
   "issues": {
+    "deprecated_legacy_door_open_state": {
+      "description": "The binary sensor `{entity_id}` is deprecated because it has been replaced with the binary sensor `{replacement_entity_id}`.\n\nThe entity was found in the following automations or scripts:\n{items}\n\nPlease update the above automations or scripts to use the binary sensor `{replacement_entity_id}` and disable the binary sensor `{entity_id}` and then restart Home Assistant, to fix this issue.\n\nNote that `{replacement_entity_id}` is on when the door or window is open or tilted.",
+      "title": "Deprecation: {entity_name}"
+    },
+    "deprecated_legacy_door_tilt_state": {
+      "description": "The binary sensor `{entity_id}` is deprecated because it has been replaced with the binary sensor `{replacement_entity_id}`.\n\nThe entity was found in the following automations or scripts:\n{items}\n\nPlease update the above automations or scripts to use the binary sensor `{replacement_entity_id}` and disable the binary sensor `{entity_id}` and then restart Home Assistant, to fix this issue.\n\nNote that `{replacement_entity_id}` is on only when the door or window is tilted.",
+      "title": "Deprecation: {entity_name}"
+    },
     "device_config_file_changed": {
       "fix_flow": {
         "abort": {