homeassistant 2025.11.0b5__py3-none-any.whl → 2025.11.2__py3-none-any.whl

homeassistant/components/zha/config_flow.py

@@ -8,13 +8,14 @@ import collections
 from contextlib import suppress
 from enum import StrEnum
 import json
+import logging
 import os
 from typing import Any
 
 import voluptuous as vol
 from zha.application.const import RadioType
 import zigpy.backups
-from zigpy.config import CONF_DEVICE, CONF_DEVICE_PATH
+from zigpy.config import CONF_DEVICE, CONF_DEVICE_PATH, CONF_NWK_TX_POWER
 from zigpy.exceptions import CannotWriteNetworkSettings, DestructiveWriteNetworkSettings
 
 from homeassistant.components import onboarding, usb
@@ -39,7 +40,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import AbortFlow, progress_step
+from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.selector import FileSelector, FileSelectorConfig
@@ -57,6 +58,8 @@ from .radio_manager import (
     ZhaRadioManager,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 CONF_MANUAL_PATH = "Enter Manually"
 DECONZ_DOMAIN = "deconz"
 
@@ -191,6 +194,13 @@ class BaseZhaFlow(ConfigEntryBaseFlow):
         self._hass = None  # type: ignore[assignment]
         self._radio_mgr = ZhaRadioManager()
         self._restore_backup_task: asyncio.Task[None] | None = None
+        self._reset_old_radio_task: asyncio.Task[None] | None = None
+        self._form_network_task: asyncio.Task[None] | None = None
+        self._extra_network_config: dict[str, Any] = {}
+
+        # Progress flow steps cannot abort so we need to store the abort reason and then
+        # re-raise it in a dedicated step
+        self._progress_error: AbortFlow | None = None
 
     @property
     def hass(self) -> HomeAssistant:
@@ -223,6 +233,13 @@ class BaseZhaFlow(ConfigEntryBaseFlow):
     async def _async_create_radio_entry(self) -> ConfigFlowResult:
         """Create a config entry with the current flow state."""
 
+    async def async_step_progress_failed(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Abort when progress step failed."""
+        assert self._progress_error is not None
+        raise self._progress_error
+
     async def async_step_choose_serial_port(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -463,7 +480,22 @@ class BaseZhaFlow(ConfigEntryBaseFlow):
         self._radio_mgr.chosen_backup = self._radio_mgr.backups[0]
         return await self.async_step_maybe_reset_old_radio()
 
-    @progress_step()
+    async def _async_reset_old_radio(self, config_entry: ConfigEntry) -> None:
+        """Do the work of resetting the old radio."""
+
+        # Unload ZHA before connecting to the old adapter
+        with suppress(OperationNotAllowed):
+            await self.hass.config_entries.async_unload(config_entry.entry_id)
+
+        # Create a radio manager to connect to the old stick to reset it
+        temp_radio_mgr = ZhaRadioManager()
+        temp_radio_mgr.hass = self.hass
+        temp_radio_mgr.device_path = config_entry.data[CONF_DEVICE][CONF_DEVICE_PATH]
+        temp_radio_mgr.device_settings = config_entry.data[CONF_DEVICE]
+        temp_radio_mgr.radio_type = RadioType[config_entry.data[CONF_RADIO_TYPE]]
+
+        await temp_radio_mgr.async_reset_adapter()
+
     async def async_step_maybe_reset_old_radio(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -474,30 +506,37 @@ class BaseZhaFlow(ConfigEntryBaseFlow):
             DOMAIN, include_ignore=False
         )
 
-        if config_entries:
+        if not config_entries:
+            return await self.async_step_restore_backup()
+
+        if self._reset_old_radio_task is None:
+            # This will only ever be called during migration, so there must be an
+            # existing config entry
             assert len(config_entries) == 1
             config_entry = config_entries[0]
 
-            # Unload ZHA before connecting to the old adapter
-            with suppress(OperationNotAllowed):
-                await self.hass.config_entries.async_unload(config_entry.entry_id)
+            self._reset_old_radio_task = self.hass.async_create_task(
+                self._async_reset_old_radio(config_entry),
+                "Reset old radio",
+            )
 
-            # Create a radio manager to connect to the old stick to reset it
-            temp_radio_mgr = ZhaRadioManager()
-            temp_radio_mgr.hass = self.hass
-            temp_radio_mgr.device_path = config_entry.data[CONF_DEVICE][
-                CONF_DEVICE_PATH
-            ]
-            temp_radio_mgr.device_settings = config_entry.data[CONF_DEVICE]
-            temp_radio_mgr.radio_type = RadioType[config_entry.data[CONF_RADIO_TYPE]]
+        if not self._reset_old_radio_task.done():
+            return self.async_show_progress(
+                step_id="maybe_reset_old_radio",
+                progress_action="maybe_reset_old_radio",
+                progress_task=self._reset_old_radio_task,
+            )
 
-            try:
-                await temp_radio_mgr.async_reset_adapter()
-            except HomeAssistantError:
-                # Old adapter not found or cannot connect, show prompt to plug back in
-                return await self.async_step_plug_in_old_radio()
+        try:
+            await self._reset_old_radio_task
+        except HomeAssistantError:
+            _LOGGER.exception("Failed to reset old radio during migration")
+            # Old adapter not found or cannot connect, show prompt to plug back in
+            return self.async_show_progress_done(next_step_id="plug_in_old_radio")
+        finally:
+            self._reset_old_radio_task = None
 
-        return await self.async_step_restore_backup()
+        return self.async_show_progress_done(next_step_id="restore_backup")
 
     async def async_step_plug_in_old_radio(
         self, user_input: dict[str, Any] | None = None
@@ -617,15 +656,35 @@ class BaseZhaFlow(ConfigEntryBaseFlow):
         # This step exists only for translations, it does nothing new
         return await self.async_step_form_new_network(user_input)
 
-    @progress_step()
+    async def _async_form_new_network(self) -> None:
+        """Do the work of forming a new network."""
+        await self._radio_mgr.async_form_network(config=self._extra_network_config)
+        # Load the newly formed network settings to get the network info
+        await self._radio_mgr.async_load_network_settings()
+
     async def async_step_form_new_network(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Form a brand-new network."""
-        await self._radio_mgr.async_form_network()
-        # Load the newly formed network settings to get the network info
-        await self._radio_mgr.async_load_network_settings()
-        return await self._async_create_radio_entry()
+        if self._form_network_task is None:
+            self._form_network_task = self.hass.async_create_task(
+                self._async_form_new_network(),
+                "Form new network",
+            )
+
+        if not self._form_network_task.done():
+            return self.async_show_progress(
+                step_id="form_new_network",
+                progress_action="form_new_network",
+                progress_task=self._form_network_task,
+            )
+
+        try:
+            await self._form_network_task
+        finally:
+            self._form_network_task = None
+
+        return self.async_show_progress_done(next_step_id="create_entry")
 
     def _parse_uploaded_backup(
         self, uploaded_file_id: str
@@ -730,13 +789,15 @@ class BaseZhaFlow(ConfigEntryBaseFlow):
                 next_step_id="pre_confirm_ezsp_ieee_overwrite"
             )
         except HomeAssistantError:
+            _LOGGER.exception("Failed to restore network backup to new radio")
             # User unplugged the new adapter, allow retry
             return self.async_show_progress_done(next_step_id="pre_plug_in_new_radio")
         except CannotWriteNetworkSettings as exc:
-            return self.async_abort(
+            self._progress_error = AbortFlow(
                 reason="cannot_restore_backup",
                 description_placeholders={"error": str(exc)},
             )
+            return self.async_show_progress_done(next_step_id="progress_failed")
         finally:
             self._restore_backup_task = None
 
@@ -1007,6 +1068,9 @@ class ZhaConfigFlowHandler(BaseZhaFlow, ConfigFlow, domain=DOMAIN):
         device_path = device_settings[CONF_DEVICE_PATH]
         self._flow_strategy = discovery_data.get("flow_strategy")
 
+        if "tx_power" in discovery_data:
+            self._extra_network_config[CONF_NWK_TX_POWER] = discovery_data["tx_power"]
+
         await self._set_unique_id_and_update_ignored_flow(
             unique_id=f"{name}_{radio_type.name}_{device_path}",
             device_path=device_path,

homeassistant/components/zha/manifest.json

@@ -21,7 +21,7 @@
     "zha",
     "universal_silabs_flasher"
   ],
-  "requirements": ["zha==0.0.77"],
+  "requirements": ["zha==0.0.79"],
   "usb": [
     {
       "description": "*2652*",

homeassistant/components/zha/radio_manager.py

@@ -78,6 +78,7 @@ HARDWARE_DISCOVERY_SCHEMA = vol.Schema(
         vol.Required("port"): DEVICE_SCHEMA,
         vol.Required("radio_type"): str,
         vol.Optional("flow_strategy"): vol.All(str, vol.Coerce(ZigbeeFlowStrategy)),
+        vol.Optional("tx_power"): vol.All(vol.Coerce(int), vol.Range(min=0, max=10)),
     }
 )
 
@@ -322,7 +323,7 @@ class ZhaRadioManager:
 
         return backup
 
-    async def async_form_network(self) -> None:
+    async def async_form_network(self, config: dict[str, Any] | None) -> None:
         """Form a brand-new network."""
 
         # When forming a new network, we delete the ZHA database to prevent old devices
@@ -331,7 +332,7 @@ class ZhaRadioManager:
             await self.hass.async_add_executor_job(os.remove, self.zigpy_database_path)
 
         async with self.create_zigpy_app() as app:
-            await app.form_network()
+            await app.form_network(config=config)
 
     async def async_reset_adapter(self) -> None:
         """Reset the current adapter."""

homeassistant/components/zha/translations/bg.json

@@ -10,6 +10,10 @@
             "cannot_connect": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u0432\u044a\u0440\u0437\u0432\u0430\u043d\u0435"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "\u0421\u044a\u0437\u0434\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u043e\u0432\u0430 Zigbee \u043c\u0440\u0435\u0436\u0430. \u0412 \u0440\u0430\u043c\u043a\u0438\u0442\u0435 \u043d\u0430 \u0442\u043e\u0437\u0438 \u043f\u0440\u043e\u0446\u0435\u0441 \u0441\u043a\u0430\u043d\u0438\u0440\u0430\u043c\u0435 \u0437\u0430 \u0441\u0432\u043e\u0431\u043e\u0434\u0435\u043d \u043c\u0440\u0435\u0436\u043e\u0432 \u043a\u0430\u043d\u0430\u043b, \u043a\u043e\u0435\u0442\u043e \u043c\u043e\u0436\u0435 \u0434\u0430 \u043e\u0442\u043d\u0435\u043c\u0435 \u043c\u0438\u043d\u0443\u0442\u0430.",
+            "restore_backup": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043c\u0440\u0435\u0436\u043e\u0432\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u043d\u043e\u0432\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440.\n\n\u0422\u043e\u0432\u0430 \u0449\u0435 \u043e\u0442\u043d\u0435\u043c\u0435 \u043c\u0438\u043d\u0443\u0442\u0430."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -58,6 +62,9 @@
             "confirm": {
                 "description": "\u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u0435 {name}?"
             },
+            "form_new_network": {
+                "title": "\u0424\u043e\u0440\u043c\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043d\u043e\u0432\u0430 \u043c\u0440\u0435\u0436\u0430"
+            },
             "manual_port_config": {
                 "data_description": {
                     "baudrate": "\u0421\u043a\u043e\u0440\u043e\u0441\u0442 \u043d\u0430 \u043f\u0440\u0435\u0434\u0430\u0432\u0430\u043d\u0435, \u043a\u043e\u044f\u0442\u043e \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430 \u043f\u0440\u0438 \u043a\u043e\u043c\u0443\u043d\u0438\u043a\u0430\u0446\u0438\u044f \u0441\u044a\u0441 \u0441\u0435\u0440\u0438\u0439\u043d\u0438\u044f \u043f\u043e\u0440\u0442, \u043e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d\u043e 115200 \u0438\u043b\u0438 460800",
@@ -68,6 +75,24 @@
             "maybe_reset_old_radio": {
                 "title": "\u041d\u0443\u043b\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0441\u0442\u0430\u0440\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
             },
+            "plug_in_new_radio": {
+                "description": "\u0412\u0430\u0448\u0438\u044f\u0442 \u043d\u043e\u0432 \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u043d\u0430 \u0430\u0434\u0440\u0435\u0441 `{device_path}` \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d.\n\u041c\u043e\u043b\u044f, \u0432\u043a\u043b\u044e\u0447\u0435\u0442\u0435 \u0433\u043e \u0438 \u0449\u0440\u0430\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0418\u0437\u043f\u0440\u0430\u0449\u0430\u043d\u0435, \u0437\u0430 \u0434\u0430 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435.",
+                "title": "\u041d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d \u043d\u043e\u0432 \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
+            },
+            "plug_in_old_radio": {
+                "menu_option_descriptions": {
+                    "retry_old_radio": "\u041e\u043f\u0438\u0442\u0430\u0439\u0442\u0435 \u043e\u0442\u043d\u043e\u0432\u043e \u0434\u0430 \u0441\u0435 \u0441\u0432\u044a\u0440\u0436\u0435\u0442\u0435 \u0441\u044a\u0441 \u0441\u0442\u0430\u0440\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440, \u0437\u0430 \u0434\u0430 \u0433\u043e \u043d\u0443\u043b\u0438\u0440\u0430\u0442\u0435 \u043a\u0430\u0442\u043e \u0447\u0430\u0441\u0442 \u043e\u0442 \u043c\u0438\u0433\u0440\u0430\u0446\u0438\u044f\u0442\u0430.",
+                    "skip_reset_old_radio": "\u041f\u0440\u043e\u043f\u0443\u0441\u043d\u0435\u0442\u0435 \u043d\u0443\u043b\u0438\u0440\u0430\u043d\u0435\u0442\u043e \u043d\u0430 \u0441\u0442\u0430\u0440\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u0438 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0435\u0442\u0435 \u0441 \u043c\u0438\u0433\u0440\u0430\u0446\u0438\u044f\u0442\u0430."
+                },
+                "menu_options": {
+                    "retry_old_radio": "\u041f\u043e\u0432\u0442\u043e\u0440\u0435\u043d\u0438\u0435",
+                    "skip_reset_old_radio": "\u041f\u0440\u043e\u043f\u0443\u0441\u043a\u0430\u043d\u0435 \u043d\u0430 \u043d\u0443\u043b\u0438\u0440\u0430\u043d\u0435\u0442\u043e"
+                },
+                "title": "\u0421\u0442\u0430\u0440\u0438\u044f\u0442 \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d"
+            },
+            "restore_backup": {
+                "title": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043c\u0440\u0435\u0436\u0430\u0442\u0430 \u043a\u044a\u043c \u043d\u043e\u0432 \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "\u041a\u0430\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u0444\u0430\u0439\u043b"
@@ -453,6 +478,10 @@
             "cannot_connect": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u0432\u044a\u0440\u0437\u0432\u0430\u043d\u0435"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "\u0421\u044a\u0437\u0434\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u043e\u0432\u0430 Zigbee \u043c\u0440\u0435\u0436\u0430. \u0412 \u0440\u0430\u043c\u043a\u0438\u0442\u0435 \u043d\u0430 \u0442\u043e\u0437\u0438 \u043f\u0440\u043e\u0446\u0435\u0441 \u0441\u043a\u0430\u043d\u0438\u0440\u0430\u043c\u0435 \u0437\u0430 \u0441\u0432\u043e\u0431\u043e\u0434\u0435\u043d \u043c\u0440\u0435\u0436\u043e\u0432 \u043a\u0430\u043d\u0430\u043b, \u043a\u043e\u0435\u0442\u043e \u043c\u043e\u0436\u0435 \u0434\u0430 \u043e\u0442\u043d\u0435\u043c\u0435 \u043c\u0438\u043d\u0443\u0442\u0430.",
+            "restore_backup": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043c\u0440\u0435\u0436\u043e\u0432\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u043d\u043e\u0432\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440.\n\n\u0422\u043e\u0432\u0430 \u0449\u0435 \u043e\u0442\u043d\u0435\u043c\u0435 \u043c\u0438\u043d\u0443\u0442\u0430."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -486,9 +515,30 @@
                 },
                 "title": "\u041c\u0438\u0433\u0440\u0438\u0440\u0430\u043d\u0435 \u043a\u044a\u043c \u043d\u043e\u0432 \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
             },
+            "form_new_network": {
+                "title": "\u0424\u043e\u0440\u043c\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043d\u043e\u0432\u0430 \u043c\u0440\u0435\u0436\u0430"
+            },
             "init": {
                 "title": "\u041f\u0440\u0435\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 ZHA"
             },
+            "maybe_reset_old_radio": {
+                "title": "\u041d\u0443\u043b\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0441\u0442\u0430\u0440\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
+            },
+            "plug_in_new_radio": {
+                "description": "\u0412\u0430\u0448\u0438\u044f\u0442 \u043d\u043e\u0432 \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u043d\u0430 \u0430\u0434\u0440\u0435\u0441 `{device_path}` \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d.\n\u041c\u043e\u043b\u044f, \u0432\u043a\u043b\u044e\u0447\u0435\u0442\u0435 \u0433\u043e \u0438 \u0449\u0440\u0430\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0418\u0437\u043f\u0440\u0430\u0449\u0430\u043d\u0435, \u0437\u0430 \u0434\u0430 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435.",
+                "title": "\u041d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d \u043d\u043e\u0432 \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
+            },
+            "plug_in_old_radio": {
+                "menu_option_descriptions": {
+                    "retry_old_radio": "\u041e\u043f\u0438\u0442\u0430\u0439\u0442\u0435 \u043e\u0442\u043d\u043e\u0432\u043e \u0434\u0430 \u0441\u0435 \u0441\u0432\u044a\u0440\u0436\u0435\u0442\u0435 \u0441\u044a\u0441 \u0441\u0442\u0430\u0440\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440, \u0437\u0430 \u0434\u0430 \u0433\u043e \u043d\u0443\u043b\u0438\u0440\u0430\u0442\u0435 \u043a\u0430\u0442\u043e \u0447\u0430\u0441\u0442 \u043e\u0442 \u043c\u0438\u0433\u0440\u0430\u0446\u0438\u044f\u0442\u0430.",
+                    "skip_reset_old_radio": "\u041f\u0440\u043e\u043f\u0443\u0441\u043d\u0435\u0442\u0435 \u043d\u0443\u043b\u0438\u0440\u0430\u043d\u0435\u0442\u043e \u043d\u0430 \u0441\u0442\u0430\u0440\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u0438 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0435\u0442\u0435 \u0441 \u043c\u0438\u0433\u0440\u0430\u0446\u0438\u044f\u0442\u0430."
+                },
+                "menu_options": {
+                    "retry_old_radio": "\u041f\u043e\u0432\u0442\u043e\u0440\u0435\u043d\u0438\u0435",
+                    "skip_reset_old_radio": "\u041f\u0440\u043e\u043f\u0443\u0441\u043a\u0430\u043d\u0435 \u043d\u0430 \u043d\u0443\u043b\u0438\u0440\u0430\u043d\u0435\u0442\u043e"
+                },
+                "title": "\u0421\u0442\u0430\u0440\u0438\u044f\u0442 \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d"
+            },
             "prompt_migrate_or_reconfigure": {
                 "menu_option_descriptions": {
                     "intent_migrate": "\u0422\u043e\u0432\u0430 \u0449\u0435 \u0432\u0438 \u043f\u043e\u043c\u043e\u0433\u043d\u0435 \u0434\u0430 \u043c\u0438\u0433\u0440\u0438\u0440\u0430\u0442\u0435 \u0432\u0430\u0448\u0430\u0442\u0430 Zigbee \u043c\u0440\u0435\u0436\u0430 \u043e\u0442 \u0441\u0442\u0430\u0440\u0438\u044f \u0430\u0434\u0430\u043f\u0442\u0435\u0440 \u043a\u044a\u043c \u043d\u043e\u0432.",
@@ -496,6 +546,9 @@
                 },
                 "title": "\u041c\u0438\u0433\u0440\u0438\u0440\u0430\u043d\u0435 \u0438\u043b\u0438 \u043f\u0440\u0435\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043d\u0435"
             },
+            "restore_backup": {
+                "title": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043c\u0440\u0435\u0436\u0430\u0442\u0430 \u043a\u044a\u043c \u043d\u043e\u0432 \u0430\u0434\u0430\u043f\u0442\u0435\u0440"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "\u041a\u0430\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u0444\u0430\u0439\u043b"

homeassistant/components/zha/translations/cs.json

@@ -16,6 +16,11 @@
             "invalid_backup_json": "Neplatn\u00fd z\u00e1lo\u017en\u00ed JSON"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "Vytvo\u0159en\u00ed nov\u00e9 s\u00edt\u011b Zigbee.\n \nV r\u00e1mci tohoto procesu hled\u00e1me voln\u00fd s\u00ed\u0165ov\u00fd kan\u00e1l, co\u017e m\u016f\u017ee trvat minutu.",
+            "maybe_reset_old_radio": "Resetov\u00e1n\u00ed star\u00e9ho adapt\u00e9ru.\n \nV\u00e1\u0161 star\u00fd adapt\u00e9r byl z\u00e1lohov\u00e1n a prob\u00edh\u00e1 obnoven\u00ed tov\u00e1rn\u00edho nastaven\u00ed.",
+            "restore_backup": "Obnoven\u00ed s\u00ed\u0165ov\u00fdch nastaven\u00ed do nov\u00e9ho adapt\u00e9ru.\n \nTo bude chv\u00edli trvat."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -76,6 +81,16 @@
             "confirm": {
                 "description": "Chcete nastavit {name}?"
             },
+            "confirm_ezsp_ieee_overwrite": {
+                "data": {
+                    "overwrite_coordinator_ieee": "Trvale nahradit IEEE adresu adapt\u00e9ru"
+                },
+                "description": "Va\u0161e z\u00e1loha m\u00e1 jinou adresu IEEE ne\u017e v\u00e1\u0161 adapt\u00e9r. Aby s\u00ed\u0165 fungovala spr\u00e1vn\u011b, m\u011bla by b\u00fdt zm\u011bn\u011bna tak\u00e9 adresa IEEE va\u0161eho adapt\u00e9ru.\n\nJedn\u00e1 se o trvalou operaci.",
+                "title": "P\u0159epsat adresu IEEE adapt\u00e9ru"
+            },
+            "form_new_network": {
+                "title": "Vytv\u00e1\u0159en\u00ed nov\u00e9 s\u00edt\u011b"
+            },
             "manual_pick_radio_type": {
                 "data": {
                     "radio_type": "Typ adapt\u00e9ru"
@@ -116,6 +131,9 @@
                 },
                 "title": "Star\u00fd adapt\u00e9r nebyl nalezen"
             },
+            "restore_backup": {
+                "title": "Obnovov\u00e1n\u00ed s\u00edt\u011b na nov\u00fd adapt\u00e9r"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "Nahr\u00e1t soubor"
@@ -1874,6 +1892,11 @@
             "invalid_backup_json": "Neplatn\u00fd z\u00e1lo\u017en\u00ed JSON"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "Vytvo\u0159en\u00ed nov\u00e9 s\u00edt\u011b Zigbee.\n \nV r\u00e1mci tohoto procesu hled\u00e1me voln\u00fd s\u00ed\u0165ov\u00fd kan\u00e1l, co\u017e m\u016f\u017ee trvat minutu.",
+            "maybe_reset_old_radio": "Resetov\u00e1n\u00ed star\u00e9ho adapt\u00e9ru.\n \nV\u00e1\u0161 star\u00fd adapt\u00e9r byl z\u00e1lohov\u00e1n a prob\u00edh\u00e1 obnoven\u00ed tov\u00e1rn\u00edho nastaven\u00ed.",
+            "restore_backup": "Obnoven\u00ed s\u00ed\u0165ov\u00fdch nastaven\u00ed do nov\u00e9ho adapt\u00e9ru.\n \nTo bude chv\u00edli trvat."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -1919,6 +1942,16 @@
                 "description": "Vyberte s\u00e9riov\u00fd port pro v\u00e1\u0161 adapt\u00e9r Zigbee.",
                 "title": "Vybrat s\u00e9riov\u00fd port"
             },
+            "confirm_ezsp_ieee_overwrite": {
+                "data": {
+                    "overwrite_coordinator_ieee": "Trvale nahradit IEEE adresu adapt\u00e9ru"
+                },
+                "description": "Va\u0161e z\u00e1loha m\u00e1 jinou adresu IEEE ne\u017e v\u00e1\u0161 adapt\u00e9r. Aby s\u00ed\u0165 fungovala spr\u00e1vn\u011b, m\u011bla by b\u00fdt zm\u011bn\u011bna tak\u00e9 adresa IEEE va\u0161eho adapt\u00e9ru.\n\nJedn\u00e1 se o trvalou operaci.",
+                "title": "P\u0159epsat adresu IEEE adapt\u00e9ru"
+            },
+            "form_new_network": {
+                "title": "Vytv\u00e1\u0159en\u00ed nov\u00e9 s\u00edt\u011b"
+            },
             "init": {
                 "description": "Bude provedena z\u00e1loha a ZHA bude zastavena. Chcete pokra\u010dovat?",
                 "title": "P\u0159enastavit ZHA"
@@ -1943,6 +1976,9 @@
                 "description": "ZHA nedok\u00e1zala automaticky detekovat nastaven\u00ed s\u00e9riov\u00e9ho portu pro v\u00e1\u0161 adapt\u00e9r. Obvykle se jedn\u00e1 o probl\u00e9m s firmwarem nebo opr\u00e1vn\u011bn\u00edmi.\n \nPokud pou\u017e\u00edv\u00e1te firmware s nestandardn\u00edm nastaven\u00edm, zadejte nastaven\u00ed s\u00e9riov\u00e9ho portu.",
                 "title": "Nastaven\u00ed s\u00e9riov\u00e9ho portu"
             },
+            "maybe_reset_old_radio": {
+                "title": "Resetov\u00e1n\u00ed star\u00e9ho adapt\u00e9ru"
+            },
             "plug_in_new_radio": {
                 "description": "V\u00e1\u0161 nov\u00fd adapt\u00e9r na adrese \"{device_path}\" nebyl nalezen.\nZapojte jej a klepn\u011bte na tla\u010d\u00edtko Odeslat pro pokra\u010dov\u00e1n\u00ed.",
                 "title": "Nov\u00fd adapt\u00e9r nebyl nalezen"
@@ -1971,6 +2007,9 @@
                 },
                 "title": "Migrovat nebo p\u0159enastavit"
             },
+            "restore_backup": {
+                "title": "Obnovov\u00e1n\u00ed s\u00edt\u011b na nov\u00fd adapt\u00e9r"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "Nahr\u00e1t soubor"

homeassistant/components/zha/translations/en-GB.json

@@ -16,6 +16,11 @@
             "invalid_backup_json": "Invalid backup JSON"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "Forming a new Zigbee network.\n\nWe scan for a clear network channel as part of this process, this can take a minute.",
+            "maybe_reset_old_radio": "Resetting old adapter.\n\nYour old adapter has been backed up and is being factory reset.",
+            "restore_backup": "Restoring network settings to new adapter.\n\nThis will take a minute."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -76,6 +81,16 @@
             "confirm": {
                 "description": "Do you want to set up {name}?"
             },
+            "confirm_ezsp_ieee_overwrite": {
+                "data": {
+                    "overwrite_coordinator_ieee": "Permanently replace the adapter IEEE address"
+                },
+                "description": "Your backup has a different IEEE address than your adapter. For your network to function properly, the IEEE address of your adapter should also be changed.\n\nThis is a permanent operation.",
+                "title": "Overwrite adapter IEEE address"
+            },
+            "form_new_network": {
+                "title": "Forming new network"
+            },
             "manual_pick_radio_type": {
                 "data": {
                     "radio_type": "Adapter type"
@@ -100,6 +115,25 @@
             "maybe_reset_old_radio": {
                 "title": "Resetting old adapter"
             },
+            "plug_in_new_radio": {
+                "description": "Your new adapter at `{device_path}` was not found.\nPlease plug it in and click Submit to continue.",
+                "title": "New adapter not found"
+            },
+            "plug_in_old_radio": {
+                "description": "Your old adapter at `{device_path}` was not found. You can retry after plugging it back in, or skip resetting the old adapter.\n\n**Warning:** If you skip resetting the old adapter, ensure it remains permanently disconnected. Plugging it back in later will cause network issues.",
+                "menu_option_descriptions": {
+                    "retry_old_radio": "Retry connecting to the old adapter to reset it as part of the migration.",
+                    "skip_reset_old_radio": "Skip resetting the old adapter and continue with the migration."
+                },
+                "menu_options": {
+                    "retry_old_radio": "Retry",
+                    "skip_reset_old_radio": "Skip reset"
+                },
+                "title": "Old adapter not found"
+            },
+            "restore_backup": {
+                "title": "Restoring network to new adapter"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "Upload a file"
@@ -1858,6 +1892,11 @@
             "invalid_backup_json": "Invalid backup JSON"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "Forming a new Zigbee network.\n\nWe scan for a clear network channel as part of this process, this can take a minute.",
+            "maybe_reset_old_radio": "Resetting old adapter.\n\nYour old adapter has been backed up and is being factory reset.",
+            "restore_backup": "Restoring network settings to new adapter.\n\nThis will take a minute."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -1903,6 +1942,16 @@
                 "description": "Select the serial port for your Zigbee adapter",
                 "title": "Select a serial port"
             },
+            "confirm_ezsp_ieee_overwrite": {
+                "data": {
+                    "overwrite_coordinator_ieee": "Permanently replace the adapter IEEE address"
+                },
+                "description": "Your backup has a different IEEE address than your adapter. For your network to function properly, the IEEE address of your adapter should also be changed.\n\nThis is a permanent operation.",
+                "title": "Overwrite adapter IEEE address"
+            },
+            "form_new_network": {
+                "title": "Forming new network"
+            },
             "init": {
                 "description": "A backup will be performed and ZHA will be stopped. Do you wish to continue?",
                 "title": "Reconfigure ZHA"
@@ -1927,6 +1976,25 @@
                 "description": "ZHA was not able to automatically detect serial port settings for your adapter. This usually is an issue with the firmware or permissions.\n\nIf you are using firmware with non-standard settings, enter the serial port settings",
                 "title": "Serial port settings"
             },
+            "maybe_reset_old_radio": {
+                "title": "Resetting old adapter"
+            },
+            "plug_in_new_radio": {
+                "description": "Your new adapter at `{device_path}` was not found.\nPlease plug it in and click Submit to continue.",
+                "title": "New adapter not found"
+            },
+            "plug_in_old_radio": {
+                "description": "Your old adapter at `{device_path}` was not found. You can retry after plugging it back in, or skip resetting the old adapter.\n\n**Warning:** If you skip resetting the old adapter, ensure it remains permanently disconnected. Plugging it back in later will cause network issues.",
+                "menu_option_descriptions": {
+                    "retry_old_radio": "Retry connecting to the old adapter to reset it as part of the migration.",
+                    "skip_reset_old_radio": "Skip resetting the old adapter and continue with the migration."
+                },
+                "menu_options": {
+                    "retry_old_radio": "Retry",
+                    "skip_reset_old_radio": "Skip reset"
+                },
+                "title": "Old adapter not found"
+            },
             "prompt_migrate_or_reconfigure": {
                 "description": "Are you migrating to a new adapter or re-configuring the current adapter?",
                 "menu_option_descriptions": {
@@ -1939,6 +2007,9 @@
                 },
                 "title": "Migrate or re-configure"
             },
+            "restore_backup": {
+                "title": "Restoring network to new adapter"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "Upload a file"

homeassistant/components/zha/translations/es.json

@@ -16,6 +16,11 @@
             "invalid_backup_json": "Copia de seguridad JSON no v\u00e1lida"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "Creando una nueva red Zigbee. \n \nComo parte de este proceso, buscamos un canal de red libre; esto puede tardar un minuto.",
+            "maybe_reset_old_radio": "Restableciendo el adaptador antiguo. \n \nSe ha realizado una copia de seguridad de tu adaptador antiguo y se est\u00e1 restableciendo a la configuraci\u00f3n de f\u00e1brica.",
+            "restore_backup": "Restaurando la configuraci\u00f3n de red en el nuevo adaptador.\n\nEsto tardar\u00e1 un minuto."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -76,6 +81,16 @@
             "confirm": {
                 "description": "\u00bfQuieres configurar {name} ?"
             },
+            "confirm_ezsp_ieee_overwrite": {
+                "data": {
+                    "overwrite_coordinator_ieee": "Reemplazar permanentemente la direcci\u00f3n IEEE del adaptador"
+                },
+                "description": "Tu copia de seguridad tiene una direcci\u00f3n IEEE diferente a la de tu adaptador. Para que tu red funcione correctamente, tambi\u00e9n debes cambiar la direcci\u00f3n IEEE de tu adaptador. \n \nEsta operaci\u00f3n es permanente.",
+                "title": "Sobrescribir la direcci\u00f3n IEEE del adaptador"
+            },
+            "form_new_network": {
+                "title": "Formar una nueva red"
+            },
             "manual_pick_radio_type": {
                 "data": {
                     "radio_type": "Tipo de adaptador"
@@ -116,6 +131,9 @@
                 },
                 "title": "No se encontr\u00f3 el adaptador antiguo"
             },
+            "restore_backup": {
+                "title": "Restauraci\u00f3n de la red al nuevo adaptador"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "Subir un archivo"
@@ -1874,6 +1892,11 @@
             "invalid_backup_json": "Copia de seguridad JSON no v\u00e1lida"
         },
         "flow_title": "{name}",
+        "progress": {
+            "form_new_network": "Creando una nueva red Zigbee. \n \nComo parte de este proceso, buscamos un canal de red libre; esto puede tardar un minuto.",
+            "maybe_reset_old_radio": "Restableciendo el adaptador antiguo. \n \nSe ha realizado una copia de seguridad de tu adaptador antiguo y se est\u00e1 restableciendo a la configuraci\u00f3n de f\u00e1brica.",
+            "restore_backup": "Restaurando la configuraci\u00f3n de red en el nuevo adaptador.\n\nEsto tardar\u00e1 un minuto."
+        },
         "step": {
             "choose_automatic_backup": {
                 "data": {
@@ -1919,6 +1942,16 @@
                 "description": "Selecciona el puerto serie para tu adaptador Zigbee",
                 "title": "Seleccionar un puerto serie"
             },
+            "confirm_ezsp_ieee_overwrite": {
+                "data": {
+                    "overwrite_coordinator_ieee": "Reemplazar permanentemente la direcci\u00f3n IEEE del adaptador"
+                },
+                "description": "Tu copia de seguridad tiene una direcci\u00f3n IEEE diferente a la de tu adaptador. Para que tu red funcione correctamente, tambi\u00e9n debes cambiar la direcci\u00f3n IEEE de tu adaptador. \n \nEsta operaci\u00f3n es permanente.",
+                "title": "Sobrescribir la direcci\u00f3n IEEE del adaptador"
+            },
+            "form_new_network": {
+                "title": "Formar una nueva red"
+            },
             "init": {
                 "description": "Se realizar\u00e1 una copia de seguridad y se detendr\u00e1 ZHA. \u00bfQuieres continuar?",
                 "title": "Volver a configurar ZHA"
@@ -1943,6 +1976,9 @@
                 "description": "ZHA no pudo detectar autom\u00e1ticamente la configuraci\u00f3n del puerto serie de tu adaptador. Esto suele deberse a un problema con el firmware o los permisos. \n \nSi utilizas un firmware con una configuraci\u00f3n no est\u00e1ndar, introduce la configuraci\u00f3n del puerto serie.",
                 "title": "Configuraci\u00f3n del puerto serie"
             },
+            "maybe_reset_old_radio": {
+                "title": "Restablecer el adaptador antiguo"
+            },
             "plug_in_new_radio": {
                 "description": "No se encontr\u00f3 el nuevo adaptador en `{device_path}`. Por favor, con\u00e9ctalo y haz clic en Enviar para continuar.",
                 "title": "No se encontr\u00f3 el nuevo adaptador."
@@ -1971,6 +2007,9 @@
                 },
                 "title": "Migrar o volver a configurar"
             },
+            "restore_backup": {
+                "title": "Restauraci\u00f3n de la red al nuevo adaptador"
+            },
             "upload_manual_backup": {
                 "data": {
                     "uploaded_backup_file": "Subir un archivo"