homeassistant 2025.7.0b2__py3-none-any.whl → 2025.7.0b3__py3-none-any.whl

homeassistant/components/zha/translations/hu.json

@@ -1135,6 +1135,12 @@
             "irrigation_start_time": {
                 "name": "\u00d6nt\u00f6z\u00e9s kezd\u00e9si ideje"
             },
+            "last_action": {
+                "state": {
+                    "lock": "Z\u00e1rolt",
+                    "unlock": "Feloldva"
+                }
+            },
             "last_feeding_size": {
                 "name": "Utols\u00f3 etet\u00e9si m\u00e9ret"
             },

homeassistant/components/zha/translations/sv.json

@@ -1148,6 +1148,7 @@
             "last_action_source": {
                 "state": {
                     "fingerprint": "Fingeravtryck",
+                    "keypad": "Knappsats",
                     "rfid": "RFID",
                     "zigbee": "Zigbee"
                 }
@@ -1161,6 +1162,9 @@
             "last_illumination_state": {
                 "name": "Senaste belysningstillst\u00e5nd"
             },
+            "last_pin_code": {
+                "name": "Senaste PIN-kod"
+            },
             "last_valve_open_duration": {
                 "name": "Senaste ventil\u00f6ppningstid"
             },

homeassistant/components/zwave_js/config_flow.py

@@ -40,7 +40,6 @@ from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.helpers.service_info.usb import UsbServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
-from homeassistant.helpers.typing import VolDictType
 
 from .addon import get_addon_manager
 from .const import (
@@ -90,6 +89,9 @@ ADDON_USER_INPUT_MAP = {
 ON_SUPERVISOR_SCHEMA = vol.Schema({vol.Optional(CONF_USE_ADDON, default=True): bool})
 MIN_MIGRATION_SDK_VERSION = AwesomeVersion("6.61")
 
+NETWORK_TYPE_NEW = "new"
+NETWORK_TYPE_EXISTING = "existing"
+
 
 def get_manual_schema(user_input: dict[str, Any]) -> vol.Schema:
     """Return a schema for the manual step."""
@@ -632,6 +634,81 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Ask for config for Z-Wave JS add-on."""
+
+        if user_input is not None:
+            self.usb_path = user_input[CONF_USB_PATH]
+            return await self.async_step_network_type()
+
+        if self._usb_discovery:
+            return await self.async_step_network_type()
+
+        usb_path = self.usb_path or ""
+
+        try:
+            ports = await async_get_usb_ports(self.hass)
+        except OSError as err:
+            _LOGGER.error("Failed to get USB ports: %s", err)
+            return self.async_abort(reason="usb_ports_failed")
+
+        data_schema = vol.Schema(
+            {
+                vol.Required(CONF_USB_PATH, default=usb_path): vol.In(ports),
+            }
+        )
+
+        return self.async_show_form(
+            step_id="configure_addon_user", data_schema=data_schema
+        )
+
+    async def async_step_network_type(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Ask for network type (new or existing)."""
+        # For recommended installation, automatically set network type to "new"
+        if self._recommended_install:
+            user_input = {"network_type": NETWORK_TYPE_NEW}
+
+        if user_input is not None:
+            if user_input["network_type"] == NETWORK_TYPE_NEW:
+                # Set all keys to empty strings for new network
+                self.s0_legacy_key = ""
+                self.s2_access_control_key = ""
+                self.s2_authenticated_key = ""
+                self.s2_unauthenticated_key = ""
+                self.lr_s2_access_control_key = ""
+                self.lr_s2_authenticated_key = ""
+
+                addon_config_updates = {
+                    CONF_ADDON_DEVICE: self.usb_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,
+                }
+
+                await self._async_set_addon_config(addon_config_updates)
+                return await self.async_step_start_addon()
+
+            # Network already exists, go to security keys step
+            return await self.async_step_configure_security_keys()
+
+        return self.async_show_form(
+            step_id="network_type",
+            data_schema=vol.Schema(
+                {
+                    vol.Required("network_type", default=""): vol.In(
+                        [NETWORK_TYPE_NEW, NETWORK_TYPE_EXISTING]
+                    )
+                }
+            ),
+        )
+
+    async def async_step_configure_security_keys(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Ask for security keys for existing Z-Wave network."""
         addon_info = await self._async_get_addon_info()
         addon_config = addon_info.options
 
@@ -654,10 +731,6 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             CONF_ADDON_LR_S2_AUTHENTICATED_KEY, self.lr_s2_authenticated_key or ""
         )
 
-        if self._recommended_install and self._usb_discovery:
-            # Recommended installation with USB discovery, skip asking for keys
-            user_input = {}
-
         if user_input is not None:
             self.s0_legacy_key = user_input.get(CONF_S0_LEGACY_KEY, s0_legacy_key)
             self.s2_access_control_key = user_input.get(
@@ -675,8 +748,6 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             self.lr_s2_authenticated_key = user_input.get(
                 CONF_LR_S2_AUTHENTICATED_KEY, lr_s2_authenticated_key
             )
-            if not self._usb_discovery:
-                self.usb_path = user_input[CONF_USB_PATH]
 
             addon_config_updates = {
                 CONF_ADDON_DEVICE: self.usb_path,
@@ -689,14 +760,10 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             }
 
             await self._async_set_addon_config(addon_config_updates)
-
             return await self.async_step_start_addon()
 
-        usb_path = self.usb_path or addon_config.get(CONF_ADDON_DEVICE) or ""
-        schema: VolDictType = (
-            {}
-            if self._recommended_install
-            else {
+        data_schema = vol.Schema(
+            {
                 vol.Optional(CONF_S0_LEGACY_KEY, default=s0_legacy_key): str,
                 vol.Optional(
                     CONF_S2_ACCESS_CONTROL_KEY, default=s2_access_control_key
@@ -716,22 +783,8 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             }
         )
 
-        if not self._usb_discovery:
-            try:
-                ports = await async_get_usb_ports(self.hass)
-            except OSError as err:
-                _LOGGER.error("Failed to get USB ports: %s", err)
-                return self.async_abort(reason="usb_ports_failed")
-
-            schema = {
-                vol.Required(CONF_USB_PATH, default=usb_path): vol.In(ports),
-                **schema,
-            }
-
-        data_schema = vol.Schema(schema)
-
         return self.async_show_form(
-            step_id="configure_addon_user", data_schema=data_schema
+            step_id="configure_security_keys", data_schema=data_schema
         )
 
     async def async_step_finish_addon_setup_user(

homeassistant/components/zwave_js/strings.json

@@ -38,26 +38,38 @@
     },
     "step": {
       "configure_addon_user": {
+        "data": {
+          "usb_path": "[%key:common::config_flow::data::usb_path%]"
+        },
+        "description": "Select your Z-Wave adapter",
+        "title": "Enter the Z-Wave add-on configuration"
+      },
+      "network_type": {
+        "data": {
+          "network_type": "Is your network new or does it already exist?"
+        },
+        "title": "Z-Wave network"
+      },
+      "configure_security_keys": {
         "data": {
           "lr_s2_access_control_key": "Long Range S2 Access Control Key",
           "lr_s2_authenticated_key": "Long Range S2 Authenticated Key",
           "s0_legacy_key": "S0 Key (Legacy)",
           "s2_access_control_key": "S2 Access Control Key",
           "s2_authenticated_key": "S2 Authenticated Key",
-          "s2_unauthenticated_key": "S2 Unauthenticated Key",
-          "usb_path": "[%key:common::config_flow::data::usb_path%]"
+          "s2_unauthenticated_key": "S2 Unauthenticated Key"
         },
-        "description": "Select your Z-Wave adapter",
-        "title": "Enter the Z-Wave add-on configuration"
+        "description": "Enter the security keys for your existing Z-Wave network",
+        "title": "Security keys"
       },
       "configure_addon_reconfigure": {
         "data": {
-          "lr_s2_access_control_key": "[%key:component::zwave_js::config::step::configure_addon_user::data::lr_s2_access_control_key%]",
-          "lr_s2_authenticated_key": "[%key:component::zwave_js::config::step::configure_addon_user::data::lr_s2_authenticated_key%]",
-          "s0_legacy_key": "[%key:component::zwave_js::config::step::configure_addon_user::data::s0_legacy_key%]",
-          "s2_access_control_key": "[%key:component::zwave_js::config::step::configure_addon_user::data::s2_access_control_key%]",
-          "s2_authenticated_key": "[%key:component::zwave_js::config::step::configure_addon_user::data::s2_authenticated_key%]",
-          "s2_unauthenticated_key": "[%key:component::zwave_js::config::step::configure_addon_user::data::s2_unauthenticated_key%]",
+          "lr_s2_access_control_key": "[%key:component::zwave_js::config::step::configure_security_keys::data::lr_s2_access_control_key%]",
+          "lr_s2_authenticated_key": "[%key:component::zwave_js::config::step::configure_security_keys::data::lr_s2_authenticated_key%]",
+          "s0_legacy_key": "[%key:component::zwave_js::config::step::configure_security_keys::data::s0_legacy_key%]",
+          "s2_access_control_key": "[%key:component::zwave_js::config::step::configure_security_keys::data::s2_access_control_key%]",
+          "s2_authenticated_key": "[%key:component::zwave_js::config::step::configure_security_keys::data::s2_authenticated_key%]",
+          "s2_unauthenticated_key": "[%key:component::zwave_js::config::step::configure_security_keys::data::s2_unauthenticated_key%]",
           "usb_path": "[%key:common::config_flow::data::usb_path%]"
         },
         "description": "[%key:component::zwave_js::config::step::configure_addon_user::description%]",
@@ -622,5 +634,13 @@
       },
       "name": "Set a value (advanced)"
     }
+  },
+  "selector": {
+    "network_type": {
+      "options": {
+        "new": "It's new",
+        "existing": "It already exists"
+      }
+    }
   }
 }

homeassistant/components/zwave_js/translations/cs.json

@@ -45,12 +45,6 @@
             },
             "configure_addon_reconfigure": {
                 "data": {
-                    "lr_s2_access_control_key": "Kl\u00ed\u010d pro \u0159\u00edzen\u00ed p\u0159\u00edstupu S2 s dlouh\u00fdm dosahem",
-                    "lr_s2_authenticated_key": "Kl\u00ed\u010d ov\u011b\u0159en\u00fd S2 s dlouh\u00fdm dosahem",
-                    "s0_legacy_key": "Kl\u00ed\u010d S0 (star\u0161\u00ed)",
-                    "s2_access_control_key": "P\u0159\u00edstupov\u00fd kl\u00ed\u010d S2",
-                    "s2_authenticated_key": "Ov\u011b\u0159en\u00fd kl\u00ed\u010d S2",
-                    "s2_unauthenticated_key": "Neov\u011b\u0159en\u00fd kl\u00ed\u010d S2",
                     "usb_path": "Cesta k USB za\u0159\u00edzen\u00ed"
                 },
                 "description": "Vyberte sv\u016fj adapt\u00e9r Z-Wave",
@@ -58,12 +52,6 @@
             },
             "configure_addon_user": {
                 "data": {
-                    "lr_s2_access_control_key": "Kl\u00ed\u010d pro \u0159\u00edzen\u00ed p\u0159\u00edstupu S2 s dlouh\u00fdm dosahem",
-                    "lr_s2_authenticated_key": "Kl\u00ed\u010d ov\u011b\u0159en\u00fd S2 s dlouh\u00fdm dosahem",
-                    "s0_legacy_key": "Kl\u00ed\u010d S0 (star\u0161\u00ed)",
-                    "s2_access_control_key": "P\u0159\u00edstupov\u00fd kl\u00ed\u010d S2",
-                    "s2_authenticated_key": "Ov\u011b\u0159en\u00fd kl\u00ed\u010d S2",
-                    "s2_unauthenticated_key": "Neov\u011b\u0159en\u00fd kl\u00ed\u010d S2",
                     "usb_path": "Cesta k USB za\u0159\u00edzen\u00ed"
                 },
                 "description": "Vyberte sv\u016fj adapt\u00e9r Z-Wave",

homeassistant/components/zwave_js/translations/de.json

@@ -47,7 +47,7 @@
                 "data": {
                     "lr_s2_access_control_key": "Long Range S2 Access Control Key",
                     "lr_s2_authenticated_key": "Long Range S2 Authenticated Key",
-                    "s0_legacy_key": "S0 Key (Legacy)",
+                    "s0_legacy_key": "S0 Key (veraltet)",
                     "s2_access_control_key": "S2 Access Control Key",
                     "s2_authenticated_key": "S2 Authenticated Key",
                     "s2_unauthenticated_key": "S2 Unauthenticated Key",
@@ -57,17 +57,23 @@
                 "title": "Konfiguration des Z-Wave-Add-ons"
             },
             "configure_addon_user": {
+                "data": {
+                    "usb_path": "USB-Ger\u00e4te-Pfad"
+                },
+                "description": "W\u00e4hle deinen Z-Wave-Adapter",
+                "title": "Konfiguration des Z-Wave-Add-ons"
+            },
+            "configure_security_keys": {
                 "data": {
                     "lr_s2_access_control_key": "Long Range S2 Access Control Key",
                     "lr_s2_authenticated_key": "Long Range S2 Authenticated Key",
-                    "s0_legacy_key": "S0 Key (Legacy)",
+                    "s0_legacy_key": "S0 Key (veraltet)",
                     "s2_access_control_key": "S2 Access Control Key",
                     "s2_authenticated_key": "S2 Authenticated Key",
-                    "s2_unauthenticated_key": "S2 Unauthenticated Key",
-                    "usb_path": "USB-Ger\u00e4te-Pfad"
+                    "s2_unauthenticated_key": "S2 Unauthenticated Key"
                 },
-                "description": "W\u00e4hle deinen Z-Wave-Adapter",
-                "title": "Konfiguration des Z-Wave-Add-ons"
+                "description": "Gib die Sicherheitsschl\u00fcssel f\u00fcr dein vorhandenes Z-Wave-Netzwerk ein",
+                "title": "Sicherheitsschl\u00fcssel"
             },
             "hassio_confirm": {
                 "description": "M\u00f6chtest du die Z-Wave-Integration mit dem Z-Wave-Add-on einrichten?"
@@ -97,6 +103,12 @@
                     "url": "URL"
                 }
             },
+            "network_type": {
+                "data": {
+                    "network_type": "Ist dein Netzwerk neu oder bereits vorhanden?"
+                },
+                "title": "Z-Wave-Netzwerk"
+            },
             "on_supervisor": {
                 "data": {
                     "use_addon": "Das Z-Wave Supervisor-Add-on verwenden"
@@ -285,6 +297,14 @@
             "title": "Ein unbekannter Controller wurde erkannt"
         }
     },
+    "selector": {
+        "network_type": {
+            "options": {
+                "existing": "Es ist bereits vorhanden",
+                "new": "Es ist neu"
+            }
+        }
+    },
     "services": {
         "bulk_set_partial_config_parameters": {
             "description": "Erm\u00f6glicht die Masseneinstellung von Teilparametern. N\u00fctzlich, wenn mehrere Teilparameter gleichzeitig eingestellt werden m\u00fcssen.",

homeassistant/components/zwave_js/translations/el.json

@@ -45,12 +45,6 @@
             },
             "configure_addon_reconfigure": {
                 "data": {
-                    "lr_s2_access_control_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 \u03bc\u03b5\u03b3\u03ac\u03bb\u03b7\u03c2 \u03b5\u03bc\u03b2\u03ad\u03bb\u03b5\u03b9\u03b1\u03c2",
-                    "lr_s2_authenticated_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03bc\u03b5\u03b3\u03ac\u03bb\u03b7\u03c2 \u03b5\u03bc\u03b2\u03ad\u03bb\u03b5\u03b9\u03b1\u03c2 \u03bc\u03b5 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2",
-                    "s0_legacy_key": "\u039a\u03bb\u03b5\u03b9\u03b4\u03af S0 (\u03c0\u03b1\u03bb\u03b1\u03b9\u03bf\u03cd \u03c4\u03cd\u03c0\u03bf\u03c5)",
-                    "s2_access_control_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
-                    "s2_authenticated_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03bc\u03b5 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2",
-                    "s2_unauthenticated_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03c7\u03c9\u03c1\u03af\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2",
                     "usb_path": "\u0394\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2 USB"
                 },
                 "description": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03bf\u03bd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1 Z-Wave",
@@ -58,12 +52,6 @@
             },
             "configure_addon_user": {
                 "data": {
-                    "lr_s2_access_control_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 \u03bc\u03b5\u03b3\u03ac\u03bb\u03b7\u03c2 \u03b5\u03bc\u03b2\u03ad\u03bb\u03b5\u03b9\u03b1\u03c2",
-                    "lr_s2_authenticated_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03bc\u03b5\u03b3\u03ac\u03bb\u03b7\u03c2 \u03b5\u03bc\u03b2\u03ad\u03bb\u03b5\u03b9\u03b1\u03c2 \u03bc\u03b5 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2",
-                    "s0_legacy_key": "\u039a\u03bb\u03b5\u03b9\u03b4\u03af S0 (\u03c0\u03b1\u03bb\u03b1\u03b9\u03bf\u03cd \u03c4\u03cd\u03c0\u03bf\u03c5)",
-                    "s2_access_control_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
-                    "s2_authenticated_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03bc\u03b5 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2",
-                    "s2_unauthenticated_key": "S2 \u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03c7\u03c9\u03c1\u03af\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2",
                     "usb_path": "\u0394\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2 USB"
                 },
                 "description": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03bf\u03bd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1 Z-Wave",

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

@@ -45,12 +45,6 @@
             },
             "configure_addon_reconfigure": {
                 "data": {
-                    "lr_s2_access_control_key": "Long Range S2 Access Control Key",
-                    "lr_s2_authenticated_key": "Long Range S2 Authenticated Key",
-                    "s0_legacy_key": "S0 Key (Legacy)",
-                    "s2_access_control_key": "S2 Access Control Key",
-                    "s2_authenticated_key": "S2 Authenticated Key",
-                    "s2_unauthenticated_key": "S2 Unauthenticated Key",
                     "usb_path": "USB device path"
                 },
                 "description": "Select your Z-Wave adapter",
@@ -58,12 +52,6 @@
             },
             "configure_addon_user": {
                 "data": {
-                    "lr_s2_access_control_key": "Long Range S2 Access Control Key",
-                    "lr_s2_authenticated_key": "Long Range S2 Authenticated Key",
-                    "s0_legacy_key": "S0 Key (Legacy)",
-                    "s2_access_control_key": "S2 Access Control Key",
-                    "s2_authenticated_key": "S2 Authenticated Key",
-                    "s2_unauthenticated_key": "S2 Unauthenticated Key",
                     "usb_path": "USB device path"
                 },
                 "description": "Select your Z-Wave adapter",

homeassistant/components/zwave_js/translations/en.json

@@ -57,17 +57,23 @@
                 "title": "Enter the Z-Wave add-on configuration"
             },
             "configure_addon_user": {
+                "data": {
+                    "usb_path": "USB device path"
+                },
+                "description": "Select your Z-Wave adapter",
+                "title": "Enter the Z-Wave add-on configuration"
+            },
+            "configure_security_keys": {
                 "data": {
                     "lr_s2_access_control_key": "Long Range S2 Access Control Key",
                     "lr_s2_authenticated_key": "Long Range S2 Authenticated Key",
                     "s0_legacy_key": "S0 Key (Legacy)",
                     "s2_access_control_key": "S2 Access Control Key",
                     "s2_authenticated_key": "S2 Authenticated Key",
-                    "s2_unauthenticated_key": "S2 Unauthenticated Key",
-                    "usb_path": "USB device path"
+                    "s2_unauthenticated_key": "S2 Unauthenticated Key"
                 },
-                "description": "Select your Z-Wave adapter",
-                "title": "Enter the Z-Wave add-on configuration"
+                "description": "Enter the security keys for your existing Z-Wave network",
+                "title": "Security keys"
             },
             "hassio_confirm": {
                 "description": "Do you want to set up the Z-Wave integration with the Z-Wave add-on?"
@@ -97,6 +103,12 @@
                     "url": "URL"
                 }
             },
+            "network_type": {
+                "data": {
+                    "network_type": "Is your network new or does it already exist?"
+                },
+                "title": "Z-Wave network"
+            },
             "on_supervisor": {
                 "data": {
                     "use_addon": "Use the Z-Wave Supervisor add-on"
@@ -285,6 +297,14 @@
             "title": "An unknown controller was detected"
         }
     },
+    "selector": {
+        "network_type": {
+            "options": {
+                "existing": "It already exists",
+                "new": "It's new"
+            }
+        }
+    },
     "services": {
         "bulk_set_partial_config_parameters": {
             "description": "Allows for bulk setting partial parameters. Useful when multiple partial parameters have to be set at the same time.",

homeassistant/components/zwave_js/translations/es.json

@@ -45,12 +45,6 @@
             },
             "configure_addon_reconfigure": {
                 "data": {
-                    "lr_s2_access_control_key": "Clave de control de acceso S2 de largo alcance",
-                    "lr_s2_authenticated_key": "Clave autenticada S2 de largo alcance",
-                    "s0_legacy_key": "Clave S0 (heredada)",
-                    "s2_access_control_key": "Clave de control de acceso S2",
-                    "s2_authenticated_key": "Clave autenticada de S2",
-                    "s2_unauthenticated_key": "Clave no autenticada de S2",
                     "usb_path": "Ruta del dispositivo USB"
                 },
                 "description": "Selecciona tu adaptador Z-Wave",
@@ -58,12 +52,6 @@
             },
             "configure_addon_user": {
                 "data": {
-                    "lr_s2_access_control_key": "Clave de control de acceso S2 de largo alcance",
-                    "lr_s2_authenticated_key": "Clave autenticada S2 de largo alcance",
-                    "s0_legacy_key": "Clave S0 (heredada)",
-                    "s2_access_control_key": "Clave de control de acceso S2",
-                    "s2_authenticated_key": "Clave autenticada de S2",
-                    "s2_unauthenticated_key": "Clave no autenticada de S2",
                     "usb_path": "Ruta del dispositivo USB"
                 },
                 "description": "Selecciona tu adaptador Z-Wave",

homeassistant/components/zwave_js/translations/et.json

@@ -57,17 +57,23 @@
                 "title": "Sisesta Z-Wave lisandmooduli seaded"
             },
             "configure_addon_user": {
+                "data": {
+                    "usb_path": "USB-seadme asukoha rada"
+                },
+                "description": "Vali oma Z-Wave adapter",
+                "title": "Sisesta Z-Wave lisandmooduli seaded"
+            },
+            "configure_security_keys": {
                 "data": {
                     "lr_s2_access_control_key": "Pikamaa S2 juurdep\u00e4\u00e4sukontrolli v\u00f5ti",
                     "lr_s2_authenticated_key": "Pikamaa S2 autentitud v\u00f5ti",
                     "s0_legacy_key": "S0 vana t\u00fc\u00fcpi v\u00f5ti",
                     "s2_access_control_key": "S2 juurdep\u00e4\u00e4suv\u00f5ti",
                     "s2_authenticated_key": "Autenditud S2 v\u00f5ti",
-                    "s2_unauthenticated_key": "Autentimata S2 v\u00f5ti",
-                    "usb_path": "USB-seadme asukoha rada"
+                    "s2_unauthenticated_key": "Autentimata S2 v\u00f5ti"
                 },
-                "description": "Vali oma Z-Wave adapter",
-                "title": "Sisesta Z-Wave lisandmooduli seaded"
+                "description": "Sisesta oma olemasoleva Z-Wave v\u00f5rgu turvav\u00f5tmed",
+                "title": "Turvav\u00f5tmed"
             },
             "hassio_confirm": {
                 "description": "Kas soovid seadistada Z-Wave'i integratsiooni Z-Wave'i lisandmooduliga?"
@@ -84,6 +90,7 @@
                 "title": "Seadista Z-Wave"
             },
             "instruct_unplug": {
+                "description": "Varukoopia salvestati asukohta \u201e {file_path} \u201d \n \n Vana kontrollerit pole l\u00e4htestatud. N\u00fc\u00fcd peaksid selle vooluv\u00f5rgust lahti \u00fchendama, et see uue kontrolleri t\u00f6\u00f6d ei segaks. \n \n Enne j\u00e4tkamist veendu, et uus kontroller on vooluv\u00f5rku \u00fchendatud.",
                 "title": "\u00dchenda vana kontroller lahti"
             },
             "manual": {
@@ -96,6 +103,12 @@
                     "url": "URL"
                 }
             },
+            "network_type": {
+                "data": {
+                    "network_type": "Kas v\u00f5rk on uus v\u00f5i on see juba olemas?"
+                },
+                "title": "Z-Wave v\u00f5rk"
+            },
             "on_supervisor": {
                 "data": {
                     "use_addon": "Kasuta lisandmoodulit Z-Wave Supervisor"
@@ -284,6 +297,14 @@
             "title": "Tuvastati tundmatu kontroller"
         }
     },
+    "selector": {
+        "network_type": {
+            "options": {
+                "existing": "See on juba olemas",
+                "new": "See on uus"
+            }
+        }
+    },
     "services": {
         "bulk_set_partial_config_parameters": {
             "description": "V\u00f5imaldab osaliste parameetrite hulgiseadistamist. Kasulik, kui korraga tuleb seadistada mitu osalist parameetrit.",

homeassistant/components/zwave_js/translations/fi.json

@@ -15,25 +15,11 @@
         "flow_title": "{name}",
         "step": {
             "configure_addon_reconfigure": {
-                "data": {
-                    "lr_s2_access_control_key": "Pitk\u00e4n kantaman S2 kulunvalvonta-avain",
-                    "lr_s2_authenticated_key": "Pitk\u00e4n kantaman S2-todennettu avain",
-                    "s0_legacy_key": "S0-avain (vanha)",
-                    "s2_access_control_key": "S2-p\u00e4\u00e4synvalvonta-avain",
-                    "s2_authenticated_key": "S2 Todennettu avain",
-                    "s2_unauthenticated_key": "S2 Todentamaton avain"
-                },
                 "description": "Lis\u00e4osa luo suojausavaimet, jos n\u00e4m\u00e4 kent\u00e4t j\u00e4tet\u00e4\u00e4n tyhjiksi.",
                 "title": "Sy\u00f6t\u00e4 Z-Wave-lis\u00e4osan kokoonpano"
             },
             "configure_addon_user": {
                 "data": {
-                    "lr_s2_access_control_key": "Pitk\u00e4n kantaman S2 kulunvalvonta-avain",
-                    "lr_s2_authenticated_key": "Pitk\u00e4n kantaman S2-todennettu avain",
-                    "s0_legacy_key": "S0-avain (vanha)",
-                    "s2_access_control_key": "S2-p\u00e4\u00e4synvalvonta-avain",
-                    "s2_authenticated_key": "S2 Todennettu avain",
-                    "s2_unauthenticated_key": "S2 Todentamaton avain",
                     "usb_path": "USB-laitteen polku"
                 },
                 "title": "Sy\u00f6t\u00e4 Z-Wave-lis\u00e4osan kokoonpano"

homeassistant/components/zwave_js/translations/ga.json

@@ -14,21 +14,7 @@
             "choose_serial_port": {
                 "title": "Roghnaigh do ghl\u00e9as Z-Wave"
             },
-            "configure_addon_reconfigure": {
-                "data": {
-                    "lr_s2_access_control_key": "Eochair Rialaithe Rochtana Fadraoin S2",
-                    "lr_s2_authenticated_key": "Eochair Fh\u00edordheimhnithe Fad-Raoin S2"
-                }
-            },
             "configure_addon_user": {
-                "data": {
-                    "lr_s2_access_control_key": "Eochair Rialaithe Rochtana Fadraoin S2",
-                    "lr_s2_authenticated_key": "Eochair Fh\u00edordheimhnithe Fad-Raoin S2",
-                    "s0_legacy_key": "Eochair S0 (Oidhreacht)",
-                    "s2_access_control_key": "Eochair Rialaithe Rochtana S2",
-                    "s2_authenticated_key": "Eochair F\u00edordheimhnithe S2",
-                    "s2_unauthenticated_key": "Eochair Neamhfh\u00edordheimhnithe S2"
-                },
                 "title": "Cuir isteach cumra\u00edocht bhreise\u00e1in Z-Wave"
             },
             "hassio_confirm": {

homeassistant/components/zwave_js/translations/hu.json

@@ -39,12 +39,6 @@
             },
             "configure_addon_reconfigure": {
                 "data": {
-                    "lr_s2_access_control_key": "Hossz\u00fa hat\u00f3t\u00e1v\u00fa S2 hozz\u00e1f\u00e9r\u00e9s-vez\u00e9rl\u00e9si kulcs",
-                    "lr_s2_authenticated_key": "Hossz\u00fa hat\u00f3t\u00e1v\u00fa S2 hiteles\u00edtett kulcs",
-                    "s0_legacy_key": "S0 kulcs (r\u00e9gi)",
-                    "s2_access_control_key": "S2 hozz\u00e1f\u00e9r\u00e9s-vez\u00e9rl\u00e9si kulcs",
-                    "s2_authenticated_key": "S2 hiteles\u00edtett kulcs",
-                    "s2_unauthenticated_key": "S2 nem hiteles\u00edtett kulcs",
                     "usb_path": "USB eszk\u00f6z el\u00e9r\u00e9si \u00fat"
                 },
                 "description": "A b\u0151v\u00edtm\u00e9ny gener\u00e1lni fogja a biztons\u00e1gi kulcsokat, ha ezek a mez\u0151k \u00fcresen maradnak.",
@@ -52,12 +46,6 @@
             },
             "configure_addon_user": {
                 "data": {
-                    "lr_s2_access_control_key": "Hossz\u00fa hat\u00f3t\u00e1v\u00fa S2 hozz\u00e1f\u00e9r\u00e9s-vez\u00e9rl\u00e9si kulcs",
-                    "lr_s2_authenticated_key": "Hossz\u00fa hat\u00f3t\u00e1v\u00fa S2 hiteles\u00edtett kulcs",
-                    "s0_legacy_key": "S0 kulcs (r\u00e9gi)",
-                    "s2_access_control_key": "S2 hozz\u00e1f\u00e9r\u00e9s-vez\u00e9rl\u00e9si kulcs",
-                    "s2_authenticated_key": "S2 hiteles\u00edtett kulcs",
-                    "s2_unauthenticated_key": "S2 nem hiteles\u00edtett kulcs",
                     "usb_path": "USB eszk\u00f6z el\u00e9r\u00e9si \u00fat"
                 },
                 "title": "Adja meg a Z-Wave b\u0151v\u00edtm\u00e9ny konfigur\u00e1ci\u00f3j\u00e1t"