mirror of
https://github.com/home-assistant/core.git
synced 2025-04-24 01:08:12 +00:00
merge
This commit is contained in:
parent
f069511c14
commit
9dffca201c
@ -34,18 +34,18 @@
|
||||
"password": "[%key:common::config_flow::data::password%]"
|
||||
},
|
||||
"data_description": {
|
||||
"password": "Passwords are deprecated and will be removed in a future version. Please update your ESPHome YAML configuration to use an encryption key instead."
|
||||
"password": "Passwords are deprecated and will be removed in a future version. Please update your ESPHome device YAML configuration to use an encryption key instead."
|
||||
},
|
||||
"description": "Please enter the password you set in your configuration for {name}."
|
||||
"description": "Please enter the password you set in your ESPHome device YAML configuration for {name}."
|
||||
},
|
||||
"encryption_key": {
|
||||
"data": {
|
||||
"noise_psk": "Encryption key"
|
||||
},
|
||||
"data_description": {
|
||||
"noise_psk": "The encryption key is used to encrypt the connection between Home Assistant and the ESPHome device. You can find this in the api: section of your ESPHome configuration if it is enabled."
|
||||
"noise_psk": "The encryption key is used to encrypt the connection between Home Assistant and the ESPHome device. You can find this in the api: section of your ESPHome device YAML configuration."
|
||||
},
|
||||
"description": "Please enter the encryption key for {name}. You can find it in the ESPHome Dashboard or in your device configuration."
|
||||
"description": "Please enter the encryption key for {name}. You can find it in the ESPHome Dashboard or in your ESPHome device YAML configuration."
|
||||
},
|
||||
"reauth_confirm": {
|
||||
"data": {
|
||||
@ -54,7 +54,7 @@
|
||||
"data_description": {
|
||||
"noise_psk": "[%key:component::esphome::config::step::encryption_key::data_description::noise_psk%]"
|
||||
},
|
||||
"description": "The ESPHome device {name} enabled transport encryption or changed the encryption key. Please enter the updated key. You can find it in the ESPHome Dashboard or in your device configuration."
|
||||
"description": "The ESPHome device {name} enabled transport encryption or changed the encryption key. Please enter the updated key. You can find it in the ESPHome Dashboard or in your ESPHome device YAML configuration."
|
||||
},
|
||||
"reauth_encryption_removed_confirm": {
|
||||
"description": "The ESPHome device {name} disabled transport encryption. Please confirm that you want to remove the encryption key and allow unencrypted connections."
|
||||
@ -62,6 +62,14 @@
|
||||
"discovery_confirm": {
|
||||
"description": "Do you want to add the device `{name}` to Home Assistant?",
|
||||
"title": "Discovered ESPHome device"
|
||||
},
|
||||
"name_conflict": {
|
||||
"title": "Name conflict",
|
||||
"description": "**The name `{name}` is already being used by another device: {existing_title} (MAC address: `{existing_mac}`)**\n\nTo continue, please choose one of the following options:\n\n**Migrate configuration to new device:** If this is a replacement, migrate the existing settings to the new device (`{mac}`).\n**Overwrite the existing configuration:** If this is not a replacement, delete the old configuration for `{existing_mac}` and use the new device instead.",
|
||||
"menu_options": {
|
||||
"name_conflict_migrate": "Migrate configuration to new device",
|
||||
"name_conflict_overwrite": "Overwrite the existing configuration"
|
||||
}
|
||||
}
|
||||
},
|
||||
"flow_title": "{name}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user