Add already_in_progress to base strings for config flows (#40961)

2025-07-22 20:57:21 +00:00 · 2020-10-03 15:49:09 +02:00 · 2020-10-03 15:49:09 +02:00 · 064a453604
commit 064a453604
parent 04daa9a378
20 changed files with 61 additions and 60 deletions
--- a/homeassistant/components/agent_dvr/strings.json
+++ b/homeassistant/components/agent_dvr/strings.json
@ -14,8 +14,8 @@
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
    "error": {
-      "already_in_progress": "Config flow for device is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "device_unavailable": "Device is not available"
    }
  }
-}
+}
--- a/homeassistant/components/arcam_fmj/strings.json
+++ b/homeassistant/components/arcam_fmj/strings.json
@ -1,28 +1,28 @@
 {
-    "config": {
-        "abort": {
-            "already_configured": "Device was already setup.",
-            "already_in_progress": "Config flow for device is already in progress.",
-            "unable_to_connect": "Unable to connect to device."
-        },
-        "error": {},
-        "flow_title": "Arcam FMJ on {host}",
-        "step": {
-            "confirm": {
-                "description": "Do you want to add Arcam FMJ on `{host}` to Home Assistant?"
-            },
-            "user": {
-                "data": {
-                    "host": "[%key:common::config_flow::data::host%]",
-                    "port": "[%key:common::config_flow::data::port%]"
-                },
-                "description": "Please enter the host name or IP address of device."
-            }
-        }
+  "config": {
+    "abort": {
+      "already_configured": "Device was already setup.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "unable_to_connect": "Unable to connect to device."
    },
-    "device_automation": {
-        "trigger_type": {
-            "turn_on": "{entity_name} was requested to turn on"
-        }
+    "error": {},
+    "flow_title": "Arcam FMJ on {host}",
+    "step": {
+      "confirm": {
+        "description": "Do you want to add Arcam FMJ on `{host}` to Home Assistant?"
+      },
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "description": "Please enter the host name or IP address of device."
+      }
    }
+  },
+  "device_automation": {
+    "trigger_type": {
+      "turn_on": "{entity_name} was requested to turn on"
+    }
+  }
 }
--- a/homeassistant/components/axis/strings.json
+++ b/homeassistant/components/axis/strings.json
@ -14,7 +14,7 @@
    },
    "error": {
      "already_configured": "Device is already configured",
-      "already_in_progress": "Config flow for device is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "device_unavailable": "Device is not available",
      "faulty_credentials": "Bad user credentials"
    },
--- a/homeassistant/components/broadlink/strings.json
+++ b/homeassistant/components/broadlink/strings.json
@ -32,7 +32,7 @@
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "There is already a configuration flow in progress for this device",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_host": "Invalid hostname or IP address",
      "not_supported": "Device not supported",
--- a/homeassistant/components/deconz/strings.json
+++ b/homeassistant/components/deconz/strings.json
@ -27,7 +27,7 @@
    },
    "abort": {
      "already_configured": "Bridge is already configured",
-      "already_in_progress": "Config flow for bridge is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "no_bridges": "No deCONZ bridges discovered",
      "no_hardware_available": "No radio hardware connected to deCONZ",
      "not_deconz_bridge": "Not a deCONZ bridge",
--- a/homeassistant/components/denonavr/strings.json
+++ b/homeassistant/components/denonavr/strings.json
@ -26,7 +26,7 @@
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Config flow for this Denon AVR is already in progress",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "connection_error": "Failed to connect, please try again, disconnecting mains power and ethernet cables and reconnecting them may help",
      "not_denonavr_manufacturer": "Not a Denon AVR Network Receiver, discovered manafucturer did not match",
      "not_denonavr_missing": "Not a Denon AVR Network Receiver, discovery information not complete"
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@ -2,7 +2,7 @@
  "config": {
    "abort": {
      "already_configured": "ESP is already configured",
-      "already_in_progress": "ESP configuration is already in progress"
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
    },
    "error": {
      "resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips",
@ -30,4 +30,4 @@
    },
    "flow_title": "ESPHome: {name}"
  }
-}
+}
--- a/homeassistant/components/fritzbox/strings.json
+++ b/homeassistant/components/fritzbox/strings.json
@ -19,7 +19,7 @@
      }
    },
    "abort": {
-      "already_in_progress": "AVM FRITZ!Box configuration is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "already_configured": "This AVM FRITZ!Box is already configured.",
      "not_found": "No supported AVM FRITZ!Box found on the network.",
      "not_supported": "Connected to AVM FRITZ!Box but it's unable to control Smart Home devices."
@ -28,4 +28,4 @@
      "auth_failed": "Username and/or password are incorrect."
    }
  }
-}
+}
--- a/homeassistant/components/guardian/strings.json
+++ b/homeassistant/components/guardian/strings.json
@ -15,7 +15,7 @@
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Guardian device configuration is already in process.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
    }
  }
--- a/homeassistant/components/homekit_controller/strings.json
+++ b/homeassistant/components/homekit_controller/strings.json
@ -45,27 +45,27 @@
      "invalid_config_entry": "This device is showing as ready to pair but there is already a conflicting configuration entry for it in Home Assistant that must first be removed.",
      "accessory_not_found_error": "Cannot add pairing as device can no longer be found.",
      "invalid_properties": "Invalid properties announced by device.",
-      "already_in_progress": "Config flow for device is already in progress."
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
    }
  },
  "device_automation": {
    "trigger_type": {
-        "single_press": "\"{subtype}\" pressed",
-        "double_press": "\"{subtype}\" pressed twice",
-        "long_press": "\"{subtype}\" pressed and held"
+      "single_press": "\"{subtype}\" pressed",
+      "double_press": "\"{subtype}\" pressed twice",
+      "long_press": "\"{subtype}\" pressed and held"
    },
    "trigger_subtype": {
-        "doorbell": "Doorbell",
-        "button1": "Button 1",
-        "button2": "Button 2",
-        "button3": "Button 3",
-        "button4": "Button 4",
-        "button5": "Button 5",
-        "button6": "Button 6",
-        "button7": "Button 7",
-        "button8": "Button 8",
-        "button9": "Button 9",
-        "button10": "Button 10"
+      "doorbell": "Doorbell",
+      "button1": "Button 1",
+      "button2": "Button 2",
+      "button3": "Button 3",
+      "button4": "Button 4",
+      "button5": "Button 5",
+      "button6": "Button 6",
+      "button7": "Button 7",
+      "button8": "Button 8",
+      "button9": "Button 9",
+      "button10": "Button 10"
    }
  }
 }
--- a/homeassistant/components/huawei_lte/strings.json
+++ b/homeassistant/components/huawei_lte/strings.json
@ -2,7 +2,7 @@
  "config": {
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "This device is already being configured",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "not_huawei_lte": "Not a Huawei LTE device"
    },
    "error": {
--- a/homeassistant/components/hue/strings.json
+++ b/homeassistant/components/hue/strings.json
@ -29,7 +29,7 @@
      "unknown": "Unknown error occurred",
      "cannot_connect": "Unable to connect to the bridge",
      "already_configured": "Bridge is already configured",
-      "already_in_progress": "Config flow for bridge is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "not_hue_bridge": "Not a Hue bridge"
    }
  },
--- a/homeassistant/components/konnected/strings.json
+++ b/homeassistant/components/konnected/strings.json
@ -23,7 +23,7 @@
    "abort": {
      "unknown": "Unknown error occurred",
      "already_configured": "Device is already configured",
-      "already_in_progress": "Config flow for device is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "not_konn_panel": "Not a recognized Konnected.io device"
    }
  },
--- a/homeassistant/components/onvif/strings.json
+++ b/homeassistant/components/onvif/strings.json
@ -2,7 +2,7 @@
  "config": {
    "abort": {
      "already_configured": "ONVIF device is already configured.",
-      "already_in_progress": "Config flow for ONVIF device is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "onvif_error": "Error setting up ONVIF device.  Check logs for more information.",
      "no_h264": "There were no H264 streams available.  Check the profile configuration on your device.",
      "no_mac": "Could not configure unique ID for ONVIF device."
--- a/homeassistant/components/plex/strings.json
+++ b/homeassistant/components/plex/strings.json
@ -40,7 +40,7 @@
    "abort": {
      "all_configured": "All linked servers already configured",
      "already_configured": "This Plex server is already configured",
-      "already_in_progress": "Plex is being configured",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "reauth_successful": "Successfully reauthenticated",
      "token_request_timeout": "Timed out obtaining token",
      "unknown": "[%key:common::config_flow::error::unknown%]"
--- a/homeassistant/components/samsungtv/strings.json
+++ b/homeassistant/components/samsungtv/strings.json
@ -15,7 +15,7 @@
      }
    },
    "abort": {
-      "already_in_progress": "Samsung TV configuration is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "already_configured": "This Samsung TV is already configured.",
      "auth_missing": "Home Assistant is not authorized to connect to this Samsung TV. Please check your TV's settings to authorize Home Assistant.",
      "not_successful": "Unable to connect to this Samsung TV device.",
--- a/homeassistant/components/tradfri/strings.json
+++ b/homeassistant/components/tradfri/strings.json
@ -17,7 +17,7 @@
    },
    "abort": {
      "already_configured": "Bridge is already configured.",
-      "already_in_progress": "Bridge configuration is already in progress."
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
    }
  }
-}
+}
--- a/homeassistant/components/xiaomi_aqara/strings.json
+++ b/homeassistant/components/xiaomi_aqara/strings.json
@ -36,7 +36,7 @@
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Config flow for this gateway is already in progress",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "not_xiaomi_aqara": "Not a Xiaomi Aqara Gateway, discovered device did not match known gateways"
    }
  }
--- a/homeassistant/components/xiaomi_miio/strings.json
+++ b/homeassistant/components/xiaomi_miio/strings.json
@ -25,7 +25,7 @@
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Config flow for this Xiaomi Miio device is already in progress."
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
    }
  }
 }
--- a/homeassistant/strings.json
+++ b/homeassistant/strings.json
@ -55,6 +55,7 @@
        "already_configured_account": "Account is already configured",
        "already_configured_service": "Service is already configured",
        "already_configured_device": "Device is already configured",
+        "already_in_progress": "Configuration flow is already in progress",
        "no_devices_found": "No devices found on the network",
        "oauth2_missing_configuration": "The component is not configured. Please follow the documentation.",
        "oauth2_authorize_url_timeout": "Timeout generating authorize URL.",