From 9049495b6b8f51abeeac2926078b38d83f06c5f9 Mon Sep 17 00:00:00 2001
From: Julian <130256240+j4n-e4t@users.noreply.github.com>
Date: Mon, 14 Oct 2024 23:50:47 +0200
Subject: [PATCH 1/3] Fix translation string in motioneye

---
 homeassistant/components/motioneye/strings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/motioneye/strings.json b/homeassistant/components/motioneye/strings.json
index ea7901617cbeab..fe385994618aab 100644
--- a/homeassistant/components/motioneye/strings.json
+++ b/homeassistant/components/motioneye/strings.json
@@ -23,7 +23,8 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
     }
   },
   "options": {

From 0671f14361de09434e1c18a93c5219f294f97888 Mon Sep 17 00:00:00 2001
From: Julian <130256240+j4n-e4t@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:13:40 +0200
Subject: [PATCH 2/3] Remove ignore_translations from motioneye config_flow
 test

---
 tests/components/motioneye/test_config_flow.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/components/motioneye/test_config_flow.py b/tests/components/motioneye/test_config_flow.py
index c15d0ade035079..d2ec91b08e38f4 100644
--- a/tests/components/motioneye/test_config_flow.py
+++ b/tests/components/motioneye/test_config_flow.py
@@ -7,7 +7,6 @@
     MotionEyeClientInvalidAuthError,
     MotionEyeClientRequestError,
 )
-import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.hassio import HassioServiceInfo
@@ -391,10 +390,6 @@ async def test_hassio_ignored(hass: HomeAssistant) -> None:
     assert result.get("reason") == "already_configured"
 
 
-@pytest.mark.parametrize(  # Remove when translations fixed
-    "ignore_translations",
-    ["component.motioneye.config.abort.already_in_progress"],
-)
 async def test_hassio_abort_if_already_in_progress(hass: HomeAssistant) -> None:
     """Test Supervisor discovered flow aborts if user flow in progress."""
     result = await hass.config_entries.flow.async_init(

From 2f9178d994222fe7938af11e8a567b07b3b0f415 Mon Sep 17 00:00:00 2001
From: Julian <130256240+j4n-e4t@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:54:13 +0200
Subject: [PATCH 3/3] Update homeassistant/components/motioneye/strings.json

Co-authored-by: epenet <6771947+epenet@users.noreply.github.com>
---
 homeassistant/components/motioneye/strings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/motioneye/strings.json b/homeassistant/components/motioneye/strings.json
index fe385994618aab..c0a4b7753d5223 100644
--- a/homeassistant/components/motioneye/strings.json
+++ b/homeassistant/components/motioneye/strings.json
@@ -23,8 +23,8 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "options": {