homeassistant 2025.10.0b7__py3-none-any.whl → 2025.10.1__py3-none-any.whl

homeassistant/components/zha/translations/zh-Hans.json

@@ -25,6 +25,7 @@
                 "title": "\u8fd8\u539f\u81ea\u52a8\u5907\u4efd"
             },
             "choose_formation_strategy": {
+                "description": "\u9009\u62e9\u60a8\u7684\u9002\u914d\u5668\u7684\u7f51\u7edc\u8bbe\u7f6e\u3002",
                 "menu_option_descriptions": {
                     "choose_automatic_backup": "\u5982\u679c\u60a8\u66f4\u6539\u4e86\u9002\u914d\u5668\u7684\u7f51\u7edc\u8bbe\u7f6e\uff0c\u8fd9\u5c06\u5141\u8bb8\u60a8\u5c06\u5176\u66f4\u6539\u56de\u4ee5\u524d\u7684\u72b6\u6001\u3002",
                     "form_initial_network": "\u8fd9\u5c06\u521b\u5efa\u65b0\u7684 Zigbee \u7f51\u7edc\u3002",
@@ -36,6 +37,7 @@
                     "choose_automatic_backup": "\u8fd8\u539f\u81ea\u52a8\u5907\u4efd",
                     "form_initial_network": "\u521b\u5efa\u7f51\u7edc",
                     "form_new_network": "\u5220\u9664\u7f51\u7edc\u8bbe\u7f6e\u5e76\u521b\u5efa\u65b0\u7f51\u7edc",
+                    "reuse_settings": "\u4fdd\u7559\u9002\u914d\u5668\u7f51\u7edc\u8bbe\u7f6e",
                     "upload_manual_backup": "\u4e0a\u4f20\u624b\u52a8\u5907\u4efd"
                 },
                 "title": "\u7f51\u7edc\u6784\u6210"
@@ -56,6 +58,7 @@
                 "data": {
                     "path": "\u4e32\u53e3\u8bbe\u5907\u8def\u5f84"
                 },
+                "description": "\u9009\u62e9 Zigbee \u9002\u914d\u5668\u7684\u4e32\u884c\u7aef\u53e3",
                 "title": "\u9009\u62e9\u4e32\u53e3"
             },
             "choose_setup_strategy": {
@@ -76,6 +79,13 @@
             "confirm_hardware": {
                 "description": "\u60a8\u60f3\u8bbe\u7f6e {name} \u5417\uff1f"
             },
+            "manual_pick_radio_type": {
+                "data": {
+                    "radio_type": "\u9002\u914d\u5668\u7c7b\u578b"
+                },
+                "description": "\u9009\u62e9\u60a8\u7684 Zigbee \u9002\u914d\u5668\u7c7b\u578b",
+                "title": "\u9009\u62e9\u9002\u914d\u5668\u7c7b\u578b"
+            },
             "manual_port_config": {
                 "data": {
                     "baudrate": "\u4e32\u53e3\u901f\u5ea6",
@@ -90,12 +100,27 @@
                 "description": "ZHA \u65e0\u6cd5\u81ea\u52a8\u68c0\u6d4b\u60a8\u7684\u9002\u914d\u5668\u7684\u4e32\u884c\u7aef\u53e3\u8bbe\u7f6e\u3002\u8fd9\u901a\u5e38\u662f\u56fa\u4ef6\u6216\u6743\u9650\u95ee\u9898\u3002 \n \n\u5982\u679c\u60a8\u4f7f\u7528\u7684\u56fa\u4ef6\u5177\u6709\u975e\u6807\u51c6\u8bbe\u7f6e\uff0c\u8bf7\u8f93\u5165\u4e32\u884c\u7aef\u53e3\u8bbe\u7f6e",
                 "title": "\u4e32\u53e3\u8bbe\u7f6e"
             },
+            "maybe_confirm_ezsp_restore": {
+                "data": {
+                    "overwrite_coordinator_ieee": "\u6c38\u4e45\u66ff\u6362\u9002\u914d\u5668 IEEE \u5730\u5740"
+                },
+                "description": "\u60a8\u7684\u5907\u4efd\u8bbe\u5907\u7684 IEEE \u5730\u5740\u4e0e\u60a8\u7684\u9002\u914d\u5668\u4e0d\u540c\u3002\u4e3a\u4e86\u4fdd\u8bc1\u60a8\u7684\u7f51\u7edc\u6b63\u5e38\u8fd0\u884c\uff0c\u60a8\u9002\u914d\u5668\u7684 IEEE \u5730\u5740\u4e5f\u5e94\u66f4\u6539\u3002\n \n\u6b64\u64cd\u4f5c\u4e3a\u6c38\u4e45\u6027\u64cd\u4f5c\u3002",
+                "title": "\u8986\u76d6\u9002\u914d\u5668 IEEE \u5730\u5740"
+            },
+            "maybe_reset_old_radio": {
+                "description": "\u4e4b\u524d\u5df2\u521b\u5efa\u5907\u4efd\uff0c\u5e76\u4e14\u60a8\u7684\u65e7\u9002\u914d\u5668\u6b63\u5728\u4f5c\u4e3a\u8fc1\u79fb\u7684\u4e00\u90e8\u5206\u8fdb\u884c\u91cd\u7f6e\u3002",
+                "title": "\u91cd\u7f6e\u65e7\u9002\u914d\u5668"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "\u4e0a\u4f20\u6587\u4ef6"
                 },
                 "description": "\u4ece\u4e0a\u4f20\u7684\u5907\u4efd JSON \u6587\u4ef6\u6062\u590d\u60a8\u7684\u7f51\u7edc\u8bbe\u7f6e\u3002\u60a8\u53ef\u4ee5\u901a\u8fc7 **\u7f51\u7edc\u8bbe\u7f6e** \u4ece\u4e0d\u540c\u7684 ZHA \u5b89\u88c5\u4e0b\u8f7d\u4e00\u4e2a\uff0c\u6216\u4f7f\u7528 Zigbee2MQTT `coordinator_backup.json` \u6587\u4ef6\u3002",
                 "title": "\u4e0a\u4f20\u624b\u52a8\u5907\u4efd"
+            },
+            "verify_radio": {
+                "description": "\u4e0d\u63a8\u8350\u60a8\u6b63\u5728\u4f7f\u7528\u7684\u9002\u914d\u5668\uff08{name}\uff09\uff0c\u672a\u6765\u53ef\u80fd\u4f1a\u53d6\u6d88\u5bf9\u5b83\u7684\u652f\u6301\u3002\u53c2\u9605 Zigbee Home Automation \u96c6\u6210\u7684\u6587\u6863\u53ef\u83b7\u53d6\u3010\u63a8\u8350\u9002\u914d\u5668\u5217\u8868\u3011({docs_recommended_adapters_url}) \u3002",
+                "title": "\u4e0d\u63a8\u8350\u4f7f\u7528\u9002\u914d\u5668"
             }
         }
     },
@@ -1759,6 +1784,7 @@
             "fix_flow": {
                 "step": {
                     "init": {
+                        "description": "\u60a8\u7684 Zigbee \u9002\u914d\u5668\u7f51\u7edc\u8bbe\u7f6e\u4e0e\u6700\u65b0\u7684\u7f51\u7edc\u5907\u4efd\u4e0d\u4e00\u81f4\u3002\u8fd9\u79cd\u60c5\u51b5\u901a\u5e38\u662f\u7531\u4e8e\u53e6\u4e00\u4e2a Zigbee \u96c6\u6210\uff08\u4f8b\u5982 Zigbee2MQTT \u6216 deCONZ\uff09\u8986\u76d6\u4e86\u5b83\u4eec\u3002 \n\n{diff}\n\n\u5982\u679c\u60a8\u4e0d\u662f\u6709\u610f\u66f4\u6539\u7f51\u7edc\u8bbe\u7f6e\uff0c\u8bf7\u4ece\u6700\u8fd1\u7684\u5907\u4efd\u6062\u590d\uff0c\u5426\u5219\u60a8\u7684\u8bbe\u5907\u5c06\u65e0\u6cd5\u5de5\u4f5c\u3002",
                         "menu_option_descriptions": {
                             "restore_old_settings": "\u8fd9\u4f1a\u5c06\u60a8\u7684\u7f51\u7edc\u8bbe\u7f6e\u8fd8\u539f\u5230\u4e0a\u6b21\u7684\u5de5\u4f5c\u72b6\u6001\u3002",
                             "use_new_settings": "\u8fd9\u5c06\u4f7f\u65b0\u8bbe\u7f6e\u5199\u5165\u8bb0\u5fc6\u68d2\u3002\u4ec5\u5f53\u60a8\u6709\u610f\u66f4\u6539\u8bbe\u7f6e\u65f6\u624d\u9009\u62e9\u6b64\u9009\u9879\u3002"
@@ -1773,8 +1799,13 @@
             },
             "title": "Zigbee \u7f51\u7edc\u8bbe\u7f6e\u5df2\u66f4\u6539"
         },
+        "wrong_silabs_firmware_installed_nabucasa": {
+            "description": "\u60a8\u7684 Zigbee \u9002\u914d\u5668\u4e4b\u524d\u66fe\u4e0e\u591a\u534f\u8bae\uff08Zigbee \u548c Thread\uff09\u4e00\u8d77\u4f7f\u7528\uff0c\u5e76\u4e14\u4ecd\u5b89\u88c5\u4e86\u591a\u534f\u8bae\u56fa\u4ef6\uff1a\uff08{firmware_type}\uff09\u3002\n \n\u8981\u4ec5\u4f7f\u7528 ZHA \u8fd0\u884c\u60a8\u7684\u9002\u914d\u5668\uff0c\u60a8\u9700\u8981\u5b89\u88c5 Zigbee \u56fa\u4ef6\uff1a\n- \u8f6c\u81f3\u201c\u8bbe\u7f6e\u201d > \u201c\u7cfb\u7edf\u201d > \u201c\u786c\u4ef6\u201d\uff0c\u9009\u62e9\u8bbe\u5907\u5e76\u9009\u62e9\u201c\u914d\u7f6e\u201d\u3002\n- \u9009\u62e9\u201c\u5c06 Zigbee \u8fc1\u79fb\u5230\u65b0\u9002\u914d\u5668\u201d\u9009\u9879\u5e76\u6309\u7167\u8bf4\u660e\u8fdb\u884c\u64cd\u4f5c\u3002",
+            "title": "\u68c0\u6d4b\u5230\u5e26\u6709\u591a\u534f\u8bae\u56fa\u4ef6\u7684 Zigbee \u9002\u914d\u5668"
+        },
         "wrong_silabs_firmware_installed_other": {
-            "title": "\u68c0\u6d4b\u5230\u5e26\u6709\u591a\u534f\u8bae\u56fa\u4ef6\u7684 Zigbee \u65e0\u7ebf\u7535"
+            "description": "\u60a8\u7684 Zigbee \u9002\u914d\u5668\u4e4b\u524d\u7528\u4e8e\u591a\u534f\u8bae\uff08Zigbee \u548c Thread\uff09\uff0c\u5e76\u4e14\u4ecd\u7136\u5b89\u88c5\u6709\u591a\u534f\u8bae\u56fa\u4ef6\uff1a{firmware_type}\u3002\n\n\u8981\u5c06\u9002\u914d\u5668\u4e13\u95e8\u7528\u4e8e ZHA \uff0c\u9700\u8981\u5b89\u88c5 Zigbee \u56fa\u4ef6\u3002\u8bf7\u6309\u7167\u60a8\u7684 Zigbee \u9002\u914d\u5668\u5236\u9020\u5546\u7684\u8bf4\u660e\u4e66\u8fdb\u884c\u6b64\u64cd\u4f5c\u3002",
+            "title": "\u68c0\u6d4b\u5230\u5e26\u6709\u591a\u534f\u8bae\u56fa\u4ef6\u7684 Zigbee \u9002\u914d\u5668"
         }
     },
     "options": {
@@ -1783,6 +1814,7 @@
             "cannot_restore_backup": "\u60a8\u6b63\u5728\u8fd8\u539f\u7684\u9002\u914d\u5668\u65e0\u6cd5\u6b63\u786e\u652f\u6301\u5907\u4efd\u6062\u590d\u3002\u8bf7\u5347\u7ea7\u56fa\u4ef6\u3002\n \n\u9519\u8bef\uff1a{error}",
             "cannot_restore_backup_no_ieee_confirm": "\u60a8\u8981\u6062\u590d\u7684\u9002\u914d\u5668\u56fa\u4ef6\u5df2\u8fc7\u671f\uff0c\u65e0\u6cd5\u591a\u6b21\u5199\u5165\u9002\u914d\u5668 IEEE \u5730\u5740\u3002\u8bf7\u5347\u7ea7\u56fa\u4ef6\u6216\u5728\u4e0a\u4e00\u6b65\u4e2d\u786e\u8ba4\u6c38\u4e45\u8986\u76d6\u3002",
             "not_zha_device": "\u6b64\u8bbe\u5907\u4e0d\u662f ZHA \u8bbe\u5907",
+            "reconfigure_successful": "ZHA \u5df2\u6210\u529f\u4ece\u65e7\u9002\u914d\u5668\u8fc1\u79fb\u5230\u65b0\u9002\u914d\u5668\u3002\u8bf7\u7b49\u5f85\u51e0\u5206\u949f\uff0c\u8ba9\u60a8\u7684 Zigbee \u7f51\u7edc\u7a33\u5b9a\u4e0b\u6765\u3002\n \n\u5982\u679c\u60a8\u4e0d\u518d\u9700\u8981\u65e7\u9002\u914d\u5668\uff0c\u73b0\u5728\u53ef\u4ee5\u5c06\u5176\u62d4\u4e0b\u3002",
             "usb_probe_failed": "\u63a2\u6d4b USB \u8bbe\u5907\u5931\u8d25",
             "wrong_firmware_installed": "\u60a8\u7684\u8bbe\u5907\u8fd0\u884c\u7684\u662f\u9519\u8bef\u7684\u56fa\u4ef6\uff0c\u5728\u5b89\u88c5\u6b63\u786e\u7684\u56fa\u4ef6\u4e4b\u524d\uff0c\u65e0\u6cd5\u4e0e ZHA \u914d\u5408\u4f7f\u7528\u3002[\u5df2\u521b\u5efa\u4e00\u4e2a\u4fee\u590d]({repair_url}) \uff0c\u5176\u4e2d\u5305\u542b\u5173\u4e8e\u4fee\u590d\u6b64\u95ee\u9898\u7684\u66f4\u591a\u4fe1\u606f\u548c\u8bf4\u660e\u3002"
         },
@@ -1800,7 +1832,7 @@
                 "title": "\u8fd8\u539f\u81ea\u52a8\u5907\u4efd"
             },
             "choose_formation_strategy": {
-                "description": "\u9009\u62e9\u9002\u914d\u5668\u7684\u7f51\u7edc\u8bbe\u7f6e\u3002",
+                "description": "\u9009\u62e9\u60a8\u7684\u9002\u914d\u5668\u7684\u7f51\u7edc\u8bbe\u7f6e\u3002",
                 "menu_option_descriptions": {
                     "choose_automatic_backup": "\u5982\u679c\u60a8\u66f4\u6539\u4e86\u9002\u914d\u5668\u7684\u7f51\u7edc\u8bbe\u7f6e\uff0c\u8fd9\u5c06\u5141\u8bb8\u60a8\u5c06\u5176\u66f4\u6539\u56de\u4ee5\u524d\u7684\u72b6\u6001\u3002",
                     "form_initial_network": "\u8fd9\u5c06\u521b\u5efa\u65b0\u7684 Zigbee \u7f51\u7edc\u3002",
@@ -1841,14 +1873,15 @@
                 "title": "\u91cd\u65b0\u914d\u7f6e ZHA"
             },
             "intent_migrate": {
-                "title": "\u8fc1\u79fb\u5230\u65b0\u7684\u9002\u914d\u5668"
+                "description": "\u5728\u63d2\u5165\u65b0\u7684\u9002\u914d\u5668\u4e4b\u524d\uff0c\u9700\u8981\u91cd\u7f6e\u65e7\u7684\u9002\u914d\u5668\u3002\u7cfb\u7edf\u5c06\u4f1a\u6267\u884c\u4e00\u6b21\u81ea\u52a8\u5907\u4efd\u3002\u5982\u679c\u60a8\u4f7f\u7528 Z-Wave \u548c Zigbee \u7ec4\u5408\u9002\u914d\u5668\uff08\u4f8b\u5982 HUSBZB-1\uff09\uff0c\u5219\u53ea\u4f1a\u91cd\u7f6e Zigbee \u90e8\u5206\u3002\n\n*\u6ce8\u610f\uff1a\u5982\u679c\u60a8\u4ece **ConBee/RaspBee** \u8fc1\u79fb\u8fc7\u6765\uff0c\u8bf7\u786e\u4fdd\u5b83\u8fd0\u884c\u56fa\u4ef6 0x26720700 \u6216\u66f4\u9ad8\u7248\u672c\uff01\u5426\u5219\uff0c\u67d0\u4e9b\u8bbe\u5907\u5728\u8fc1\u79fb\u4e4b\u540e\u53ef\u80fd\u65e0\u6cd5\u63a7\u5236\uff0c\u76f4\u5230\u60a8\u7535\u6e90\u91cd\u542f\u5b83\u4eec\u3002*\n\n\u60a8\u8981\u7ee7\u7eed\u5417 \uff1f",
+                "title": "\u8fc1\u79fb\u5230\u65b0\u9002\u914d\u5668"
             },
             "manual_pick_radio_type": {
                 "data": {
-                    "radio_type": "\u5e7f\u64ad\u7c7b\u578b"
+                    "radio_type": "\u9002\u914d\u5668\u7c7b\u578b"
                 },
-                "description": "\u9009\u62e9\u60a8\u7684 Zigbee \u65e0\u7ebf\u7535\u7c7b\u578b",
-                "title": "\u5e7f\u64ad\u7c7b\u578b"
+                "description": "\u9009\u62e9\u60a8\u7684 Zigbee \u9002\u914d\u5668\u7c7b\u578b",
+                "title": "\u9002\u914d\u5668\u7c7b\u578b"
             },
             "manual_port_config": {
                 "data": {
@@ -1861,12 +1894,21 @@
             },
             "maybe_confirm_ezsp_restore": {
                 "data": {
-                    "overwrite_coordinator_ieee": "\u6c38\u4e45\u66ff\u6362\u65e0\u7ebf\u7535 IEEE \u5730\u5740"
+                    "overwrite_coordinator_ieee": "\u6c38\u4e45\u66ff\u6362\u9002\u914d\u5668 IEEE \u5730\u5740"
                 },
-                "description": "\u60a8\u7684\u5907\u4efd\u5177\u6709\u4e0e\u60a8\u7684\u9002\u914d\u5668\u4e0d\u540c\u7684 IEEE \u5730\u5740\u3002\u4e3a\u4e86\u4f7f\u7f51\u7edc\u6b63\u5e38\u8fd0\u884c\uff0c\u5e94\u4fee\u6539\u9002\u914d\u5668\u7684 IEEE \u5730\u5740\u3002\n\n\u8fd9\u662f\u4e00\u4e2a\u6c38\u4e45\u6027\u7684\u64cd\u4f5c\u3002",
-                "title": "\u8986\u76d6\u65e0\u7ebf\u7535 IEEE \u5730\u5740"
+                "description": "\u60a8\u7684\u5907\u4efd\u8bbe\u5907\u7684 IEEE \u5730\u5740\u4e0e\u60a8\u7684\u9002\u914d\u5668\u4e0d\u540c\u3002\u4e3a\u4e86\u4fdd\u8bc1\u60a8\u7684\u7f51\u7edc\u6b63\u5e38\u8fd0\u884c\uff0c\u60a8\u9002\u914d\u5668\u7684 IEEE \u5730\u5740\u4e5f\u5e94\u66f4\u6539\u3002\n \n\u6b64\u64cd\u4f5c\u4e3a\u6c38\u4e45\u6027\u64cd\u4f5c\u3002",
+                "title": "\u8986\u76d6\u9002\u914d\u5668 IEEE \u5730\u5740"
             },
             "prompt_migrate_or_reconfigure": {
+                "description": "\u60a8\u662f\u8981\u8fc1\u79fb\u5230\u65b0\u7684\u9002\u914d\u5668\uff0c\u8fd8\u662f\u91cd\u65b0\u914d\u7f6e\u5f53\u524d\u9002\u914d\u5668 \uff1f",
+                "menu_option_descriptions": {
+                    "intent_migrate": "\u8fd9\u5c06\u5e2e\u52a9\u60a8\u5c06 Zigbee \u7f51\u7edc\u4ece\u65e7\u9002\u914d\u5668\u8fc1\u79fb\u5230\u65b0\u9002\u914d\u5668\u3002",
+                    "intent_reconfigure": "\u8fd9\u5c06\u5141\u8bb8\u60a8\u66f4\u6539\u5f53\u524d Zigbee \u9002\u914d\u5668\u7684\u4e32\u884c\u7aef\u53e3\u3002"
+                },
+                "menu_options": {
+                    "intent_migrate": "\u8fc1\u79fb\u5230\u65b0\u9002\u914d\u5668",
+                    "intent_reconfigure": "\u91cd\u65b0\u914d\u7f6e\u5f53\u524d\u9002\u914d\u5668"
+                },
                 "title": "\u8fc1\u79fb\u6216\u91cd\u65b0\u914d\u7f6e"
             },
             "upload_manual_backup": {
@@ -1877,8 +1919,8 @@
                 "title": "\u4e0a\u4f20\u624b\u52a8\u5907\u4efd"
             },
             "verify_radio": {
-                "description": "\u60a8\u6b63\u5728\u4f7f\u7528\u7684\u9002\u914d\u5668 ({name}) \u4e0d\u88ab\u63a8\u8350\uff0c\u5e76\u4e14\u672a\u6765\u53ef\u80fd\u4f1a\u53d6\u6d88\u5bf9\u5b83\u7684\u652f\u6301\u3002\u8bf7\u53c2\u9605 Zigbee Home Automation \u96c6\u6210\u7684\u6587\u6863\u4ee5\u83b7\u53d6[\u63a8\u8350\u9002\u914d\u5668\u5217\u8868]({docs_recommended_adapters_url})\u3002",
-                "title": "\u4e0d\u63a8\u8350\u4f7f\u7528\u65e0\u7ebf\u7535"
+                "description": "\u4e0d\u63a8\u8350\u60a8\u6b63\u5728\u4f7f\u7528\u7684\u9002\u914d\u5668\uff08{name}\uff09\uff0c\u672a\u6765\u53ef\u80fd\u4f1a\u53d6\u6d88\u5bf9\u5b83\u7684\u652f\u6301\u3002\u53c2\u9605 Zigbee Home Automation \u96c6\u6210\u7684\u6587\u6863\u53ef\u83b7\u53d6\u3010\u63a8\u8350\u9002\u914d\u5668\u5217\u8868\u3011({docs_recommended_adapters_url}) \u3002",
+                "title": "\u4e0d\u63a8\u8350\u4f7f\u7528\u9002\u914d\u5668"
             }
         }
     },

homeassistant/components/zha/translations/zh-Hant.json

@@ -25,6 +25,7 @@
                 "title": "\u56de\u5fa9\u81ea\u52d5\u5099\u4efd"
             },
             "choose_formation_strategy": {
+                "description": "\u9078\u64c7\u8f49\u63a5\u5668\u7684\u7db2\u8def\u8a2d\u5b9a\u3002",
                 "menu_option_descriptions": {
                     "choose_automatic_backup": "\u6b64\u52d5\u4f5c\u53ef\u4ee5\u5c07\u4ecb\u9762\u5361\u7684\u7db2\u8def\u8a2d\u5b9a\u56de\u5fa9\u81f3\u5148\u524d\u7684\u72c0\u614b\uff0c\u4ee5\u9632\u60a8\u5df2\u9032\u884c\u8b8a\u66f4\u3002",
                     "form_initial_network": "\u6b64\u52d5\u4f5c\u5c07\u5efa\u7acb\u65b0 Zigbee \u7db2\u8def\u3002",
@@ -36,6 +37,7 @@
                     "choose_automatic_backup": "\u56de\u5fa9\u81ea\u52d5\u5099\u4efd",
                     "form_initial_network": "\u5efa\u7acb\u7db2\u8def",
                     "form_new_network": "\u522a\u9664\u7db2\u8def\u8a2d\u5b9a\u4e26\u5efa\u7acb\u65b0\u7db2\u8def\u8a2d\u5b9a",
+                    "reuse_settings": "\u4fdd\u7559\u8f49\u63a5\u5668\u7db2\u8def\u8a2d\u5b9a",
                     "upload_manual_backup": "\u4e0a\u50b3\u624b\u52d5\u5099\u4efd"
                 },
                 "title": "\u7db2\u8def\u683c\u5f0f"
@@ -56,6 +58,7 @@
                 "data": {
                     "path": "\u5e8f\u5217\u88dd\u7f6e\u8def\u5f91"
                 },
+                "description": "\u9078\u64c7 Zigbee \u8f49\u63a5\u5668\u5e8f\u5217\u57e0",
                 "title": "\u9078\u64c7\u5e8f\u5217\u57e0"
             },
             "choose_setup_strategy": {
@@ -76,6 +79,13 @@
             "confirm_hardware": {
                 "description": "\u662f\u5426\u8981\u8a2d\u5b9a {name}\uff1f"
             },
+            "manual_pick_radio_type": {
+                "data": {
+                    "radio_type": "\u8f49\u63a5\u5668\u985e\u578b"
+                },
+                "description": "\u9078\u64c7 Zigbee \u8f49\u63a5\u5668\u985e\u578b",
+                "title": "\u9078\u64c7\u8f49\u63a5\u5668\u985e\u578b"
+            },
             "manual_port_config": {
                 "data": {
                     "baudrate": "\u5e8f\u5217\u57e0\u901f\u5ea6",
@@ -90,6 +100,13 @@
                 "description": "ZHA \u7121\u6cd5\u81ea\u52d5\u5075\u6e2c\u8f49\u63a5\u5668\u7684\u5e8f\u5217\u57e0\u8a2d\u5b9a\u3002\u901a\u5e38\u662f\u97cc\u9ad4\u6216\u6b0a\u9650\u554f\u984c\u3002\n \n\u5047\u5982\u4f7f\u7528\u7684\u97cc\u9ad4\u5177\u6709\u975e\u6a19\u6e96\u8a2d\u5b9a\uff0c\u8acb\u8f38\u5165\u5e8f\u5217\u57e0\u8a2d\u5b9a",
                 "title": "\u5e8f\u5217\u57e0\u8a2d\u5b9a"
             },
+            "maybe_confirm_ezsp_restore": {
+                "data": {
+                    "overwrite_coordinator_ieee": "\u6c38\u4e45\u53d6\u4ee3\u8f49\u63a5\u5668 IEEE \u4f4d\u5740"
+                },
+                "description": "\u5099\u4efd\u4e2d\u7684 IEEE \u4f4d\u5740\u8207\u73fe\u6709\u8f49\u63a5\u5668\u4e0d\u540c\u3002\u70ba\u4e86\u78ba\u8a8d\u7db2\u8def\u6b63\u5e38\u5de5\u4f5c\uff0c\u8f49\u63a5\u5668\u7684 IEEE \u4f4d\u5740\u5fc5\u9808\u9032\u884c\u8b8a\u66f4\u3002\n\n\u6b64\u70ba\u6c38\u4e45\u6027\u64cd\u4f5c\u3002",
+                "title": "\u8986\u5beb\u8f49\u63a5\u5668 IEEE \u4f4d\u5740"
+            },
             "maybe_reset_old_radio": {
                 "description": "\u5148\u524d\u5df2\u5efa\u7acb\u5099\u4efd\uff0c\u4f5c\u70ba\u9077\u79fb\u7684\u4e00\u90e8\u5206\uff0c\u6b63\u5728\u91cd\u7f6e\u820a\u8f49\u63a5\u5668\u3002",
                 "title": "\u91cd\u7f6e\u820a\u8f49\u63a5\u5668"
@@ -100,6 +117,10 @@
                 },
                 "description": "\u7531\u4e0a\u50b3\u7684\u5099\u4efd JSON \u6a94\u6848\u4e2d\u56de\u5fa9\u7db2\u8def\u8a2d\u5b9a\u3002\u53ef\u4ee5\u7531\u4e0d\u540c\u7684 ZHA \u5b89\u88dd\u4e2d\u7684 **\u7db2\u8def\u8a2d\u5b9a** \u9032\u884c\u4e0b\u8f09\u3001\u6216\u4f7f\u7528 Zigbee2MQTT  \u4e2d\u7684 `coordinator_backup.json` \u6a94\u6848\u3002",
                 "title": "\u4e0a\u50b3\u624b\u52d5\u5099\u4efd"
+            },
+            "verify_radio": {
+                "description": "\u6240\u4f7f\u7528\u7684\u8f49\u63a5\u5668 ({name}) \u70ba\u4e0d\u5efa\u8b70\u4f7f\u7528\u8207\u652f\u63f4\uff0c\u53ef\u80fd\u6703\u65bc\u672a\u4f86\u9032\u884c\u79fb\u9664\u3002\u8acb\u53c3\u95b1 Zigbee Home Automation \u6574\u5408\u6587\u4ef6\u4ee5\u53d6\u5f97 [\u5efa\u8b70\u7684\u8f49\u63a5\u5668\u5217\u8868]({docs_recommended_adapters_url})\u3002",
+                "title": "\u4e0d\u5efa\u8b70\u4f7f\u7528\u8f49\u63a5\u5668"
             }
         }
     },
@@ -1763,6 +1784,7 @@
             "fix_flow": {
                 "step": {
                     "init": {
+                        "description": "\u60a8\u7684 Zigbee \u8f49\u63a5\u5668\u7db2\u8def\u8a2d\u5b9a\u8207\u6700\u8fd1\u4e00\u6b21\u7db2\u8def\u5099\u4efd\u4e0d\u4e00\u81f4\u3002\u9019\u7a2e\u72c0\u614b\u901a\u5e38\u767c\u751f\u5728\u5176\u4ed6 Zigbee \u6574\u5408\uff08\u4f8b\u5982 Zigbee2MQTT \u6216 deCONZ\uff09\u8986\u84cb\u539f\u59cb\u8a2d\u5b9a\u7684\u60c5\u6cc1\u3002\n\n{diff}\n\n\u5982\u679c\u60a8\u7121\u610f\u8b8a\u66f4\u7db2\u8def\u8a2d\u5b9a\uff0c\u8acb\u5f9e\u6700\u8fd1\u7684\u5099\u4efd\u4e2d\u9032\u884c\u56de\u5fa9\uff1a\u5426\u5247\u88dd\u7f6e\u5c07\u7121\u6cd5\u904b\u4f5c\u3002",
                         "menu_option_descriptions": {
                             "restore_old_settings": "\u6b64\u52d5\u4f5c\u5c07\u628a\u7db2\u8def\u8a2d\u5b9a\u56de\u5fa9\u81f3\u4e0a\u4e00\u6b21\u53ef\u6b63\u5e38\u904b\u4f5c\u7684\u72c0\u614b\u3002",
                             "use_new_settings": "\u6b64\u52d5\u4f5c\u6703\u5c07\u65b0\u8a2d\u5b9a\u5beb\u5165\u96a8\u8eab\u789f\u3002\u53ea\u6709\u5728\u523b\u610f\u8b8a\u66f4\u8a2d\u5b9a\u6642\u624d\u9078\u64c7\u6b64\u9078\u9805\u3002"
@@ -1777,8 +1799,13 @@
             },
             "title": "Zigbee \u7db2\u8def\u8a2d\u5b9a\u5df2\u66f4\u6539"
         },
+        "wrong_silabs_firmware_installed_nabucasa": {
+            "description": "\u60a8\u7684 Zigbee \u8f49\u63a5\u5668\u5148\u524d\u66fe\u4f7f\u7528\u904e\u591a\u5354\u8b70\uff08Zigbee \u8207 Thread\uff09\u3001\u4e26\u4e14\u4f9d\u7136\u5b89\u88dd\u8457\u591a\u5354\u8b70\u97cc\u9ad4\uff1a({firmware_type})\u3002 \n\n\u82e5\u8981\u642d\u914d ZHA \u4f7f\u7528\u6b64\u8f49\u63a5\u5668\uff0c\u8acb\u5b89\u88dd Zigbee \u97cc\u9ad4\uff1a\n - \u524d\u5f80\u8a2d\u5b9a > \u7cfb\u7d71 > \u786c\u9ad4\uff0c\u9078\u53d6\u88dd\u7f6e\u5f8c\u9ede\u9078\u8a2d\u5b9a\u3002\n - \u9078\u64c7 '\u5c07 Zigbee \u79fb\u8f49\u81f3\u65b0\u8f49\u63a5\u5668'  \u9078\u9805\u3001\u4e26\u4f9d\u6307\u793a\u64cd\u4f5c\u3002",
+            "title": "\u5075\u6e2c\u5230\u5177\u6709\u591a\u5354\u5b9a\u97cc\u9ad4\u7684 Zigbee \u8f49\u63a5\u5668"
+        },
         "wrong_silabs_firmware_installed_other": {
-            "title": "\u5075\u6e2c\u5230\u5177\u6709\u591a\u5354\u5b9a\u97cc\u9ad4\u7684 Zigbee \u7121\u7dda\u96fb"
+            "description": "\u60a8\u7684 Zigbee \u8f49\u63a5\u5668\u5148\u524d\u66fe\u4f7f\u7528\u904e\u591a\u5354\u8b70\uff08Zigbee \u8207 Thread\uff09\u3001\u4e26\u4e14\u4f9d\u7136\u5b89\u88dd\u8457\u591a\u5354\u8b70\u97cc\u9ad4\uff1a({firmware_type})\u3002\n\n\u82e5\u8981\u642d\u914d ZHA \u4f7f\u7528\u6b64\u8f49\u63a5\u5668\uff0c\u8acb\u5b89\u88dd Zigbee \u97cc\u9ad4\u3002\u8acb\u53c3\u95b1\u60a8\u7684 Zigbee \u8f49\u63a5\u5668\u88fd\u9020\u5546\u7684\u8aaa\u660e\u9032\u884c\u64cd\u4f5c\u3002",
+            "title": "\u5075\u6e2c\u5230\u5177\u6709\u591a\u5354\u5b9a\u97cc\u9ad4\u7684 Zigbee \u8f49\u63a5\u5668"
         }
     },
     "options": {
@@ -1787,6 +1814,7 @@
             "cannot_restore_backup": "\u6240\u8981\u56de\u5fa9\u7684\u8f49\u63a5\u5668\u4e0d\u6b63\u78ba\u652f\u63f4\u5099\u4efd\u56de\u5fa9\u3002\u8acb\u5347\u7d1a\u97cc\u9ad4\u3002\n\n\u932f\u8aa4\uff1a{error}",
             "cannot_restore_backup_no_ieee_confirm": "\u6240\u8981\u56de\u5fa9\u76ee\u6a19\u7684\u8f49\u63a5\u5668\u97cc\u9ad4\u904e\u820a\uff0c\u7121\u6cd5\u591a\u6b21\u5beb\u5165\u8f49\u63a5\u5668\u7684 IEEE \u4f4d\u5740\u3002\u8acb\u5347\u7d1a\u97cc\u9ad4\uff0c\u6216\u5728\u4e0a\u4e00\u6b65\u9a5f\u4e2d\u78ba\u8a8d\u6c38\u4e45\u8986\u5beb\u3002",
             "not_zha_device": "\u6240\u767c\u73fe\u7684\u88dd\u7f6e\u4e26\u975e ZHA \u88dd\u7f6e",
+            "reconfigure_successful": "ZHA \u5df2\u6210\u529f\u5f9e\u820a\u8f49\u63a5\u5668\u9077\u79fb\u5230\u65b0\u8f49\u63a5\u5668\u3002\u8acb\u7d66\u4e88 Zigbee \u7db2\u8def\u5e7e\u5206\u9418\u7684\u6642\u9593\u4f86\u7a69\u5b9a\u3002\n\n\u5982\u679c\u5df2\u4e0d\u518d\u9700\u8981\u820a\u8f49\u63a5\u5668\uff0c\u73fe\u5728\u53ef\u4ee5\u9032\u884c\u62d4\u9664\u3002",
             "usb_probe_failed": "\u5075\u6e2c USB \u88dd\u7f6e\u5931\u6557",
             "wrong_firmware_installed": "\u60a8\u7684\u88dd\u7f6e\u6b63\u57f7\u884c\u932f\u8aa4\u7684\u97cc\u9ad4\uff0c\u5728\u4f7f\u7528\u6b63\u78ba\u7684\u97cc\u9ad4\u4e4b\u524d\u3001\u5c07\u7121\u6cd5\u8207 ZHA \u914d\u5408\u4f7f\u7528\u3002[\u5df2\u7d93\u5efa\u7acb\u4e86\u4e00\u500b\u4fee\u6b63]({repair_url})\u3001\u5176\u4e2d\u5305\u542b\u66f4\u8a73\u7d30\u8aaa\u660e\u8207\u4fee\u6b63\u554f\u984c\u7684\u6307\u793a\u3002"
         },
@@ -1804,7 +1832,7 @@
                 "title": "\u56de\u5fa9\u81ea\u52d5\u5099\u4efd"
             },
             "choose_formation_strategy": {
-                "description": "\u9078\u64c7\u7121\u7dda\u96fb\u7684\u7db2\u8def\u8a2d\u5b9a",
+                "description": "\u9078\u64c7\u8f49\u63a5\u5668\u7684\u7db2\u8def\u8a2d\u5b9a\u3002",
                 "menu_option_descriptions": {
                     "choose_automatic_backup": "\u6b64\u52d5\u4f5c\u53ef\u4ee5\u5c07\u4ecb\u9762\u5361\u7684\u7db2\u8def\u8a2d\u5b9a\u56de\u5fa9\u81f3\u5148\u524d\u7684\u72c0\u614b\uff0c\u4ee5\u9632\u60a8\u5df2\u9032\u884c\u8b8a\u66f4\u3002",
                     "form_initial_network": "\u6b64\u52d5\u4f5c\u5c07\u5efa\u7acb\u65b0 Zigbee \u7db2\u8def\u3002",
@@ -1816,7 +1844,7 @@
                     "choose_automatic_backup": "\u56de\u5fa9\u81ea\u52d5\u5099\u4efd",
                     "form_initial_network": "\u5efa\u7acb\u7db2\u8def",
                     "form_new_network": "\u522a\u9664\u7db2\u8def\u8a2d\u5b9a\u4e26\u5efa\u7acb\u65b0\u7db2\u8def\u8a2d\u5b9a",
-                    "reuse_settings": "\u4fdd\u7559\u7121\u7dda\u96fb\u7db2\u8def\u8a2d\u5b9a",
+                    "reuse_settings": "\u4fdd\u7559\u8f49\u63a5\u5668\u7db2\u8def\u8a2d\u5b9a",
                     "upload_manual_backup": "\u4e0a\u50b3\u624b\u52d5\u5099\u4efd"
                 },
                 "title": "\u7db2\u8def\u683c\u5f0f"
@@ -1837,27 +1865,23 @@
                 "data": {
                     "path": "\u5e8f\u5217\u88dd\u7f6e\u8def\u5f91"
                 },
-                "description": "\u9078\u64c7 Zigbee \u7121\u7dda\u96fb\u5e8f\u5217\u57e0",
+                "description": "\u9078\u64c7 Zigbee \u8f49\u63a5\u5668\u5e8f\u5217\u57e0",
                 "title": "\u9078\u64c7\u5e8f\u5217\u57e0"
             },
             "init": {
                 "description": "\u5c07\u57f7\u884c\u5099\u4efd\u4e26\u505c\u6b62 ZHA\u3001\u662f\u5426\u8981\u7e7c\u7e8c\uff1f",
                 "title": "\u91cd\u65b0\u8a2d\u5b9a ZHA"
             },
-            "instruct_unplug": {
-                "description": "\u820a\u8f49\u63a5\u5668\u5df2\u7d93\u91cd\u7f6e\uff0c\u5047\u5982\u786c\u9ad4\u4e0d\u518d\u4f7f\u7528\u3001\u53ef\u4ee5\u9032\u884c\u79fb\u9664\u3002\n\n\u73fe\u5728\u53ef\u4ee5\u63d2\u5165\u65b0\u8f49\u63a5\u5668\u3002",
-                "title": "\u79fb\u9664\u820a\u8f49\u63a5\u5668"
-            },
             "intent_migrate": {
                 "description": "\u63d2\u5165\u65b0\u8f49\u63a5\u5668\u4e4b\u524d\uff0c\u9700\u8981\u5148\u5c0d\u820a\u8f49\u63a5\u5668\u9032\u884c\u91cd\u7f6e\u3002\u5c07\u6703\u57f7\u884c\u81ea\u52d5\u5099\u4efd\uff0c\u5047\u5982\u4f7f\u7528\u7684\u8f49\u63a5\u5668\u70ba\u985e\u4f3c\u65bc HUSBZB-1 \u7684 Z-Wave \u8207 Zigbee \u8907\u5408\u88dd\u7f6e\uff0c\u5c07\u50c5\u6703\u91cd\u7f6e Zigbee \u90e8\u5206\u3002\n\n*\u6ce8\u610f\uff1a\u5047\u5982\u662f\u5f9e **ConBee/RaspBee** \u8f49\u79fb\u904e\u4f86\u3001\u8acb\u78ba\u8a8d\u57f7\u884c\u97cc\u9ad4\u7248\u672c\u70ba `0x26720700` \u6216\u66f4\u65b0\u7248\u672c\uff0c\u5426\u5247\u53ef\u80fd\u6703\u5c0e\u81f4\u90e8\u5206\u88dd\u7f6e\u7121\u6cd5\u63a7\u5236\u3001\u76f4\u5230\u91cd\u65b0\u65b7\u96fb\u555f\u52d5\u3002*\n\n\u662f\u5426\u8981\u7e7c\u7e8c\uff1f",
                 "title": "\u9077\u79fb\u81f3\u65b0\u8f49\u63a5\u5668"
             },
             "manual_pick_radio_type": {
                 "data": {
-                    "radio_type": "\u7121\u7dda\u96fb\u985e\u578b"
+                    "radio_type": "\u8f49\u63a5\u5668\u985e\u578b"
                 },
-                "description": "\u9078\u64c7 Zigbee \u7121\u7dda\u96fb\u985e\u5225",
-                "title": "\u7121\u7dda\u96fb\u985e\u578b"
+                "description": "\u9078\u64c7 Zigbee \u8f49\u63a5\u5668\u985e\u578b",
+                "title": "\u8f49\u63a5\u5668\u985e\u578b"
             },
             "manual_port_config": {
                 "data": {
@@ -1870,12 +1894,13 @@
             },
             "maybe_confirm_ezsp_restore": {
                 "data": {
-                    "overwrite_coordinator_ieee": "\u6c38\u4e45\u53d6\u4ee3\u8a2d\u5099 IEEE \u4f4d\u5740"
+                    "overwrite_coordinator_ieee": "\u6c38\u4e45\u53d6\u4ee3\u8f49\u63a5\u5668 IEEE \u4f4d\u5740"
                 },
-                "description": "\u5099\u4efd\u4e2d\u7684 IEEE \u4f4d\u5740\u8207\u73fe\u6709\u8a2d\u5099\u4e0d\u540c\u3002\u70ba\u4e86\u78ba\u8a8d\u7db2\u8def\u6b63\u5e38\u5de5\u4f5c\uff0c\u8a2d\u5099\u7684 IEEE \u4f4d\u5740\u5fc5\u9808\u9032\u884c\u8b8a\u66f4\u3002\n\n\u6b64\u70ba\u6c38\u4e45\u6027\u64cd\u4f5c\u3002.",
-                "title": "\u8986\u5beb\u7121\u7dda\u96fb IEEE \u4f4d\u5740"
+                "description": "\u5099\u4efd\u4e2d\u7684 IEEE \u4f4d\u5740\u8207\u73fe\u6709\u8f49\u63a5\u5668\u4e0d\u540c\u3002\u70ba\u4e86\u78ba\u8a8d\u7db2\u8def\u6b63\u5e38\u5de5\u4f5c\uff0c\u8f49\u63a5\u5668\u7684 IEEE \u4f4d\u5740\u5fc5\u9808\u9032\u884c\u8b8a\u66f4\u3002\n\n\u6b64\u70ba\u6c38\u4e45\u6027\u64cd\u4f5c\u3002",
+                "title": "\u8986\u5beb\u8f49\u63a5\u5668 IEEE \u4f4d\u5740"
             },
             "prompt_migrate_or_reconfigure": {
+                "description": "\u8981\u9077\u79fb\u81f3\u65b0\u8f49\u63a5\u5668\u6216\u91cd\u65b0\u8a2d\u5b9a\u76ee\u524d\u8f49\u63a5\u5668\uff1f",
                 "menu_option_descriptions": {
                     "intent_migrate": "\u6b64\u52d5\u4f5c\u5c07\u5354\u52a9\u4f60\u5c07 Zigbee \u7db2\u8def\u5f9e\u820a\u7684\u8f49\u63a5\u5668\u9077\u79fb\u5230\u65b0\u7684\u3002",
                     "intent_reconfigure": "\u6b64\u52d5\u4f5c\u53ef\u8b8a\u66f4\u76ee\u524d Zigbee \u8f49\u63a5\u5668\u5e8f\u5217\u57e0\u3002"
@@ -1894,8 +1919,8 @@
                 "title": "\u4e0a\u50b3\u624b\u52d5\u5099\u4efd"
             },
             "verify_radio": {
-                "description": "\u6240\u4f7f\u7528\u7684\u50b3\u8f38\u5668 ({name}) \u70ba\u4e0d\u5efa\u8b70\u4f7f\u7528\u8207\u652f\u63f4\uff0c\u53ef\u80fd\u6703\u65bc\u672a\u4f86\u9032\u884c\u79fb\u9664\u3002\u8acb\u53c3\u95b1 Zigbee Home Automation \u6574\u5408\u6587\u4ef6\u4ee5\u53d6\u5f97 [\u5efa\u8b70\u7684\u50b3\u8f38\u5668\u5217\u8868]({docs_recommended_adapters_url}).",
-                "title": "\u4e0d\u5efa\u8b70\u50b3\u8f38\u5668"
+                "description": "\u6240\u4f7f\u7528\u7684\u8f49\u63a5\u5668 ({name}) \u70ba\u4e0d\u5efa\u8b70\u4f7f\u7528\u8207\u652f\u63f4\uff0c\u53ef\u80fd\u6703\u65bc\u672a\u4f86\u9032\u884c\u79fb\u9664\u3002\u8acb\u53c3\u95b1 Zigbee Home Automation \u6574\u5408\u6587\u4ef6\u4ee5\u53d6\u5f97 [\u5efa\u8b70\u7684\u8f49\u63a5\u5668\u5217\u8868]({docs_recommended_adapters_url})\u3002",
+                "title": "\u4e0d\u5efa\u8b70\u4f7f\u7528\u8f49\u63a5\u5668"
             }
         }
     },

homeassistant/components/zwave_js/config_flow.py

@@ -703,7 +703,15 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
     async def async_step_on_supervisor(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle logic when on Supervisor host."""
+        """Handle logic when on Supervisor host.
+
+        When the add-on is running, we copy over it's settings.
+        We will ignore settings for USB/Socket if those were discovered.
+
+        If add-on is not running, we will configure the add-on.
+
+        When it's not installed, we install it with new config options.
+        """
         if user_input is None:
             return self.async_show_form(
                 step_id="on_supervisor", data_schema=ON_SUPERVISOR_SCHEMA
@@ -717,8 +725,11 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
         if addon_info.state == AddonState.RUNNING:
             addon_config = addon_info.options
-            self.usb_path = addon_config.get(CONF_ADDON_DEVICE)
-            self.socket_path = addon_config.get(CONF_ADDON_SOCKET)
+            # Use the options set by USB/ESPHome discovery
+            if not self._adapter_discovered:
+                self.usb_path = addon_config.get(CONF_ADDON_DEVICE)
+                self.socket_path = addon_config.get(CONF_ADDON_SOCKET)
+
             self.s0_legacy_key = addon_config.get(CONF_ADDON_S0_LEGACY_KEY, "")
             self.s2_access_control_key = addon_config.get(
                 CONF_ADDON_S2_ACCESS_CONTROL_KEY, ""
@@ -918,7 +929,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             discovery_info = await self._async_get_addon_discovery_info()
             self.ws_address = f"ws://{discovery_info['host']}:{discovery_info['port']}"
 
-        if not self.unique_id or self.source in (SOURCE_USB, SOURCE_ESPHOME):
+        if not self.unique_id or self.source == SOURCE_USB:
             if not self.version_info:
                 try:
                     self.version_info = await async_get_version_info(
@@ -931,6 +942,21 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
                 str(self.version_info.home_id), raise_on_progress=False
             )
 
+        # When we came from discovery, make sure we update the add-on
+        if self._adapter_discovered and self.use_addon:
+            await self._async_set_addon_config(
+                {
+                    CONF_ADDON_DEVICE: self.usb_path,
+                    CONF_ADDON_SOCKET: self.socket_path,
+                    CONF_ADDON_S0_LEGACY_KEY: self.s0_legacy_key,
+                    CONF_ADDON_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
+                    CONF_ADDON_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
+                    CONF_ADDON_S2_UNAUTHENTICATED_KEY: self.s2_unauthenticated_key,
+                    CONF_ADDON_LR_S2_ACCESS_CONTROL_KEY: self.lr_s2_access_control_key,
+                    CONF_ADDON_LR_S2_AUTHENTICATED_KEY: self.lr_s2_authenticated_key,
+                }
+            )
+
         self._abort_if_unique_id_configured(
             updates={
                 CONF_URL: self.ws_address,
@@ -942,7 +968,12 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
                 CONF_S2_UNAUTHENTICATED_KEY: self.s2_unauthenticated_key,
                 CONF_LR_S2_ACCESS_CONTROL_KEY: self.lr_s2_access_control_key,
                 CONF_LR_S2_AUTHENTICATED_KEY: self.lr_s2_authenticated_key,
-            }
+            },
+            error=(
+                "migration_successful"
+                if self.source in (SOURCE_USB, SOURCE_ESPHOME)
+                else "already_configured"
+            ),
         )
         return self._async_create_entry_from_vars()
 
@@ -1490,6 +1521,8 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             )
             # Only update existing entries that are configured via sockets
             and existing_entry.data.get(CONF_SOCKET_PATH)
+            # And use the add-on
+            and existing_entry.data.get(CONF_USE_ADDON)
         ):
             await self._async_set_addon_config(
                 {CONF_ADDON_SOCKET: discovery_info.socket_path}
@@ -1498,6 +1531,11 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             self.hass.config_entries.async_schedule_reload(existing_entry.entry_id)
             return self.async_abort(reason="already_configured")
 
+        # We are not aborting if home ID configured here, we just want to make sure that it's set
+        # We will update a USB based config entry automatically in `async_step_finish_addon_setup_user`
+        await self.async_set_unique_id(
+            str(discovery_info.zwave_home_id), raise_on_progress=False
+        )
         self.socket_path = discovery_info.socket_path
         self.context["title_placeholders"] = {
             CONF_NAME: f"{discovery_info.name} via ESPHome"

homeassistant/components/zwave_js/light.py

@@ -612,10 +612,7 @@ class ZwaveColorOnOffLight(ZwaveLight):
             # If brightness gets set, preserve the color and mix it with the new brightness
             if self.color_mode == ColorMode.HS:
                 scale = brightness / 255
-            if (
-                self._last_on_color is not None
-                and None not in self._last_on_color.values()
-            ):
+            if self._last_on_color is not None:
                 # Changed brightness from 0 to >0
                 old_brightness = max(self._last_on_color.values())
                 new_scale = brightness / old_brightness
@@ -634,8 +631,9 @@ class ZwaveColorOnOffLight(ZwaveLight):
             elif current_brightness is not None:
                 scale = current_brightness / 255
 
-        # Reset last color until turning off again
+        # Reset last color and brightness until turning off again
         self._last_on_color = None
+        self._last_brightness = None
 
         if new_colors is None:
             new_colors = self._get_new_colors(
@@ -651,8 +649,10 @@ class ZwaveColorOnOffLight(ZwaveLight):
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
 
-        # Remember last color and brightness to restore it when turning on
-        self._last_brightness = self.brightness
+        # Remember last color and brightness to restore it when turning on,
+        # only if we're sure the light is turned on to avoid overwriting good values
+        if self._last_brightness is None:
+            self._last_brightness = self.brightness
         if self._current_color and isinstance(self._current_color.value, dict):
             red = self._current_color.value.get(COLOR_SWITCH_COMBINED_RED)
             green = self._current_color.value.get(COLOR_SWITCH_COMBINED_GREEN)
@@ -666,7 +666,8 @@ class ZwaveColorOnOffLight(ZwaveLight):
             if blue is not None:
                 last_color[ColorComponent.BLUE] = blue
 
-            if last_color:
+            # Only store the last color if we're aware of it, i.e. ignore off light
+            if last_color and max(last_color.values()) > 0:
                 self._last_on_color = last_color
 
         if self._target_brightness:

homeassistant/components/zwave_js/translations/nl.json

@@ -133,6 +133,12 @@
             "can": {
                 "name": "Botsingen"
             },
+            "node_status": {
+                "state": {
+                    "asleep": "Slapend",
+                    "awake": "Wakker"
+                }
+            },
             "signal_strength": {
                 "name": "Signaalsterkte"
             },

homeassistant/components/zwave_js/translations/ru.json

@@ -74,6 +74,10 @@
                 "description": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043b\u044e\u0447\u0438 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u0434\u043b\u044f \u0432\u0430\u0448\u0435\u0439 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u0441\u0435\u0442\u0438 Z-Wave",
                 "title": "\u041a\u043b\u044e\u0447\u0438 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438"
             },
+            "confirm_usb_migration": {
+                "description": "\u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0432\u0430\u0448\u0443 \u0441\u0435\u0442\u044c Z-Wave \u0441\u043e \u0441\u0442\u0430\u0440\u043e\u0433\u043e \u0430\u0434\u0430\u043f\u0442\u0435\u0440\u0430 \u043d\u0430 \u043d\u043e\u0432\u044b\u0439 \u0430\u0434\u0430\u043f\u0442\u0435\u0440 {usb_title}. \u0411\u0443\u0434\u0435\u0442 \u0441\u043e\u0437\u0434\u0430\u043d\u0430 \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u0430\u044f \u043a\u043e\u043f\u0438\u044f \u0441\u0435\u0442\u0438 \u0441\u043e \u0441\u0442\u0430\u0440\u043e\u0433\u043e \u0430\u0434\u0430\u043f\u0442\u0435\u0440\u0430 \u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0435\u0442\u0438 \u043d\u0430 \u043d\u043e\u0432\u044b\u0439 \u0430\u0434\u0430\u043f\u0442\u0435\u0440.\n\n\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u043c\u0438\u0433\u0440\u0430\u0446\u0438\u044e.",
+                "title": "\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0439 \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
+            },
             "hassio_confirm": {
                 "description": "\u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044e Z-Wave \u0441 \u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435\u043c Z-Wave?"
             },
@@ -81,6 +85,7 @@
                 "title": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f"
             },
             "installation_type": {
+                "description": "\u0412 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0448\u0430\u0433\u043e\u0432 \u043c\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u043c \u0432\u0430\u0448 \u0430\u0434\u0430\u043f\u0442\u0435\u0440. Home Assistant \u043c\u043e\u0436\u0435\u0442 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c\u0443\u044e \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e Z-Wave, \u0438\u043b\u0438 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0435\u0451 \u0432\u0440\u0443\u0447\u043d\u0443\u044e.",
                 "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Z-Wave"
             },
             "instruct_unplug": {
@@ -127,6 +132,10 @@
             },
             "reconfigure": {
                 "description": "\u0412\u044b \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0438\u0442\u0435 \u043d\u0430 \u043d\u043e\u0432\u044b\u0439 \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u043d\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u0442\u0435 \u0442\u0435\u043a\u0443\u0449\u0438\u0439 \u0430\u0434\u0430\u043f\u0442\u0435\u0440?",
+                "menu_option_descriptions": {
+                    "intent_migrate": "\u042d\u0442\u043e \u043f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442 \u0432\u0430\u0448\u0443 \u0441\u0435\u0442\u044c Z-Wave \u043d\u0430 \u043d\u043e\u0432\u044b\u0439 \u0430\u0434\u0430\u043f\u0442\u0435\u0440.",
+                    "intent_reconfigure": "\u042d\u0442\u043e \u043f\u043e\u0437\u0432\u043e\u043b\u0438\u0442 \u0432\u0430\u043c \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e \u0430\u0434\u0430\u043f\u0442\u0435\u0440\u0430."
+                },
                 "menu_options": {
                     "intent_migrate": "\u041f\u0435\u0440\u0435\u0445\u043e\u0434 \u043d\u0430 \u043d\u043e\u0432\u044b\u0439 \u0430\u0434\u0430\u043f\u0442\u0435\u0440",
                     "intent_reconfigure": "\u041f\u0435\u0440\u0435\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0442\u0435\u043a\u0443\u0449\u0435\u0433\u043e \u0430\u0434\u0430\u043f\u0442\u0435\u0440\u0430"

homeassistant/const.py

@@ -26,7 +26,7 @@ if TYPE_CHECKING:
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2025
 MINOR_VERSION: Final = 10
-PATCH_VERSION: Final = "0b7"
+PATCH_VERSION: Final = "1"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 13, 2)

homeassistant/package_constraints.txt

@@ -3,7 +3,7 @@
 aiodhcpwatcher==1.2.1
 aiodiscover==2.7.1
 aiodns==3.5.0
-aiohasupervisor==0.3.3b0
+aiohasupervisor==0.3.3
 aiohttp-asyncmdnsresolver==0.1.1
 aiohttp-fast-zlib==0.3.0
 aiohttp==3.12.15

{homeassistant-2025.10.0b7.dist-info → homeassistant-2025.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homeassistant
-Version: 2025.10.0b7
+Version: 2025.10.1
 Summary: Open-source home automation platform running on Python 3.
 Author-email: The Home Assistant Authors <hello@home-assistant.io>
 License-Expression: Apache-2.0
@@ -22,7 +22,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 License-File: homeassistant/backports/LICENSE.Python
 Requires-Dist: aiodns==3.5.0
-Requires-Dist: aiohasupervisor==0.3.3b0
+Requires-Dist: aiohasupervisor==0.3.3
 Requires-Dist: aiohttp==3.12.15
 Requires-Dist: aiohttp_cors==0.8.1
 Requires-Dist: aiohttp-fast-zlib==0.3.0