move tests

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -33,7 +33,7 @@
         "GitHub.vscode-pull-request-github",
         "GitHub.copilot"
       ],
-      // Please keep this file in sync with settings in home-assistant/.vscode/settings.default.jsonc
+      // Please keep this file in sync with settings in home-assistant/.vscode/settings.default.json
       "settings": {
         "python.experiments.optOutFrom": ["pythonTestAdapter"],
         "python.defaultInterpreterPath": "/home/vscode/.local/ha-venv/bin/python",
@@ -41,7 +41,6 @@
         "python.terminal.activateEnvInCurrentTerminal": true,
         "python.testing.pytestArgs": ["--no-cov"],
         "pylint.importStrategy": "fromEnvironment",
-        "python.analysis.typeCheckingMode": "basic",
         "editor.formatOnPaste": false,
         "editor.formatOnSave": true,
         "editor.formatOnType": true,
@@ -63,9 +62,6 @@
         "[python]": {
           "editor.defaultFormatter": "charliermarsh.ruff"
         },
-        "[json][jsonc][yaml]": {
-          "editor.defaultFormatter": "esbenp.prettier-vscode"
-        },
         "json.schemas": [
           {
             "fileMatch": ["homeassistant/components/*/manifest.json"],

.github/copilot-instructions.md

@@ -74,7 +74,6 @@ rules:
 - **Formatting**: Ruff
 - **Linting**: PyLint and Ruff
 - **Type Checking**: MyPy
-- **Lint/Type/Format Fixes**: Always prefer addressing the underlying issue (e.g., import the typed source, update shared stubs, align with Ruff expectations, or correct formatting at the source) before disabling a rule, adding `# type: ignore`, or skipping a formatter. Treat suppressions and `noqa` comments as a last resort once no compliant fix exists
 - **Testing**: pytest with plain functions and fixtures
 - **Language**: American English for all code, comments, and documentation (use sentence case, including titles)
 

.github/workflows/builder.yml

@@ -69,7 +69,7 @@ jobs:
         run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
       - name: Upload translations
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: translations
           path: translations.tar.gz
@@ -175,7 +175,7 @@ jobs:
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
       - name: Download translations
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: translations
 
@@ -326,7 +326,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
         with:
           cosign-release: "v2.2.3"
 
@@ -464,7 +464,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: translations
 

.github/workflows/ci.yaml

@@ -37,12 +37,12 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 1
+  CACHE_VERSION: 9
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
   HA_SHORT_VERSION: "2025.11"
   DEFAULT_PYTHON: "3.13"
-  ALL_PYTHON_VERSIONS: "['3.13', '3.14']"
+  ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -364,13 +364,13 @@ jobs:
       - name: Run check-json
         run: |
           . venv/bin/activate
-          pre-commit run --hook-stage manual check-json --all-files --show-diff-on-failure
+          pre-commit run --hook-stage manual check-json --all-files
 
       - name: Run prettier (fully)
         if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
-          pre-commit run --hook-stage manual prettier --all-files --show-diff-on-failure
+          pre-commit run --hook-stage manual prettier --all-files
 
       - name: Run prettier (partially)
         if: needs.info.outputs.test_full_suite == 'false'
@@ -378,7 +378,7 @@ jobs:
         run: |
           . venv/bin/activate
           shopt -s globstar
-          pre-commit run --hook-stage manual prettier --show-diff-on-failure --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*}
+          pre-commit run --hook-stage manual prettier --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*}
 
       - name: Register check executables problem matcher
         run: |
@@ -386,7 +386,7 @@ jobs:
       - name: Run executables check
         run: |
           . venv/bin/activate
-          pre-commit run --hook-stage manual check-executables-have-shebangs --all-files --show-diff-on-failure
+          pre-commit run --hook-stage manual check-executables-have-shebangs --all-files
 
       - name: Register codespell problem matcher
         run: |
@@ -428,7 +428,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        python-version: &matrix-python ${{ fromJson(needs.info.outputs.python_versions) }}
+        python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - *checkout
       - &setup-python-matrix
@@ -514,7 +514,9 @@ jobs:
         if: steps.cache-apt-check.outputs.cache-hit != 'true'
         uses: &actions-cache-save actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
-          path: *path-apt-cache
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
           key: *key-apt-cache
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -535,7 +537,7 @@ jobs:
           python --version
           uv pip freeze >> pip_freeze.txt
       - name: Upload pip_freeze artifact
-        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: &actions-upload-artifact actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: pip-freeze-${{ matrix.python-version }}
           path: pip_freeze.txt
@@ -639,7 +641,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: *matrix-python
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
     steps:
       - *checkout
       - *setup-python-matrix
@@ -836,8 +838,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: *matrix-python
-        group: &matrix-group ${{ fromJson(needs.info.outputs.test_groups) }}
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
+        group: ${{ fromJson(needs.info.outputs.test_groups) }}
     steps:
       - *cache-restore-apt
       - name: Install additional OS dependencies
@@ -867,7 +869,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: &actions-download-artifact actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: &actions-download-artifact actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: pytest_buckets
       - &compile-english-translations
@@ -962,7 +964,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: *matrix-python
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
         mariadb-group: ${{ fromJson(needs.info.outputs.mariadb_groups) }}
     steps:
       - *cache-restore-apt
@@ -1079,7 +1081,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: *matrix-python
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
         postgresql-group: ${{ fromJson(needs.info.outputs.postgresql_groups) }}
     steps:
       - *cache-restore-apt
@@ -1216,8 +1218,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: *matrix-python
-        group: *matrix-group
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
+        group: ${{ fromJson(needs.info.outputs.test_groups) }}
     steps:
       - *cache-restore-apt
       - name: Install additional OS dependencies

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           category: "/language:python"

.github/workflows/wheels.yml

@@ -31,8 +31,7 @@ jobs:
     outputs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
-      - &checkout
-        name: Checkout the repository
+      - name: Checkout the repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
@@ -92,7 +91,7 @@ jobs:
           ) > build_constraints.txt
 
       - name: Upload env_file
-        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: env_file
           path: ./.env_file
@@ -100,14 +99,14 @@ jobs:
           overwrite: true
 
       - name: Upload build_constraints
-        uses: *actions-upload-artifact
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: build_constraints
           path: ./build_constraints.txt
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: *actions-upload-artifact
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
@@ -119,7 +118,7 @@ jobs:
           python -m script.gen_requirements_all ci
 
       - name: Upload requirements_all_wheels
-        uses: *actions-upload-artifact
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: requirements_all_wheels
           path: ./requirements_all_wheels_*.txt
@@ -128,41 +127,28 @@ jobs:
     name: Build Core wheels ${{ matrix.abi }} for ${{ matrix.arch }} (musllinux_1_2)
     if: github.repository_owner == 'home-assistant'
     needs: init
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix: &matrix-build
-        abi: ["cp313", "cp314"]
+      matrix:
+        abi: ["cp313"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
-        include:
-          - os: ubuntu-latest
-          - arch: aarch64
-            os: ubuntu-24.04-arm
-        exclude:
-          - abi: cp314
-            arch: armv7
-          - abi: cp314
-            arch: armhf
-          - abi: cp314
-            arch: i386
     steps:
-      - *checkout
+      - name: Checkout the repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - &download-env-file
-        name: Download env_file
-        uses: &actions-download-artifact actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+      - name: Download env_file
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: env_file
 
-      - &download-build-constraints
-        name: Download build_constraints
-        uses: *actions-download-artifact
+      - name: Download build_constraints
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: build_constraints
 
-      - &download-requirements-diff
-        name: Download requirements_diff
-        uses: *actions-download-artifact
+      - name: Download requirements_diff
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: requirements_diff
 
@@ -174,7 +160,7 @@ jobs:
 
       # home-assistant/wheels doesn't support sha pinning
       - name: Build wheels
-        uses: &home-assistant-wheels home-assistant/wheels@2025.10.0
+        uses: home-assistant/wheels@2025.09.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -191,19 +177,33 @@ jobs:
     name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
     if: github.repository_owner == 'home-assistant'
     needs: init
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix: *matrix-build
+      matrix:
+        abi: ["cp313"]
+        arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
-      - *checkout
+      - name: Checkout the repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - *download-env-file
-      - *download-build-constraints
-      - *download-requirements-diff
+      - name: Download env_file
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        with:
+          name: env_file
+
+      - name: Download build_constraints
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        with:
+          name: build_constraints
+
+      - name: Download requirements_diff
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        with:
+          name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: *actions-download-artifact
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: requirements_all_wheels
 
@@ -221,7 +221,7 @@ jobs:
 
       # home-assistant/wheels doesn't support sha pinning
       - name: Build wheels
-        uses: *home-assistant-wheels
+        uses: home-assistant/wheels@2025.09.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2

.gitignore

@@ -111,7 +111,6 @@ virtualization/vagrant/config
 !.vscode/cSpell.json
 !.vscode/extensions.json
 !.vscode/tasks.json
-!.vscode/settings.default.jsonc
 .env
 
 # Windows Explorer
@@ -141,5 +140,4 @@ pytest_buckets.txt
 
 # AI tooling
 .claude/settings.local.json
-.serena/
 

.pre-commit-config.yaml

@@ -33,13 +33,10 @@ repos:
     rev: v1.37.1
     hooks:
       - id: yamllint
-  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.6.2
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.0.3
     hooks:
       - id: prettier
-        additional_dependencies:
-          - prettier@3.6.2
-          - prettier-plugin-sort-json@4.1.1
   - repo: https://github.com/cdce8p/python-typing-update
     rev: v0.6.0
     hooks:

.prettierrc.js

@@ -1,24 +0,0 @@
-/** @type {import("prettier").Config} */
-module.exports = {
-  overrides: [
-    {
-      files: "./homeassistant/**/*.json",
-      options: {
-        plugins: [require.resolve("prettier-plugin-sort-json")],
-        jsonRecursiveSort: true,
-        jsonSortOrder: JSON.stringify({ [/.*/]: "numeric" }),
-      },
-    },
-    {
-      files: ["manifest.json", "./**/brands/*.json"],
-      options: {
-        // domain and name should stay at the top
-        jsonSortOrder: JSON.stringify({
-          domain: null,
-          name: null,
-          [/.*/]: "numeric",
-        }),
-      },
-    },
-  ],
-};

.strict-typing

@@ -182,6 +182,7 @@ homeassistant.components.efergy.*
 homeassistant.components.eheimdigital.*
 homeassistant.components.electrasmart.*
 homeassistant.components.electric_kiwi.*
+homeassistant.components.elevenlabs.*
 homeassistant.components.elgato.*
 homeassistant.components.elkm1.*
 homeassistant.components.emulated_hue.*
@@ -278,7 +279,6 @@ homeassistant.components.imap.*
 homeassistant.components.imgw_pib.*
 homeassistant.components.immich.*
 homeassistant.components.incomfort.*
-homeassistant.components.inels.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.input_text.*
@@ -361,6 +361,7 @@ homeassistant.components.myuplink.*
 homeassistant.components.nam.*
 homeassistant.components.nanoleaf.*
 homeassistant.components.nasweb.*
+homeassistant.components.neato.*
 homeassistant.components.nest.*
 homeassistant.components.netatmo.*
 homeassistant.components.network.*
@@ -477,7 +478,6 @@ homeassistant.components.skybell.*
 homeassistant.components.slack.*
 homeassistant.components.sleep_as_android.*
 homeassistant.components.sleepiq.*
-homeassistant.components.sma.*
 homeassistant.components.smhi.*
 homeassistant.components.smlight.*
 homeassistant.components.smtp.*

.vscode/settings.default.json

@@ -7,19 +7,13 @@
   "python.testing.pytestEnabled": false,
   // https://code.visualstudio.com/docs/python/linting#_general-settings
   "pylint.importStrategy": "fromEnvironment",
-  // Pyright is too pedantic for Home Assistant
-  "python.analysis.typeCheckingMode": "basic",
-  "[python]": {
-    "editor.defaultFormatter": "charliermarsh.ruff",
-  },
-  "[json][jsonc][yaml]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-  },
   "json.schemas": [
-    {
-      "fileMatch": ["homeassistant/components/*/manifest.json"],
-      // This value differs between working with devcontainer and locally, therefore this value should NOT be in sync!
-      "url": "./script/json_schemas/manifest_schema.json",
-    },
-  ],
+        {
+            "fileMatch": [
+                "homeassistant/components/*/manifest.json"
+            ],
+            // This value differs between working with devcontainer and locally, therefor this value should NOT be in sync!
+            "url": "./script/json_schemas/manifest_schema.json"
+        }
+    ]
 }

CODEOWNERS

@@ -494,8 +494,6 @@ build.json @home-assistant/supervisor
 /tests/components/filesize/ @gjohansson-ST
 /homeassistant/components/filter/ @dgomes
 /tests/components/filter/ @dgomes
-/homeassistant/components/fing/ @Lorenzo-Gasparini
-/tests/components/fing/ @Lorenzo-Gasparini
 /homeassistant/components/firefly_iii/ @erwindouna
 /tests/components/firefly_iii/ @erwindouna
 /homeassistant/components/fireservicerota/ @cyberjunky
@@ -621,8 +619,6 @@ build.json @home-assistant/supervisor
 /tests/components/greeneye_monitor/ @jkeljo
 /homeassistant/components/group/ @home-assistant/core
 /tests/components/group/ @home-assistant/core
-/homeassistant/components/growatt_server/ @johanzander
-/tests/components/growatt_server/ @johanzander
 /homeassistant/components/guardian/ @bachya
 /tests/components/guardian/ @bachya
 /homeassistant/components/habitica/ @tr4nt0r
@@ -743,8 +739,6 @@ build.json @home-assistant/supervisor
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
 /tests/components/incomfort/ @jbouwh
-/homeassistant/components/inels/ @epdevlab
-/tests/components/inels/ @epdevlab
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
 /homeassistant/components/inkbird/ @bdraco
@@ -1143,8 +1137,6 @@ build.json @home-assistant/supervisor
 /tests/components/opengarage/ @danielhiversen
 /homeassistant/components/openhome/ @bazwilliams
 /tests/components/openhome/ @bazwilliams
-/homeassistant/components/openrgb/ @felipecrs
-/tests/components/openrgb/ @felipecrs
 /homeassistant/components/opensky/ @joostlek
 /tests/components/opensky/ @joostlek
 /homeassistant/components/opentherm_gw/ @mvn23
@@ -1543,8 +1535,6 @@ build.json @home-assistant/supervisor
 /tests/components/suez_water/ @ooii @jb101010-2
 /homeassistant/components/sun/ @home-assistant/core
 /tests/components/sun/ @home-assistant/core
-/homeassistant/components/sunricher_dali_center/ @niracler
-/tests/components/sunricher_dali_center/ @niracler
 /homeassistant/components/supla/ @mwegrzynek
 /homeassistant/components/surepetcare/ @benleb @danielhiversen
 /tests/components/surepetcare/ @benleb @danielhiversen

Dockerfile

@@ -25,13 +25,13 @@ RUN \
         "armv7") go2rtc_suffix='arm' ;; \
         *) go2rtc_suffix=${BUILD_ARCH} ;; \
     esac \
-    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.11/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
+    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.9/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
     && chmod +x /bin/go2rtc \
     # Verify go2rtc can be executed
     && go2rtc --version
 
 # Install uv
-RUN pip3 install uv==0.9.5
+RUN pip3 install uv==0.8.9
 
 WORKDIR /usr/src
 

build.yaml

@@ -1,10 +1,13 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.10.1
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.10.1
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.10.1
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.10.1
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.10.1
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.10.0
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.10.0
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.10.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.10.0
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.10.0
+codenotary:
+  signer: notary@home-assistant.io
+  base_image: notary@home-assistant.io
 cosign:
   base_identity: https://github.com/home-assistant/docker/.*
   identity: https://github.com/home-assistant/core/.*

homeassistant/auth/mfa_modules/totp.py

@@ -34,9 +34,6 @@ INPUT_FIELD_CODE = "code"
 
 DUMMY_SECRET = "FPPTH34D4E3MI2HG"
 
-GOOGLE_AUTHENTICATOR_URL = "https://support.google.com/accounts/answer/1066447"
-AUTHY_URL = "https://authy.com/"
-
 
 def _generate_qr_code(data: str) -> str:
     """Generate a base64 PNG string represent QR Code image of data."""
@@ -232,8 +229,6 @@ class TotpSetupFlow(SetupFlow[TotpAuthModule]):
                 "code": self._ota_secret,
                 "url": self._url,
                 "qr_code": self._image,
-                "google_authenticator_url": GOOGLE_AUTHENTICATOR_URL,
-                "authy_url": AUTHY_URL,
             },
             errors=errors,
         )

homeassistant/components/abode/strings.json

@@ -1,70 +1,70 @@
 {
   "config": {
-    "abort": {
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "invalid_mfa_code": "Invalid MFA code"
-    },
     "step": {
+      "user": {
+        "title": "Fill in your Abode login information",
+        "data": {
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
       "mfa": {
+        "title": "Enter your MFA code for Abode",
         "data": {
           "mfa_code": "MFA code (6-digits)"
-        },
-        "title": "Enter your MFA code for Abode"
+        }
       },
       "reauth_confirm": {
+        "title": "[%key:component::abode::config::step::user::title%]",
         "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::email%]"
-        },
-        "title": "[%key:component::abode::config::step::user::title%]"
-      },
-      "user": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::email%]"
-        },
-        "title": "Fill in your Abode login information"
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
       }
+    },
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_mfa_code": "Invalid MFA code"
+    },
+    "abort": {
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "services": {
     "capture_image": {
+      "name": "Capture image",
       "description": "Requests a new image capture from a camera device.",
       "fields": {
         "entity_id": {
-          "description": "Entity ID of the camera to request an image from.",
-          "name": "Entity"
+          "name": "Entity",
+          "description": "Entity ID of the camera to request an image from."
         }
-      },
-      "name": "Capture image"
+      }
     },
     "change_setting": {
+      "name": "Change setting",
       "description": "Changes an Abode system setting.",
       "fields": {
         "setting": {
-          "description": "Setting to change.",
-          "name": "Setting"
+          "name": "Setting",
+          "description": "Setting to change."
         },
         "value": {
-          "description": "Value of the setting.",
-          "name": "Value"
+          "name": "Value",
+          "description": "Value of the setting."
         }
-      },
-      "name": "Change setting"
+      }
     },
     "trigger_automation": {
+      "name": "Trigger automation",
       "description": "Triggers an Abode automation.",
       "fields": {
         "entity_id": {
-          "description": "Entity ID of the automation to trigger.",
-          "name": "Entity"
+          "name": "Entity",
+          "description": "Entity ID of the automation to trigger."
         }
-      },
-      "name": "Trigger automation"
+      }
     }
   }
 }

homeassistant/components/acaia/icons.json

@@ -4,20 +4,20 @@
       "timer_running": {
         "default": "mdi:timer",
         "state": {
-          "off": "mdi:timer-off",
-          "on": "mdi:timer-play"
+          "on": "mdi:timer-play",
+          "off": "mdi:timer-off"
         }
       }
     },
     "button": {
+      "tare": {
+        "default": "mdi:scale-balance"
+      },
       "reset_timer": {
         "default": "mdi:timer-refresh"
       },
       "start_stop": {
         "default": "mdi:timer-play"
-      },
-      "tare": {
-        "default": "mdi:scale-balance"
       }
     }
   }

homeassistant/components/acaia/strings.json

@@ -1,5 +1,6 @@
 {
   "config": {
+    "flow_title": "{name}",
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
@@ -9,19 +10,18 @@
       "device_not_found": "Device could not be found.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
-    "flow_title": "{name}",
     "step": {
       "bluetooth_confirm": {
         "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
       },
       "user": {
+        "description": "[%key:component::bluetooth::config::step::user::description%]",
         "data": {
           "address": "[%key:common::config_flow::data::device%]"
         },
         "data_description": {
           "address": "Select Acaia scale you want to set up"
-        },
-        "description": "[%key:component::bluetooth::config::step::user::description%]"
+        }
       }
     }
   },
@@ -32,14 +32,14 @@
       }
     },
     "button": {
+      "tare": {
+        "name": "Tare"
+      },
       "reset_timer": {
         "name": "Reset timer"
       },
       "start_stop": {
         "name": "Start/stop timer"
-      },
-      "tare": {
-        "name": "Tare"
       }
     }
   }

homeassistant/components/accuweather/strings.json

@@ -1,8 +1,25 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    "step": {
+      "user": {
+        "data": {
+          "name": "[%key:common::config_flow::data::name%]",
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
+        },
+        "data_description": {
+          "api_key": "API key generated in the AccuWeather APIs portal."
+        }
+      },
+      "reauth_confirm": {
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        },
+        "data_description": {
+          "api_key": "[%key:component::accuweather::config::step::user::data_description::api_key%]"
+        }
+      }
     },
     "create_entry": {
       "default": "Some sensors are not enabled by default. You can enable them in the entity registry after the integration configuration."
@@ -12,26 +29,9 @@
       "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
       "requests_exceeded": "The allowed number of requests to the AccuWeather API has been exceeded. You have to wait or change the API key."
     },
-    "step": {
-      "reauth_confirm": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]"
-        },
-        "data_description": {
-          "api_key": "[%key:component::accuweather::config::step::user::data_description::api_key%]"
-        }
-      },
-      "user": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]",
-          "name": "[%key:common::config_flow::data::name%]"
-        },
-        "data_description": {
-          "api_key": "API key generated in the AccuWeather APIs portal."
-        }
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "entity": {
@@ -120,9 +120,9 @@
       "pressure_tendency": {
         "name": "Pressure tendency",
         "state": {
-          "falling": "Falling",
+          "steady": "Steady",
           "rising": "Rising",
-          "steady": "Steady"
+          "falling": "Falling"
         },
         "state_attributes": {
           "options": {
@@ -227,6 +227,9 @@
       "wet_bulb_temperature": {
         "name": "Wet bulb temperature"
       },
+      "wind_speed": {
+        "name": "[%key:component::weather::entity_component::_::state_attributes::wind_speed::name%]"
+      },
       "wind_chill_temperature": {
         "name": "Wind chill temperature"
       },
@@ -239,9 +242,6 @@
       "wind_gust_speed_night": {
         "name": "Wind gust speed night {forecast_day}"
       },
-      "wind_speed": {
-        "name": "[%key:component::weather::entity_component::_::state_attributes::wind_speed::name%]"
-      },
       "wind_speed_day": {
         "name": "Wind speed day {forecast_day}"
       },

homeassistant/components/acmeda/strings.json

@@ -1,15 +1,15 @@
 {
   "config": {
-    "abort": {
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
-    },
     "step": {
       "user": {
+        "title": "Pick a hub to add",
         "data": {
           "id": "Host ID"
-        },
-        "title": "Pick a hub to add"
+        }
       }
+    },
+    "abort": {
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }

homeassistant/components/actron_air/strings.json

@@ -1,29 +1,29 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "oauth2_error": "Failed to start OAuth2 flow"
-    },
-    "error": {
-      "oauth2_error": "Failed to start OAuth2 flow. Please try again later."
+    "step": {
+      "user": {
+        "title": "Actron Air OAuth2 Authorization"
+      },
+      "timeout": {
+        "title": "Authorization timeout",
+        "description": "The authorization process timed out. Please try again.",
+        "data": {}
+      },
+      "connection_error": {
+        "title": "Connection error",
+        "description": "Failed to connect to Actron Air. Please check your internet connection and try again.",
+        "data": {}
+      }
     },
     "progress": {
       "wait_for_authorization": "To authenticate, open the following URL and login at Actron Air:\n{verification_uri}\nIf the code is not automatically copied, paste the following code to authorize the integration:\n\n```{user_code}```\n\n\nThe login attempt will time out after {expires_minutes} minutes."
     },
-    "step": {
-      "connection_error": {
-        "data": {},
-        "description": "Failed to connect to Actron Air. Please check your internet connection and try again.",
-        "title": "Connection error"
-      },
-      "timeout": {
-        "data": {},
-        "description": "The authorization process timed out. Please try again.",
-        "title": "Authorization timeout"
-      },
-      "user": {
-        "title": "Actron Air OAuth2 Authorization"
-      }
+    "error": {
+      "oauth2_error": "Failed to start OAuth2 flow. Please try again later."
+    },
+    "abort": {
+      "oauth2_error": "Failed to start OAuth2 flow",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   }
 }

homeassistant/components/adax/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/adax",
   "iot_class": "local_polling",
   "loggers": ["adax", "adax_local"],
-  "requirements": ["adax==0.4.0", "Adax-local==0.2.0"]
+  "requirements": ["adax==0.4.0", "Adax-local==0.1.5"]
 }

homeassistant/components/adax/strings.json

@@ -1,34 +1,34 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "heater_not_available": "Heater not available. Try to reset the heater by pressing + and OK for some seconds.",
-      "heater_not_found": "Heater not found. Try to move the heater closer to Home Assistant computer.",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
     "step": {
-      "cloud": {
-        "data": {
-          "account_id": "Account ID",
-          "password": "[%key:common::config_flow::data::password%]"
-        }
-      },
-      "local": {
-        "data": {
-          "wifi_pswd": "Wi-Fi password",
-          "wifi_ssid": "Wi-Fi SSID"
-        },
-        "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring heater might take some minutes."
-      },
       "user": {
         "data": {
           "connection_type": "Select connection type"
         },
         "description": "Select connection type. Local requires heaters with Bluetooth"
+      },
+      "local": {
+        "data": {
+          "wifi_ssid": "Wi-Fi SSID",
+          "wifi_pswd": "Wi-Fi password"
+        },
+        "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring heater might take some minutes."
+      },
+      "cloud": {
+        "data": {
+          "account_id": "Account ID",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "heater_not_available": "Heater not available. Try to reset the heater by pressing + and OK for some seconds.",
+      "heater_not_found": "Heater not found. Try to move the heater closer to Home Assistant computer.",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     }
   }
 }

homeassistant/components/adguard/icons.json

@@ -1,9 +1,6 @@
 {
   "entity": {
     "sensor": {
-      "average_processing_speed": {
-        "default": "mdi:speedometer"
-      },
       "dns_queries": {
         "default": "mdi:magnify"
       },
@@ -16,18 +13,21 @@
       "parental_control_blocked": {
         "default": "mdi:human-male-girl"
       },
-      "rules_count": {
-        "default": "mdi:counter"
-      },
       "safe_browsing_blocked": {
         "default": "mdi:shield-half-full"
       },
       "safe_searches_enforced": {
         "default": "mdi:shield-search"
+      },
+      "average_processing_speed": {
+        "default": "mdi:speedometer"
+      },
+      "rules_count": {
+        "default": "mdi:counter"
       }
     },
     "switch": {
-      "filtering": {
+      "protection": {
         "default": "mdi:shield-check",
         "state": {
           "off": "mdi:shield-off"
@@ -39,13 +39,7 @@
           "off": "mdi:shield-off"
         }
       },
-      "protection": {
-        "default": "mdi:shield-check",
-        "state": {
-          "off": "mdi:shield-off"
-        }
-      },
-      "query_log": {
+      "safe_search": {
         "default": "mdi:shield-check",
         "state": {
           "off": "mdi:shield-off"
@@ -57,7 +51,13 @@
           "off": "mdi:shield-off"
         }
       },
-      "safe_search": {
+      "filtering": {
+        "default": "mdi:shield-check",
+        "state": {
+          "off": "mdi:shield-off"
+        }
+      },
+      "query_log": {
         "default": "mdi:shield-check",
         "state": {
           "off": "mdi:shield-off"
@@ -69,17 +69,17 @@
     "add_url": {
       "service": "mdi:link-plus"
     },
-    "disable_url": {
-      "service": "mdi:link-variant-off"
+    "remove_url": {
+      "service": "mdi:link-off"
     },
     "enable_url": {
       "service": "mdi:link-variant"
     },
+    "disable_url": {
+      "service": "mdi:link-variant-off"
+    },
     "refresh": {
       "service": "mdi:refresh"
-    },
-    "remove_url": {
-      "service": "mdi:link-off"
     }
   }
 }

homeassistant/components/adguard/strings.json

@@ -1,38 +1,35 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "existing_instance_updated": "Updated existing configuration."
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
     "step": {
-      "hassio_confirm": {
-        "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the add-on: {addon}?",
-        "title": "AdGuard Home via Home Assistant add-on"
-      },
       "user": {
+        "description": "Set up your AdGuard Home instance to allow monitoring and control.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]",
           "username": "[%key:common::config_flow::data::username%]",
+          "ssl": "[%key:common::config_flow::data::ssl%]",
           "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         },
         "data_description": {
           "host": "The hostname or IP address of the device running your AdGuard Home."
-        },
-        "description": "Set up your AdGuard Home instance to allow monitoring and control."
+        }
+      },
+      "hassio_confirm": {
+        "title": "AdGuard Home via Home Assistant add-on",
+        "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the add-on: {addon}?"
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "existing_instance_updated": "Updated existing configuration.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   },
   "entity": {
     "sensor": {
-      "average_processing_speed": {
-        "name": "Average processing speed"
-      },
       "dns_queries": {
         "name": "DNS queries"
       },
@@ -45,91 +42,94 @@
       "parental_control_blocked": {
         "name": "Parental control blocked"
       },
-      "rules_count": {
-        "name": "Rules count"
-      },
       "safe_browsing_blocked": {
         "name": "Safe browsing blocked"
       },
       "safe_searches_enforced": {
         "name": "Safe searches enforced"
+      },
+      "average_processing_speed": {
+        "name": "Average processing speed"
+      },
+      "rules_count": {
+        "name": "Rules count"
       }
     },
     "switch": {
-      "filtering": {
-        "name": "Filtering"
+      "protection": {
+        "name": "Protection"
       },
       "parental": {
         "name": "Parental control"
       },
-      "protection": {
-        "name": "Protection"
-      },
-      "query_log": {
-        "name": "Query log"
+      "safe_search": {
+        "name": "Safe search"
       },
       "safe_browsing": {
         "name": "Safe browsing"
       },
-      "safe_search": {
-        "name": "Safe search"
+      "filtering": {
+        "name": "Filtering"
+      },
+      "query_log": {
+        "name": "Query log"
       }
     }
   },
   "services": {
     "add_url": {
+      "name": "Add URL",
       "description": "Adds a new filter subscription to AdGuard Home.",
       "fields": {
         "name": {
-          "description": "The name of the filter subscription.",
-          "name": "[%key:common::config_flow::data::name%]"
+          "name": "[%key:common::config_flow::data::name%]",
+          "description": "The name of the filter subscription."
         },
         "url": {
-          "description": "The filter URL to subscribe to, containing the filter rules.",
-          "name": "[%key:common::config_flow::data::url%]"
+          "name": "[%key:common::config_flow::data::url%]",
+          "description": "The filter URL to subscribe to, containing the filter rules."
         }
-      },
-      "name": "Add URL"
-    },
-    "disable_url": {
-      "description": "Disables a filter subscription in AdGuard Home.",
-      "fields": {
-        "url": {
-          "description": "The filter subscription URL to disable.",
-          "name": "[%key:common::config_flow::data::url%]"
-        }
-      },
-      "name": "Disable URL"
-    },
-    "enable_url": {
-      "description": "Enables a filter subscription in AdGuard Home.",
-      "fields": {
-        "url": {
-          "description": "The filter subscription URL to enable.",
-          "name": "[%key:common::config_flow::data::url%]"
-        }
-      },
-      "name": "Enable URL"
-    },
-    "refresh": {
-      "description": "Refreshes all filter subscriptions in AdGuard Home.",
-      "fields": {
-        "force": {
-          "description": "Force update (bypasses AdGuard Home throttling), omit for a regular refresh.",
-          "name": "Force"
-        }
-      },
-      "name": "Refresh"
+      }
     },
     "remove_url": {
+      "name": "Remove URL",
       "description": "Removes a filter subscription from AdGuard Home.",
       "fields": {
         "url": {
-          "description": "The filter subscription URL to remove.",
-          "name": "[%key:common::config_flow::data::url%]"
+          "name": "[%key:common::config_flow::data::url%]",
+          "description": "The filter subscription URL to remove."
         }
-      },
-      "name": "Remove URL"
+      }
+    },
+    "enable_url": {
+      "name": "Enable URL",
+      "description": "Enables a filter subscription in AdGuard Home.",
+      "fields": {
+        "url": {
+          "name": "[%key:common::config_flow::data::url%]",
+          "description": "The filter subscription URL to enable."
+        }
+      }
+    },
+    "disable_url": {
+      "name": "Disable URL",
+      "description": "Disables a filter subscription in AdGuard Home.",
+      "fields": {
+        "url": {
+          "name": "[%key:common::config_flow::data::url%]",
+          "description": "The filter subscription URL to disable."
+        }
+      }
+    },
+    "refresh": {
+      "name": "Refresh",
+      "description": "Refreshes all filter subscriptions in AdGuard Home.",
+      "fields": {
+        "force": {
+          "name": "Force",
+          "description": "Force update (bypasses AdGuard Home throttling), omit for a regular refresh."
+        }
+      }
     }
   }
 }

homeassistant/components/ads/strings.json

@@ -1,22 +1,22 @@
 {
   "services": {
     "write_data_by_name": {
+      "name": "Write data by name",
       "description": "Write a value to the connected ADS device.",
       "fields": {
-        "adstype": {
-          "description": "The data type of the variable to write to.",
-          "name": "ADS type"
-        },
         "adsvar": {
-          "description": "The name of the variable to write to.",
-          "name": "ADS variable"
+          "name": "ADS variable",
+          "description": "The name of the variable to write to."
+        },
+        "adstype": {
+          "name": "ADS type",
+          "description": "The data type of the variable to write to."
         },
         "value": {
-          "description": "The value to write to the variable.",
-          "name": "Value"
+          "name": "Value",
+          "description": "The value to write to the variable."
         }
-      },
-      "name": "Write data by name"
+      }
     }
   }
 }

homeassistant/components/advantage_air/strings.json

@@ -1,11 +1,11 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
     "step": {
       "user": {
         "data": {
@@ -19,14 +19,14 @@
   },
   "services": {
     "set_time_to": {
+      "name": "Set time to",
       "description": "Controls timers to turn the system on or off after a set number of minutes.",
       "fields": {
         "minutes": {
-          "description": "Minutes until action.",
-          "name": "Minutes"
+          "name": "Minutes",
+          "description": "Minutes until action."
         }
-      },
-      "name": "Set time to"
+      }
     }
   }
 }

homeassistant/components/aftership/strings.json

@@ -1,57 +1,57 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
     "step": {
       "user": {
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
       }
-    }
-  },
-  "issues": {
-    "deprecated_yaml_import_issue_cannot_connect": {
-      "description": "Configuring {integration_title} using YAML is being removed but there was a connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually.",
-      "title": "The {integration_title} YAML configuration import failed"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "services": {
     "add_tracking": {
+      "name": "Add tracking",
       "description": "Adds a new tracking number to Aftership.",
       "fields": {
-        "slug": {
-          "description": "Slug (carrier) of the new tracking.",
-          "name": "Slug"
+        "tracking_number": {
+          "name": "Tracking number",
+          "description": "Tracking number for the new tracking."
         },
         "title": {
-          "description": "A custom title for the new tracking.",
-          "name": "Title"
+          "name": "Title",
+          "description": "A custom title for the new tracking."
         },
-        "tracking_number": {
-          "description": "Tracking number for the new tracking.",
-          "name": "Tracking number"
+        "slug": {
+          "name": "Slug",
+          "description": "Slug (carrier) of the new tracking."
         }
-      },
-      "name": "Add tracking"
+      }
     },
     "remove_tracking": {
+      "name": "Remove tracking",
       "description": "Removes a tracking number from Aftership.",
       "fields": {
-        "slug": {
-          "description": "Slug (carrier) of the tracking to remove.",
-          "name": "[%key:component::aftership::services::add_tracking::fields::slug::name%]"
-        },
         "tracking_number": {
-          "description": "Tracking number of the tracking to remove.",
-          "name": "[%key:component::aftership::services::add_tracking::fields::tracking_number::name%]"
+          "name": "[%key:component::aftership::services::add_tracking::fields::tracking_number::name%]",
+          "description": "Tracking number of the tracking to remove."
+        },
+        "slug": {
+          "name": "[%key:component::aftership::services::add_tracking::fields::slug::name%]",
+          "description": "Slug (carrier) of the tracking to remove."
         }
-      },
-      "name": "Remove tracking"
+      }
+    }
+  },
+  "issues": {
+    "deprecated_yaml_import_issue_cannot_connect": {
+      "title": "The {integration_title} YAML configuration import failed",
+      "description": "Configuring {integration_title} using YAML is being removed but there was a connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
     }
   }
 }

homeassistant/components/agent_dvr/icons.json

@@ -1,19 +1,19 @@
 {
   "services": {
-    "disable_alerts": {
-      "service": "mdi:bell-off"
-    },
-    "enable_alerts": {
-      "service": "mdi:bell-alert"
-    },
-    "snapshot": {
-      "service": "mdi:camera"
-    },
     "start_recording": {
       "service": "mdi:record-rec"
     },
     "stop_recording": {
       "service": "mdi:stop"
+    },
+    "enable_alerts": {
+      "service": "mdi:bell-alert"
+    },
+    "disable_alerts": {
+      "service": "mdi:bell-off"
+    },
+    "snapshot": {
+      "service": "mdi:camera"
     }
   }
 }

homeassistant/components/agent_dvr/strings.json

@@ -1,45 +1,45 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
     "step": {
       "user": {
+        "title": "Set up Agent DVR",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
         },
         "data_description": {
           "host": "The IP address of the Agent DVR server."
-        },
-        "title": "Set up Agent DVR"
+        }
       }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "services": {
-    "disable_alerts": {
-      "description": "Disables alerts.",
-      "name": "Disable alerts"
-    },
-    "enable_alerts": {
-      "description": "Enables alerts.",
-      "name": "Enable alerts"
-    },
-    "snapshot": {
-      "description": "Takes a photo.",
-      "name": "Snapshot"
-    },
     "start_recording": {
-      "description": "Enables continuous recording.",
-      "name": "Start recording"
+      "name": "Start recording",
+      "description": "Enables continuous recording."
     },
     "stop_recording": {
-      "description": "Disables continuous recording.",
-      "name": "Stop recording"
+      "name": "Stop recording",
+      "description": "Disables continuous recording."
+    },
+    "enable_alerts": {
+      "name": "Enable alerts",
+      "description": "Enables alerts."
+    },
+    "disable_alerts": {
+      "name": "Disable alerts",
+      "description": "Disables alerts."
+    },
+    "snapshot": {
+      "name": "Snapshot",
+      "description": "Takes a photo."
     }
   }
 }

homeassistant/components/ai_task/__init__.py

@@ -53,6 +53,9 @@ __all__ = [
     "GenImageTaskResult",
     "async_generate_data",
     "async_generate_image",
+    "async_setup",
+    "async_setup_entry",
+    "async_unload_entry",
 ]
 
 _LOGGER = logging.getLogger(__name__)

homeassistant/components/ai_task/strings.json

@@ -1,52 +1,52 @@
 {
   "services": {
     "generate_data": {
+      "name": "Generate data",
       "description": "Uses AI to run a task that generates data.",
       "fields": {
-        "attachments": {
-          "description": "List of files to attach for multi-modal AI analysis.",
-          "name": "Attachments"
-        },
-        "entity_id": {
-          "description": "Entity ID to run the task on. If not provided, the preferred entity will be used.",
-          "name": "Entity ID"
+        "task_name": {
+          "name": "Task name",
+          "description": "Name of the task."
         },
         "instructions": {
-          "description": "Instructions on what needs to be done.",
-          "name": "Instructions"
+          "name": "Instructions",
+          "description": "Instructions on what needs to be done."
+        },
+        "entity_id": {
+          "name": "Entity ID",
+          "description": "Entity ID to run the task on. If not provided, the preferred entity will be used."
         },
         "structure": {
-          "description": "When set, the AI Task will output fields with this in structure. The structure is a dictionary where the keys are the field names and the values contain a 'description', a 'selector', and an optional 'required' field.",
-          "name": "Structured output"
+          "name": "Structured output",
+          "description": "When set, the AI Task will output fields with this in structure. The structure is a dictionary where the keys are the field names and the values contain a 'description', a 'selector', and an optional 'required' field."
         },
-        "task_name": {
-          "description": "Name of the task.",
-          "name": "Task name"
+        "attachments": {
+          "name": "Attachments",
+          "description": "List of files to attach for multi-modal AI analysis."
         }
-      },
-      "name": "Generate data"
+      }
     },
     "generate_image": {
+      "name": "Generate image",
       "description": "Uses AI to generate image.",
       "fields": {
-        "attachments": {
-          "description": "List of files to attach for using as references.",
-          "name": "Attachments"
-        },
-        "entity_id": {
-          "description": "Entity ID to run the task on.",
-          "name": "Entity ID"
+        "task_name": {
+          "name": "Task name",
+          "description": "Name of the task."
         },
         "instructions": {
-          "description": "Instructions that explains the image to be generated.",
-          "name": "Instructions"
+          "name": "Instructions",
+          "description": "Instructions that explains the image to be generated."
         },
-        "task_name": {
-          "description": "Name of the task.",
-          "name": "Task name"
+        "entity_id": {
+          "name": "Entity ID",
+          "description": "Entity ID to run the task on."
+        },
+        "attachments": {
+          "name": "Attachments",
+          "description": "List of files to attach for using as references."
         }
-      },
-      "name": "Generate image"
+      }
     }
   }
 }

homeassistant/components/airgradient/icons.json

@@ -9,17 +9,14 @@
       }
     },
     "number": {
-      "display_brightness": {
+      "led_bar_brightness": {
         "default": "mdi:brightness-percent"
       },
-      "led_bar_brightness": {
+      "display_brightness": {
         "default": "mdi:brightness-percent"
       }
     },
     "select": {
-      "co2_automatic_baseline_calibration": {
-        "default": "mdi:molecule-co2"
-      },
       "configuration_control": {
         "default": "mdi:cloud-cog"
       },
@@ -34,11 +31,23 @@
       },
       "voc_index_learning_time_offset": {
         "default": "mdi:clock-outline"
+      },
+      "co2_automatic_baseline_calibration": {
+        "default": "mdi:molecule-co2"
       }
     },
     "sensor": {
-      "co2_automatic_baseline_calibration": {
-        "default": "mdi:molecule-co2"
+      "total_volatile_organic_component_index": {
+        "default": "mdi:molecule"
+      },
+      "nitrogen_index": {
+        "default": "mdi:molecule"
+      },
+      "pm003_count": {
+        "default": "mdi:blur"
+      },
+      "led_bar_brightness": {
+        "default": "mdi:brightness-percent"
       },
       "display_brightness": {
         "default": "mdi:brightness-percent"
@@ -46,26 +55,17 @@
       "display_temperature_unit": {
         "default": "mdi:thermometer-lines"
       },
-      "led_bar_brightness": {
-        "default": "mdi:brightness-percent"
-      },
       "led_bar_mode": {
         "default": "mdi:led-strip"
       },
-      "nitrogen_index": {
-        "default": "mdi:molecule"
-      },
       "nox_index_learning_time_offset": {
         "default": "mdi:clock-outline"
       },
-      "pm003_count": {
-        "default": "mdi:blur"
-      },
-      "total_volatile_organic_component_index": {
-        "default": "mdi:molecule"
-      },
       "voc_index_learning_time_offset": {
         "default": "mdi:clock-outline"
+      },
+      "co2_automatic_baseline_calibration": {
+        "default": "mdi:molecule-co2"
       }
     },
     "switch": {

homeassistant/components/airgradient/strings.json

@@ -1,5 +1,19 @@
 {
   "config": {
+    "flow_title": "{model}",
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the Airgradient device."
+        }
+      },
+      "discovery_confirm": {
+        "description": "Do you want to set up {model}?"
+      }
+    },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
@@ -10,20 +24,6 @@
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "flow_title": "{model}",
-    "step": {
-      "discovery_confirm": {
-        "description": "Do you want to set up {model}?"
-      },
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the Airgradient device."
-        }
-      }
     }
   },
   "entity": {
@@ -36,25 +36,14 @@
       }
     },
     "number": {
-      "display_brightness": {
-        "name": "Display brightness"
-      },
       "led_bar_brightness": {
         "name": "LED bar brightness"
+      },
+      "display_brightness": {
+        "name": "Display brightness"
       }
     },
     "select": {
-      "co2_automatic_baseline_calibration": {
-        "name": "CO2 automatic baseline duration",
-        "state": {
-          "0": "[%key:common::state::off%]",
-          "1": "1 day",
-          "8": "8 days",
-          "30": "30 days",
-          "90": "90 days",
-          "180": "180 days"
-        }
-      },
       "configuration_control": {
         "name": "Configuration source",
         "state": {
@@ -62,13 +51,6 @@
           "local": "Local"
         }
       },
-      "display_pm_standard": {
-        "name": "Display PM standard",
-        "state": {
-          "ugm3": "μg/m³",
-          "us_aqi": "US AQI"
-        }
-      },
       "display_temperature_unit": {
         "name": "Display temperature unit",
         "state": {
@@ -76,11 +58,18 @@
           "f": "Fahrenheit"
         }
       },
+      "display_pm_standard": {
+        "name": "Display PM standard",
+        "state": {
+          "ugm3": "μg/m³",
+          "us_aqi": "US AQI"
+        }
+      },
       "led_bar_mode": {
         "name": "LED bar mode",
         "state": {
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
           "off": "[%key:common::state::off%]",
+          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
           "pm": "Particulate matter"
         }
       },
@@ -103,14 +92,37 @@
           "360": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::360%]",
           "720": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::720%]"
         }
+      },
+      "co2_automatic_baseline_calibration": {
+        "name": "CO2 automatic baseline duration",
+        "state": {
+          "1": "1 day",
+          "8": "8 days",
+          "30": "30 days",
+          "90": "90 days",
+          "180": "180 days",
+          "0": "[%key:common::state::off%]"
+        }
       }
     },
     "sensor": {
-      "co2_automatic_baseline_calibration_days": {
-        "name": "Carbon dioxide automatic baseline calibration"
+      "total_volatile_organic_component_index": {
+        "name": "VOC index"
       },
-      "display_brightness": {
-        "name": "[%key:component::airgradient::entity::number::display_brightness::name%]"
+      "nitrogen_index": {
+        "name": "NOx index"
+      },
+      "pm003_count": {
+        "name": "PM0.3"
+      },
+      "raw_total_volatile_organic_component": {
+        "name": "Raw VOC"
+      },
+      "raw_nitrogen": {
+        "name": "Raw NOx"
+      },
+      "raw_pm02": {
+        "name": "Raw PM2.5"
       },
       "display_pm_standard": {
         "name": "[%key:component::airgradient::entity::select::display_pm_standard::name%]",
@@ -119,6 +131,26 @@
           "us_aqi": "[%key:component::airgradient::entity::select::display_pm_standard::state::us_aqi%]"
         }
       },
+      "co2_automatic_baseline_calibration_days": {
+        "name": "Carbon dioxide automatic baseline calibration"
+      },
+      "nox_learning_offset": {
+        "name": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::name%]"
+      },
+      "tvoc_learning_offset": {
+        "name": "[%key:component::airgradient::entity::select::voc_index_learning_time_offset::name%]"
+      },
+      "led_bar_mode": {
+        "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
+        }
+      },
+      "led_bar_brightness": {
+        "name": "[%key:component::airgradient::entity::number::led_bar_brightness::name%]"
+      },
       "display_temperature_unit": {
         "name": "[%key:component::airgradient::entity::select::display_temperature_unit::name%]",
         "state": {
@@ -126,40 +158,8 @@
           "f": "[%key:component::airgradient::entity::select::display_temperature_unit::state::f%]"
         }
       },
-      "led_bar_brightness": {
-        "name": "[%key:component::airgradient::entity::number::led_bar_brightness::name%]"
-      },
-      "led_bar_mode": {
-        "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
-        "state": {
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
-          "off": "[%key:common::state::off%]",
-          "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
-        }
-      },
-      "nitrogen_index": {
-        "name": "NOx index"
-      },
-      "nox_learning_offset": {
-        "name": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::name%]"
-      },
-      "pm003_count": {
-        "name": "PM0.3"
-      },
-      "raw_nitrogen": {
-        "name": "Raw NOx"
-      },
-      "raw_pm02": {
-        "name": "Raw PM2.5"
-      },
-      "raw_total_volatile_organic_component": {
-        "name": "Raw VOC"
-      },
-      "total_volatile_organic_component_index": {
-        "name": "VOC index"
-      },
-      "tvoc_learning_offset": {
-        "name": "[%key:component::airgradient::entity::select::voc_index_learning_time_offset::name%]"
+      "display_brightness": {
+        "name": "[%key:component::airgradient::entity::number::display_brightness::name%]"
       }
     },
     "switch": {

homeassistant/components/airly/strings.json

@@ -1,23 +1,30 @@
 {
   "config": {
+    "step": {
+      "user": {
+        "description": "To generate API key go to {developer_registration_url}",
+        "data": {
+          "name": "[%key:common::config_flow::data::name%]",
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
+        }
+      }
+    },
+    "error": {
+      "wrong_location": "No Airly measuring stations in this area.",
+      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]"
+    },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
       "wrong_location": "[%key:component::airly::config::error::wrong_location%]"
-    },
-    "error": {
-      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
-      "wrong_location": "No Airly measuring stations in this area."
-    },
-    "step": {
-      "user": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]",
-          "name": "[%key:common::config_flow::data::name%]"
-        },
-        "description": "To generate API key go to {developer_registration_url}"
-      }
+    }
+  },
+  "system_health": {
+    "info": {
+      "can_reach_server": "Reach Airly server",
+      "requests_remaining": "Remaining allowed requests",
+      "requests_per_day": "Allowed requests per day"
     }
   },
   "entity": {
@@ -31,18 +38,11 @@
     }
   },
   "exceptions": {
-    "no_station": {
-      "message": "An error occurred while retrieving data from the Airly API for {entry}: no measuring stations in this area"
-    },
     "update_error": {
       "message": "An error occurred while retrieving data from the Airly API for {entry}: {error}"
-    }
-  },
-  "system_health": {
-    "info": {
-      "can_reach_server": "Reach Airly server",
-      "requests_per_day": "Allowed requests per day",
-      "requests_remaining": "Remaining allowed requests"
+    },
+    "no_station": {
+      "message": "An error occurred while retrieving data from the Airly API for {entry}: no measuring stations in this area"
     }
   }
 }

homeassistant/components/airnow/config_flow.py

@@ -26,10 +26,6 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 
-# Documentation URL for API key generation
-_API_KEY_URL = "https://docs.airnowapi.org/account/request/"
-
-
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> bool:
     """Validate the user input allows us to connect.
 
@@ -118,7 +114,6 @@ class AirNowConfigFlow(ConfigFlow, domain=DOMAIN):
                     ),
                 }
             ),
-            description_placeholders={"api_key_url": _API_KEY_URL},
             errors=errors,
         )
 

homeassistant/components/airnow/icons.json

@@ -4,15 +4,15 @@
       "aqi": {
         "default": "mdi:blur"
       },
-      "o3": {
-        "default": "mdi:blur"
-      },
       "pm10": {
         "default": "mdi:blur"
       },
       "pm25": {
         "default": "mdi:blur"
       },
+      "o3": {
+        "default": "mdi:blur"
+      },
       "station": {
         "default": "mdi:blur"
       }

homeassistant/components/airnow/strings.json

@@ -1,7 +1,15 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    "step": {
+      "user": {
+        "description": "To generate API key go to https://docs.airnowapi.org/account/request/",
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]",
+          "radius": "Station radius (miles; optional)"
+        }
+      }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -9,15 +17,16 @@
       "invalid_location": "No results found for that location, try changing the location or station radius.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  },
+  "options": {
     "step": {
-      "user": {
+      "init": {
         "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]",
-          "radius": "Station radius (miles; optional)"
-        },
-        "description": "To generate API key go to {api_key_url}"
+          "radius": "Station radius (miles)"
+        }
       }
     }
   },
@@ -34,14 +43,5 @@
         }
       }
     }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "data": {
-          "radius": "Station radius (miles)"
-        }
-      }
-    }
   }
 }

homeassistant/components/airos/__init__.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-import logging
-
 from airos.airos8 import AirOS8
 
 from homeassistant.const import (
@@ -14,11 +12,10 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
     Platform,
 )
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
+from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, SECTION_ADVANCED_SETTINGS
 from .coordinator import AirOSConfigEntry, AirOSDataUpdateCoordinator
 
 _PLATFORMS: list[Platform] = [
@@ -26,8 +23,6 @@ _PLATFORMS: list[Platform] = [
     Platform.SENSOR,
 ]
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
     """Set up Ubiquiti airOS from a config entry."""
@@ -59,13 +54,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
 async def async_migrate_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
     """Migrate old config entry."""
 
-    # This means the user has downgraded from a future version
-    if entry.version > 2:
+    if entry.version > 1:
+        # This means the user has downgraded from a future version
         return False
 
-    # 1.1 Migrate config_entry to add advanced ssl settings
     if entry.version == 1 and entry.minor_version == 1:
-        new_minor_version = 2
         new_data = {**entry.data}
         advanced_data = {
             CONF_SSL: DEFAULT_SSL,
@@ -76,52 +69,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> b
         hass.config_entries.async_update_entry(
             entry,
             data=new_data,
-            minor_version=new_minor_version,
-        )
-
-    # 2.1 Migrate binary_sensor entity unique_id from device_id to mac_address
-    #     Step 1 - migrate binary_sensor entity unique_id
-    #     Step 2 - migrate device entity identifier
-    if entry.version == 1:
-        new_version = 2
-        new_minor_version = 1
-
-        mac_adress = dr.format_mac(entry.unique_id)
-
-        device_registry = dr.async_get(hass)
-        if device_entry := device_registry.async_get_device(
-            connections={(dr.CONNECTION_NETWORK_MAC, mac_adress)}
-        ):
-            old_device_id = next(
-                (
-                    device_id
-                    for domain, device_id in device_entry.identifiers
-                    if domain == DOMAIN
-                ),
-            )
-
-            @callback
-            def update_unique_id(
-                entity_entry: er.RegistryEntry,
-            ) -> dict[str, str] | None:
-                """Update unique id from device_id to mac address."""
-                if old_device_id and entity_entry.unique_id.startswith(old_device_id):
-                    suffix = entity_entry.unique_id.removeprefix(old_device_id)
-                    new_unique_id = f"{mac_adress}{suffix}"
-                    return {"new_unique_id": new_unique_id}
-                return None
-
-            await er.async_migrate_entries(hass, entry.entry_id, update_unique_id)
-
-            new_identifiers = device_entry.identifiers.copy()
-            new_identifiers.discard((DOMAIN, old_device_id))
-            new_identifiers.add((DOMAIN, mac_adress))
-            device_registry.async_update_device(
-                device_entry.id, new_identifiers=new_identifiers
-            )
-
-        hass.config_entries.async_update_entry(
-            entry, version=new_version, minor_version=new_minor_version
+            minor_version=2,
         )
 
     return True

homeassistant/components/airos/binary_sensor.py

@@ -98,7 +98,7 @@ class AirOSBinarySensor(AirOSEntity, BinarySensorEntity):
         super().__init__(coordinator)
 
         self.entity_description = description
-        self._attr_unique_id = f"{coordinator.data.derived.mac}_{description.key}"
+        self._attr_unique_id = f"{coordinator.data.host.device_id}_{description.key}"
 
     @property
     def is_on(self) -> bool:

homeassistant/components/airos/config_flow.py

@@ -15,12 +15,7 @@ from airos.exceptions import (
 )
 import voluptuous as vol
 
-from homeassistant.config_entries import (
-    SOURCE_REAUTH,
-    SOURCE_RECONFIGURE,
-    ConfigFlow,
-    ConfigFlowResult,
-)
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -62,8 +57,8 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
 class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Ubiquiti airOS."""
 
-    VERSION = 2
-    MINOR_VERSION = 1
+    VERSION = 1
+    MINOR_VERSION = 2
 
     def __init__(self) -> None:
         """Initialize the config flow."""
@@ -124,7 +119,7 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
         else:
             await self.async_set_unique_id(airos_data.derived.mac)
 
-            if self.source in [SOURCE_REAUTH, SOURCE_RECONFIGURE]:
+            if self.source == SOURCE_REAUTH:
                 self._abort_if_unique_id_mismatch()
             else:
                 self._abort_if_unique_id_configured()
@@ -169,54 +164,3 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
             ),
             errors=self.errors,
         )
-
-    async def async_step_reconfigure(
-        self,
-        user_input: Mapping[str, Any] | None = None,
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of airOS."""
-        self.errors = {}
-        entry = self._get_reconfigure_entry()
-        current_data = entry.data
-
-        if user_input is not None:
-            validate_data = {**current_data, **user_input}
-            if await self._validate_and_get_device_info(config_data=validate_data):
-                return self.async_update_reload_and_abort(
-                    entry,
-                    data_updates=validate_data,
-                )
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_PASSWORD): TextSelector(
-                        TextSelectorConfig(
-                            type=TextSelectorType.PASSWORD,
-                            autocomplete="current-password",
-                        )
-                    ),
-                    vol.Required(SECTION_ADVANCED_SETTINGS): section(
-                        vol.Schema(
-                            {
-                                vol.Required(
-                                    CONF_SSL,
-                                    default=current_data[SECTION_ADVANCED_SETTINGS][
-                                        CONF_SSL
-                                    ],
-                                ): bool,
-                                vol.Required(
-                                    CONF_VERIFY_SSL,
-                                    default=current_data[SECTION_ADVANCED_SETTINGS][
-                                        CONF_VERIFY_SSL
-                                    ],
-                                ): bool,
-                            }
-                        ),
-                        {"collapsed": True},
-                    ),
-                }
-            ),
-            errors=self.errors,
-        )

homeassistant/components/airos/entity.py

@@ -33,7 +33,7 @@ class AirOSEntity(CoordinatorEntity[AirOSDataUpdateCoordinator]):
         self._attr_device_info = DeviceInfo(
             connections={(CONNECTION_NETWORK_MAC, airos_data.derived.mac)},
             configuration_url=configuration_url,
-            identifiers={(DOMAIN, airos_data.derived.mac)},
+            identifiers={(DOMAIN, str(airos_data.host.device_id))},
             manufacturer=MANUFACTURER,
             model=airos_data.host.devmodel,
             model_id=(

homeassistant/components/airos/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/airos",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "quality_scale": "silver",
-  "requirements": ["airos==0.6.0"]
+  "quality_scale": "bronze",
+  "requirements": ["airos==0.5.6"]
 }

homeassistant/components/airos/quality_scale.yaml

@@ -32,11 +32,11 @@ rules:
   config-entry-unloading: done
   docs-configuration-parameters: done
   docs-installation-parameters: done
-  entity-unavailable: done
+  entity-unavailable: todo
   integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: done
+  log-when-unavailable: todo
+  parallel-updates: todo
+  reauthentication-flow: todo
   test-coverage: done
 
   # Gold
@@ -48,9 +48,9 @@ rules:
   docs-examples: todo
   docs-known-limitations: done
   docs-supported-devices: done
-  docs-supported-functions: done
+  docs-supported-functions: todo
   docs-troubleshooting: done
-  docs-use-cases: done
+  docs-use-cases: todo
   dynamic-devices: todo
   entity-category: done
   entity-device-class: done
@@ -60,7 +60,7 @@ rules:
   icon-translations:
     status: exempt
     comment: no (custom) icons used or envisioned
-  reconfiguration-flow: done
+  reconfiguration-flow: todo
   repair-issues: todo
   stale-devices: todo
 

homeassistant/components/airos/strings.json

@@ -1,17 +1,5 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "key_data_missing": "Expected data not returned from the device, check the documentation for supported devices",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "flow_title": "Ubiquiti airOS device",
     "step": {
       "reauth_confirm": {
@@ -22,37 +10,16 @@
           "password": "[%key:component::airos::config::step::user::data_description::password%]"
         }
       },
-      "reconfigure": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "[%key:component::airos::config::step::user::data_description::password%]"
-        },
-        "sections": {
-          "advanced_settings": {
-            "data": {
-              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data::ssl%]",
-              "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
-            },
-            "data_description": {
-              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::ssl%]",
-              "verify_ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::verify_ssl%]"
-            },
-            "name": "[%key:component::airos::config::step::user::sections::advanced_settings::name%]"
-          }
-        }
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::username%]"
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
           "host": "IP address or hostname of the airOS device",
-          "password": "Password configured through the UISP app or web interface",
-          "username": "Administrator username for the airOS device, normally 'ubnt'"
+          "username": "Administrator username for the airOS device, normally 'ubnt'",
+          "password": "Password configured through the UISP app or web interface"
         },
         "sections": {
           "advanced_settings": {
@@ -63,17 +30,27 @@
             "data_description": {
               "ssl": "Whether the connection should be encrypted (required for most devices)",
               "verify_ssl": "Whether the certificate should be verified when using HTTPS. This should be off for self-signed certificates"
-            },
-            "name": "Advanced settings"
+            }
           }
         }
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "key_data_missing": "Expected data not returned from the device, check the documentation for supported devices",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
     }
   },
   "entity": {
     "binary_sensor": {
-      "dhcp6_server": {
-        "name": "DHCPv6 server"
+      "port_forwarding": {
+        "name": "Port forwarding"
       },
       "dhcp_client": {
         "name": "DHCP client"
@@ -81,8 +58,8 @@
       "dhcp_server": {
         "name": "DHCP server"
       },
-      "port_forwarding": {
-        "name": "Port forwarding"
+      "dhcp6_server": {
+        "name": "DHCPv6 server"
       },
       "pppoe": {
         "name": "PPPoE link"
@@ -99,27 +76,20 @@
           "router": "Router"
         }
       },
-      "host_uptime": {
-        "name": "Uptime"
-      },
-      "wireless_antenna_gain": {
-        "name": "Antenna gain"
-      },
-      "wireless_distance": {
-        "name": "Wireless distance"
+      "wireless_frequency": {
+        "name": "Wireless frequency"
       },
       "wireless_essid": {
         "name": "Wireless SSID"
       },
-      "wireless_frequency": {
-        "name": "Wireless frequency"
+      "wireless_antenna_gain": {
+        "name": "Antenna gain"
       },
-      "wireless_mode": {
-        "name": "Wireless mode",
-        "state": {
-          "point_to_multipoint": "Point-to-multipoint",
-          "point_to_point": "Point-to-point"
-        }
+      "wireless_throughput_tx": {
+        "name": "Throughput transmit (actual)"
+      },
+      "wireless_throughput_rx": {
+        "name": "Throughput receive (actual)"
       },
       "wireless_polling_dl_capacity": {
         "name": "Download capacity"
@@ -130,6 +100,12 @@
       "wireless_remote_hostname": {
         "name": "Remote hostname"
       },
+      "host_uptime": {
+        "name": "Uptime"
+      },
+      "wireless_distance": {
+        "name": "Wireless distance"
+      },
       "wireless_role": {
         "name": "Wireless role",
         "state": {
@@ -137,26 +113,27 @@
           "station": "Station"
         }
       },
-      "wireless_throughput_rx": {
-        "name": "Throughput receive (actual)"
-      },
-      "wireless_throughput_tx": {
-        "name": "Throughput transmit (actual)"
+      "wireless_mode": {
+        "name": "Wireless mode",
+        "state": {
+          "point_to_point": "Point-to-point",
+          "point_to_multipoint": "Point-to-multipoint"
+        }
       }
     }
   },
   "exceptions": {
-    "cannot_connect": {
-      "message": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "error_data_missing": {
-      "message": "Data incomplete or missing"
-    },
     "invalid_auth": {
       "message": "[%key:common::config_flow::error::invalid_auth%]"
     },
+    "cannot_connect": {
+      "message": "[%key:common::config_flow::error::cannot_connect%]"
+    },
     "key_data_missing": {
       "message": "Key data not returned from device"
+    },
+    "error_data_missing": {
+      "message": "Data incomplete or missing"
     }
   }
 }

homeassistant/components/airq/strings.json

@@ -1,21 +1,36 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    "step": {
+      "user": {
+        "title": "Identify the device",
+        "description": "Provide the IP address or mDNS of the device and its password",
+        "data": {
+          "ip_address": "[%key:common::config_flow::data::ip%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "invalid_input": "[%key:common::config_flow::error::invalid_host%]"
     },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  },
+  "options": {
     "step": {
-      "user": {
+      "init": {
+        "title": "Configure air-Q integration",
         "data": {
-          "ip_address": "[%key:common::config_flow::data::ip%]",
-          "password": "[%key:common::config_flow::data::password%]"
+          "return_average": "Show values averaged by the device",
+          "clip_negatives": "Clip negative values"
         },
-        "description": "Provide the IP address or mDNS of the device and its password",
-        "title": "Identify the device"
+        "data_description": {
+          "return_average": "air-Q allows to poll both the noisy sensor readings as well as the values averaged on the device (default)",
+          "clip_negatives": "For baseline calibration purposes, certain sensor values may briefly become negative. The default behaviour is to clip such values to 0"
+        }
       }
     }
   },
@@ -38,11 +53,8 @@
       "bromine": {
         "name": "Bromine"
       },
-      "carbon_disulfide": {
-        "name": "Carbon disulfide"
-      },
-      "carbon_monoxide": {
-        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
+      "methanethiol": {
+        "name": "Methanethiol"
       },
       "chlorine": {
         "name": "Chlorine"
@@ -50,6 +62,12 @@
       "chlorine_dioxide": {
         "name": "Chlorine dioxide"
       },
+      "carbon_disulfide": {
+        "name": "Carbon disulfide"
+      },
+      "carbon_monoxide": {
+        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
+      },
       "dew_point": {
         "name": "Dew point"
       },
@@ -59,51 +77,36 @@
       "ethylene": {
         "name": "Ethylene"
       },
-      "fluorine": {
-        "name": "Fluorine"
-      },
       "formaldehyde": {
         "name": "Formaldehyde"
       },
-      "health_index": {
-        "name": "Health index"
+      "fluorine": {
+        "name": "Fluorine"
+      },
+      "hydrogen_sulfide": {
+        "name": "Hydrogen sulfide"
       },
       "hydrochloric_acid": {
         "name": "Hydrochloric acid"
       },
-      "hydrogen": {
-        "name": "Hydrogen"
-      },
       "hydrogen_cyanide": {
         "name": "Hydrogen cyanide"
       },
       "hydrogen_fluoride": {
         "name": "Hydrogen fluoride"
       },
+      "health_index": {
+        "name": "Health index"
+      },
+      "hydrogen": {
+        "name": "Hydrogen"
+      },
       "hydrogen_peroxide": {
         "name": "Hydrogen peroxide"
       },
-      "hydrogen_phosphide": {
-        "name": "Hydrogen phosphide"
-      },
-      "hydrogen_sulfide": {
-        "name": "Hydrogen sulfide"
-      },
-      "industrial_volatile_organic_compounds": {
-        "name": "VOCs (industrial)"
-      },
-      "maximum_noise": {
-        "name": "Noise (maximum)"
-      },
       "methane": {
         "name": "Methane"
       },
-      "methanethiol": {
-        "name": "Methanethiol"
-      },
-      "noise": {
-        "name": "Noise"
-      },
       "organic_acid": {
         "name": "Organic acid"
       },
@@ -113,39 +116,36 @@
       "performance_index": {
         "name": "Performance index"
       },
-      "propane": {
-        "name": "Propane"
-      },
-      "radon": {
-        "name": "Radon"
-      },
-      "refigerant": {
-        "name": "Refrigerant"
+      "hydrogen_phosphide": {
+        "name": "Hydrogen phosphide"
       },
       "relative_pressure": {
         "name": "Relative pressure"
       },
+      "propane": {
+        "name": "Propane"
+      },
+      "refigerant": {
+        "name": "Refrigerant"
+      },
       "silicon_hydride": {
         "name": "Silicon hydride"
       },
+      "noise": {
+        "name": "Noise"
+      },
+      "maximum_noise": {
+        "name": "Noise (maximum)"
+      },
+      "radon": {
+        "name": "Radon"
+      },
+      "industrial_volatile_organic_compounds": {
+        "name": "VOCs (industrial)"
+      },
       "virus_index": {
         "name": "Virus index"
       }
     }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "data": {
-          "clip_negatives": "Clip negative values",
-          "return_average": "Show values averaged by the device"
-        },
-        "data_description": {
-          "clip_negatives": "For baseline calibration purposes, certain sensor values may briefly become negative. The default behavior is to clip such values to 0",
-          "return_average": "air-Q allows to poll both the noisy sensor readings as well as the values averaged on the device (default)"
-        },
-        "title": "Configure air-Q integration"
-      }
-    }
   }
 }

homeassistant/components/airthings/strings.json

@@ -1,13 +1,5 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
       "user": {
         "data": {
@@ -16,21 +8,29 @@
         },
         "description": "Log in at {url} to find your credentials"
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   },
   "entity": {
     "sensor": {
-      "light": {
-        "name": "Light"
-      },
-      "mold": {
-        "name": "Mold"
-      },
       "radon": {
         "name": "Radon"
       },
+      "light": {
+        "name": "Light"
+      },
       "virus_risk": {
         "name": "Virus Risk"
+      },
+      "mold": {
+        "name": "Mold"
       }
     }
   }

homeassistant/components/airthings_ble/icons.json

@@ -4,10 +4,10 @@
       "radon_1day_avg": {
         "default": "mdi:radioactive"
       },
-      "radon_1day_level": {
+      "radon_longterm_avg": {
         "default": "mdi:radioactive"
       },
-      "radon_longterm_avg": {
+      "radon_1day_level": {
         "default": "mdi:radioactive"
       },
       "radon_longterm_level": {

homeassistant/components/airthings_ble/manifest.json

@@ -28,5 +28,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/airthings_ble",
   "iot_class": "local_polling",
-  "requirements": ["airthings-ble==1.2.0"]
+  "requirements": ["airthings-ble==1.1.1"]
 }

homeassistant/components/airthings_ble/strings.json

@@ -1,49 +1,49 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "firmware_upgrade_required": "Your device requires a firmware upgrade. Please use the Airthings app (Android/iOS) to upgrade it.",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]",
-      "unsupported_device": "Unsupported device"
-    },
     "flow_title": "{name}",
     "step": {
-      "bluetooth_confirm": {
-        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
-      },
       "user": {
+        "description": "[%key:component::bluetooth::config::step::user::description%]",
         "data": {
           "address": "[%key:common::config_flow::data::device%]"
         },
         "data_description": {
           "address": "The Airthings devices discovered via Bluetooth."
-        },
-        "description": "[%key:component::bluetooth::config::step::user::description%]"
+        }
+      },
+      "bluetooth_confirm": {
+        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
       }
+    },
+    "abort": {
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "firmware_upgrade_required": "Your device requires a firmware upgrade. Please use the Airthings app (Android/iOS) to upgrade it.",
+      "unsupported_device": "Unsupported device",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   },
   "entity": {
     "sensor": {
-      "ambient_noise": {
-        "name": "Ambient noise"
-      },
-      "illuminance": {
-        "name": "[%key:component::sensor::entity_component::illuminance::name%]"
-      },
       "radon_1day_avg": {
         "name": "Radon 1-day average"
       },
-      "radon_1day_level": {
-        "name": "Radon 1-day level"
-      },
       "radon_longterm_avg": {
         "name": "Radon longterm average"
       },
+      "radon_1day_level": {
+        "name": "Radon 1-day level"
+      },
       "radon_longterm_level": {
         "name": "Radon longterm level"
+      },
+      "illuminance": {
+        "name": "[%key:component::sensor::entity_component::illuminance::name%]"
+      },
+      "ambient_noise": {
+        "name": "Ambient noise"
       }
     }
   }

homeassistant/components/airtouch4/strings.json

@@ -9,13 +9,13 @@
     },
     "step": {
       "user": {
+        "title": "Set up your AirTouch 4 connection details.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]"
         },
         "data_description": {
           "host": "The hostname or IP address of your AirTouch controller."
-        },
-        "title": "Set up your AirTouch 4 connection details."
+        }
       }
     }
   }

homeassistant/components/airtouch5/strings.json

@@ -1,18 +1,18 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]"
         }
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "entity": {
@@ -21,8 +21,8 @@
         "state_attributes": {
           "fan_mode": {
             "state": {
-              "intelligent_auto": "Intelligent Auto",
-              "turbo": "Turbo"
+              "turbo": "Turbo",
+              "intelligent_auto": "Intelligent Auto"
             }
           }
         }

homeassistant/components/airvisual/icons.json

@@ -1,11 +1,11 @@
 {
   "entity": {
     "sensor": {
-      "pollutant_label": {
-        "default": "mdi:chemical-weapon"
-      },
       "pollutant_level": {
         "default": "mdi:gauge"
+      },
+      "pollutant_label": {
+        "default": "mdi:chemical-weapon"
       }
     }
   }

homeassistant/components/airvisual/strings.json

@@ -1,44 +1,54 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
-      "location_not_found": "Location not found",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
       "geography_by_coords": {
+        "title": "Configure a geography",
+        "description": "Use the AirVisual cloud API to monitor a latitude/longitude.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "latitude": "[%key:common::config_flow::data::latitude%]",
           "longitude": "[%key:common::config_flow::data::longitude%]"
-        },
-        "description": "Use the AirVisual cloud API to monitor a latitude/longitude.",
-        "title": "Configure a geography"
+        }
       },
       "geography_by_name": {
+        "title": "[%key:component::airvisual::config::step::geography_by_coords::title%]",
+        "description": "Use the AirVisual cloud API to monitor a city/state/country.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "city": "City",
-          "country": "[%key:common::config_flow::data::country%]",
-          "state": "State"
-        },
-        "description": "Use the AirVisual cloud API to monitor a city/state/country.",
-        "title": "[%key:component::airvisual::config::step::geography_by_coords::title%]"
+          "state": "State",
+          "country": "[%key:common::config_flow::data::country%]"
+        }
       },
       "reauth_confirm": {
+        "title": "Re-authenticate AirVisual",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
-        },
-        "title": "Re-authenticate AirVisual"
+        }
       },
       "user": {
-        "description": "Pick what type of AirVisual data you want to monitor.",
-        "title": "Configure AirVisual"
+        "title": "Configure AirVisual",
+        "description": "Pick what type of AirVisual data you want to monitor."
+      }
+    },
+    "error": {
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
+      "location_not_found": "Location not found",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "title": "[%key:component::airvisual::config::step::user::title%]",
+        "data": {
+          "show_on_map": "Show monitored geography on the map"
+        }
       }
     }
   },
@@ -57,29 +67,19 @@
       "pollutant_level": {
         "state": {
           "good": "Good",
-          "hazardous": "Hazardous",
           "moderate": "Moderate",
           "unhealthy": "Unhealthy",
           "unhealthy_sensitive": "Unhealthy for sensitive groups",
-          "very_unhealthy": "Very unhealthy"
+          "very_unhealthy": "Very unhealthy",
+          "hazardous": "Hazardous"
         }
       }
     }
   },
   "issues": {
     "airvisual_pro_migration": {
-      "description": "AirVisual Pro units are now their own Home Assistant integration (as opposed to be included with the original AirVisual integration that uses the AirVisual cloud API). The Pro device located at `{ip_address}` has automatically been migrated.\n\nAs part of that migration, the Pro's device ID has changed from `{old_device_id}` to `{new_device_id}`. Please update these automations to use the new device ID: {device_automations_string}.",
-      "title": "{ip_address} is now part of the AirVisual Pro integration"
-    }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "data": {
-          "show_on_map": "Show monitored geography on the map"
-        },
-        "title": "[%key:component::airvisual::config::step::user::title%]"
-      }
+      "title": "{ip_address} is now part of the AirVisual Pro integration",
+      "description": "AirVisual Pro units are now their own Home Assistant integration (as opposed to be included with the original AirVisual integration that uses the AirVisual cloud API). The Pro device located at `{ip_address}` has automatically been migrated.\n\nAs part of that migration, the Pro's device ID has changed from `{old_device_id}` to `{new_device_id}`. Please update these automations to use the new device ID: {device_automations_string}."
     }
   }
 }

homeassistant/components/airvisual_pro/strings.json

@@ -1,40 +1,40 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
       "reauth_confirm": {
+        "description": "[%key:component::airvisual_pro::config::step::user::description%]",
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
-        },
-        "description": "[%key:component::airvisual_pro::config::step::user::description%]"
+        }
       },
       "user": {
+        "description": "The password can be retrieved from the AirVisual Pro's UI.",
         "data": {
           "ip_address": "[%key:common::config_flow::data::host%]",
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
           "ip_address": "The hostname or IP address of your AirVisual Pro device."
-        },
-        "description": "The password can be retrieved from the AirVisual Pro's UI."
+        }
       }
+    },
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "entity": {
     "sensor": {
-      "outdoor_air_quality_index": {
-        "name": "Outdoor air quality index"
-      },
       "pm01": {
         "name": "PM0.1"
+      },
+      "outdoor_air_quality_index": {
+        "name": "Outdoor air quality index"
       }
     }
   }

homeassistant/components/airzone/manifest.json

@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone",
   "iot_class": "local_polling",
   "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==1.0.2"]
+  "requirements": ["aioairzone==1.0.1"]
 }

homeassistant/components/airzone/strings.json

@@ -10,15 +10,15 @@
     "step": {
       "discovered_connection": {
         "data": {
-          "host": "[%key:common::config_flow::data::host%]",
           "id": "[%key:component::airzone::config::step::user::data::id%]",
+          "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
         }
       },
       "user": {
         "data": {
-          "host": "[%key:common::config_flow::data::host%]",
           "id": "System ID",
+          "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
         }
       }
@@ -37,19 +37,19 @@
       "grille_angles": {
         "name": "Cold angle",
         "state": {
-          "40deg": "40°",
-          "45deg": "45°",
+          "90deg": "90°",
           "50deg": "50°",
-          "90deg": "90°"
+          "45deg": "45°",
+          "40deg": "40°"
         }
       },
       "heat_angles": {
         "name": "Heat angle",
         "state": {
-          "40deg": "[%key:component::airzone::entity::select::grille_angles::state::40deg%]",
-          "45deg": "[%key:component::airzone::entity::select::grille_angles::state::45deg%]",
+          "90deg": "[%key:component::airzone::entity::select::grille_angles::state::90deg%]",
           "50deg": "[%key:component::airzone::entity::select::grille_angles::state::50deg%]",
-          "90deg": "[%key:component::airzone::entity::select::grille_angles::state::90deg%]"
+          "45deg": "[%key:component::airzone::entity::select::grille_angles::state::45deg%]",
+          "40deg": "[%key:component::airzone::entity::select::grille_angles::state::40deg%]"
         }
       },
       "modes": {
@@ -66,20 +66,20 @@
       "q_adapt": {
         "name": "Q-Adapt",
         "state": {
-          "maximum": "Maximum",
-          "minimum": "Minimum",
+          "standard": "Standard",
           "power": "Power",
           "silence": "Silence",
-          "standard": "Standard"
+          "minimum": "Minimum",
+          "maximum": "Maximum"
         }
       },
       "sleep_times": {
         "name": "Sleep",
         "state": {
+          "off": "[%key:common::state::off%]",
           "30m": "30 minutes",
           "60m": "60 minutes",
-          "90m": "90 minutes",
-          "off": "[%key:common::state::off%]"
+          "90m": "90 minutes"
         }
       }
     },

homeassistant/components/airzone_cloud/strings.json

@@ -10,8 +10,8 @@
       "user": {
         "data": {
           "id": "Installation",
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::username%]"
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
         }
       }
     }
@@ -32,9 +32,9 @@
       "air_quality": {
         "name": "Air Quality mode",
         "state": {
-          "auto": "[%key:common::state::auto%]",
           "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]"
+          "on": "[%key:common::state::on%]",
+          "auto": "[%key:common::state::auto%]"
         }
       },
       "modes": {

homeassistant/components/aladdin_connect/strings.json

@@ -1,34 +1,34 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
-      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml.",
-      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
-      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
-      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
-      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
-      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
-      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
-      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account."
-    },
-    "create_entry": {
-      "default": "[%key:common::config_flow::create_entry::authenticated%]"
-    },
     "step": {
-      "oauth_discovery": {
-        "description": "Home Assistant has found an Aladdin Connect device on your network. Press **Submit** to continue setting up Aladdin Connect."
-      },
       "pick_implementation": {
         "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
       },
       "reauth_confirm": {
-        "description": "Aladdin Connect needs to re-authenticate your account",
-        "title": "[%key:common::config_flow::title::reauth%]"
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "Aladdin Connect needs to re-authenticate your account"
+      },
+      "oauth_discovery": {
+        "description": "Home Assistant has found an Aladdin Connect device on your network. Press **Submit** to continue setting up Aladdin Connect."
       }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
+      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
+      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
+      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
+      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account.",
+      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml."
+    },
+    "create_entry": {
+      "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
   }
 }

homeassistant/components/alarm_control_panel/icons.json

@@ -18,23 +18,23 @@
     "alarm_arm_away": {
       "service": "mdi:shield-lock"
     },
-    "alarm_arm_custom_bypass": {
-      "service": "mdi:security"
-    },
     "alarm_arm_home": {
       "service": "mdi:shield-home"
     },
     "alarm_arm_night": {
       "service": "mdi:shield-moon"
     },
-    "alarm_arm_vacation": {
-      "service": "mdi:shield-airplane"
+    "alarm_arm_custom_bypass": {
+      "service": "mdi:security"
     },
     "alarm_disarm": {
       "service": "mdi:shield-off"
     },
     "alarm_trigger": {
       "service": "mdi:bell-ring"
+    },
+    "alarm_arm_vacation": {
+      "service": "mdi:shield-airplane"
     }
   }
 }

homeassistant/components/alarm_control_panel/strings.json

@@ -1,4 +1,5 @@
 {
+  "title": "Alarm control panel",
   "device_automation": {
     "action_type": {
       "arm_away": "Arm {entity_name} away",
@@ -9,24 +10,24 @@
       "trigger": "Trigger {entity_name}"
     },
     "condition_type": {
-      "is_armed_away": "{entity_name} is armed away",
-      "is_armed_home": "{entity_name} is armed home",
-      "is_armed_night": "{entity_name} is armed night",
-      "is_armed_vacation": "{entity_name} is armed vacation",
+      "is_triggered": "{entity_name} is triggered",
       "is_disarmed": "{entity_name} is disarmed",
-      "is_triggered": "{entity_name} is triggered"
+      "is_armed_home": "{entity_name} is armed home",
+      "is_armed_away": "{entity_name} is armed away",
+      "is_armed_night": "{entity_name} is armed night",
+      "is_armed_vacation": "{entity_name} is armed vacation"
     },
     "extra_fields": {
       "code": "Code",
       "for": "[%key:common::device_automation::extra_fields::for%]"
     },
     "trigger_type": {
-      "armed_away": "{entity_name} armed away",
-      "armed_home": "{entity_name} armed home",
-      "armed_night": "{entity_name} armed night",
-      "armed_vacation": "{entity_name} armed vacation",
+      "triggered": "{entity_name} triggered",
       "disarmed": "{entity_name} disarmed",
-      "triggered": "{entity_name} triggered"
+      "armed_home": "{entity_name} armed home",
+      "armed_away": "{entity_name} armed away",
+      "armed_night": "{entity_name} armed night",
+      "armed_vacation": "{entity_name} armed vacation"
     }
   },
   "entity_component": {
@@ -34,114 +35,113 @@
       "name": "[%key:component::alarm_control_panel::title%]",
       "state": {
         "armed": "Armed",
-        "armed_away": "Armed away",
-        "armed_custom_bypass": "Armed custom bypass",
+        "disarmed": "Disarmed",
         "armed_home": "Armed home",
+        "armed_away": "Armed away",
         "armed_night": "Armed night",
         "armed_vacation": "Armed vacation",
-        "arming": "Arming",
-        "disarmed": "Disarmed",
-        "disarming": "Disarming",
+        "armed_custom_bypass": "Armed custom bypass",
         "pending": "Pending",
+        "arming": "Arming",
+        "disarming": "Disarming",
         "triggered": "Triggered"
       },
       "state_attributes": {
+        "code_format": {
+          "name": "Code format",
+          "state": {
+            "text": "Text",
+            "number": "Number"
+          }
+        },
         "changed_by": {
           "name": "Changed by"
         },
         "code_arm_required": {
           "name": "Code for arming",
           "state": {
-            "false": "Not required",
-            "true": "Required"
-          }
-        },
-        "code_format": {
-          "name": "Code format",
-          "state": {
-            "number": "Number",
-            "text": "Text"
+            "true": "Required",
+            "false": "Not required"
           }
         }
       }
     }
   },
+  "services": {
+    "alarm_disarm": {
+      "name": "Disarm",
+      "description": "Disarms the alarm.",
+      "fields": {
+        "code": {
+          "name": "Code",
+          "description": "Code to disarm the alarm."
+        }
+      }
+    },
+    "alarm_arm_custom_bypass": {
+      "name": "Arm with custom bypass",
+      "description": "Arms the alarm while allowing to bypass a custom area.",
+      "fields": {
+        "code": {
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
+          "description": "Code to arm the alarm."
+        }
+      }
+    },
+    "alarm_arm_home": {
+      "name": "Arm home",
+      "description": "Arms the alarm in the home mode.",
+      "fields": {
+        "code": {
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
+        }
+      }
+    },
+    "alarm_arm_away": {
+      "name": "Arm away",
+      "description": "Arms the alarm in the away mode.",
+      "fields": {
+        "code": {
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
+        }
+      }
+    },
+    "alarm_arm_night": {
+      "name": "Arm night",
+      "description": "Arms the alarm in the night mode.",
+      "fields": {
+        "code": {
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
+        }
+      }
+    },
+    "alarm_arm_vacation": {
+      "name": "Arm vacation",
+      "description": "Arms the alarm in the vacation mode.",
+      "fields": {
+        "code": {
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
+        }
+      }
+    },
+    "alarm_trigger": {
+      "name": "Trigger",
+      "description": "Triggers the alarm manually.",
+      "fields": {
+        "code": {
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
+        }
+      }
+    }
+  },
   "exceptions": {
     "code_arm_required": {
       "message": "Arming requires a code but none was given for {entity_id}."
     }
-  },
-  "services": {
-    "alarm_arm_away": {
-      "description": "Arms the alarm in the away mode.",
-      "fields": {
-        "code": {
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
-        }
-      },
-      "name": "Arm away"
-    },
-    "alarm_arm_custom_bypass": {
-      "description": "Arms the alarm while allowing to bypass a custom area.",
-      "fields": {
-        "code": {
-          "description": "Code to arm the alarm.",
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
-        }
-      },
-      "name": "Arm with custom bypass"
-    },
-    "alarm_arm_home": {
-      "description": "Arms the alarm in the home mode.",
-      "fields": {
-        "code": {
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
-        }
-      },
-      "name": "Arm home"
-    },
-    "alarm_arm_night": {
-      "description": "Arms the alarm in the night mode.",
-      "fields": {
-        "code": {
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
-        }
-      },
-      "name": "Arm night"
-    },
-    "alarm_arm_vacation": {
-      "description": "Arms the alarm in the vacation mode.",
-      "fields": {
-        "code": {
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
-        }
-      },
-      "name": "Arm vacation"
-    },
-    "alarm_disarm": {
-      "description": "Disarms the alarm.",
-      "fields": {
-        "code": {
-          "description": "Code to disarm the alarm.",
-          "name": "Code"
-        }
-      },
-      "name": "Disarm"
-    },
-    "alarm_trigger": {
-      "description": "Triggers the alarm manually.",
-      "fields": {
-        "code": {
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
-        }
-      },
-      "name": "Trigger"
-    }
-  },
-  "title": "Alarm control panel"
+  }
 }

homeassistant/components/alarmdecoder/strings.json

@@ -1,101 +1,101 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "create_entry": {
-      "default": "Successfully connected to AlarmDecoder."
+    "step": {
+      "user": {
+        "title": "Choose AlarmDecoder protocol",
+        "data": {
+          "protocol": "Protocol"
+        }
+      },
+      "protocol": {
+        "title": "Configure connection settings",
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]",
+          "device_baudrate": "Device baud rate",
+          "device_path": "Device path"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the AlarmDecoder device that is connected to your alarm panel.",
+          "port": "The port on which AlarmDecoder is accessible (for example, 10000)"
+        }
+      }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
-    "step": {
-      "protocol": {
-        "data": {
-          "device_baudrate": "Device baud rate",
-          "device_path": "Device path",
-          "host": "[%key:common::config_flow::data::host%]",
-          "port": "[%key:common::config_flow::data::port%]"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the AlarmDecoder device that is connected to your alarm panel.",
-          "port": "The port on which AlarmDecoder is accessible (for example, 10000)"
-        },
-        "title": "Configure connection settings"
-      },
-      "user": {
-        "data": {
-          "protocol": "Protocol"
-        },
-        "title": "Choose AlarmDecoder protocol"
-      }
+    "create_entry": {
+      "default": "Successfully connected to AlarmDecoder."
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
-    "error": {
-      "int": "The field below must be an integer.",
-      "loop_range": "'RF loop' must be an integer between 1 and 4.",
-      "loop_rfid": "'RF loop' cannot be used without 'RF serial'.",
-      "relay_inclusive": "'Relay address' and 'Relay channel' are codependent and must be included together."
-    },
     "step": {
-      "arm_settings": {
-        "data": {
-          "alt_night_mode": "Alternative night mode",
-          "auto_bypass": "Auto-bypass on arm",
-          "code_arm_required": "Code required for arming"
-        },
-        "title": "[%key:component::alarmdecoder::options::step::init::title%]"
-      },
       "init": {
+        "title": "Configure AlarmDecoder",
+        "description": "What would you like to edit?",
         "data": {
           "edit_selection": "Edit"
-        },
-        "description": "What would you like to edit?",
-        "title": "Configure AlarmDecoder"
+        }
       },
-      "zone_details": {
+      "arm_settings": {
+        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
         "data": {
-          "zone_loop": "RF loop",
-          "zone_name": "Zone name",
-          "zone_relayaddr": "Relay address",
-          "zone_relaychan": "Relay channel",
-          "zone_rfid": "RF serial",
-          "zone_type": "Zone type"
-        },
-        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave 'Zone name' blank.",
-        "title": "[%key:component::alarmdecoder::options::step::init::title%]"
+          "auto_bypass": "Auto-bypass on arm",
+          "code_arm_required": "Code required for arming",
+          "alt_night_mode": "Alternative night mode"
+        }
       },
       "zone_select": {
+        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
+        "description": "Enter the zone number you'd like to to add, edit, or remove.",
         "data": {
           "zone_number": "Zone number"
-        },
-        "description": "Enter the zone number you'd like to to add, edit, or remove.",
-        "title": "[%key:component::alarmdecoder::options::step::init::title%]"
+        }
+      },
+      "zone_details": {
+        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
+        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave 'Zone name' blank.",
+        "data": {
+          "zone_name": "Zone name",
+          "zone_type": "Zone type",
+          "zone_rfid": "RF serial",
+          "zone_loop": "RF loop",
+          "zone_relayaddr": "Relay address",
+          "zone_relaychan": "Relay channel"
+        }
       }
+    },
+    "error": {
+      "relay_inclusive": "'Relay address' and 'Relay channel' are codependent and must be included together.",
+      "int": "The field below must be an integer.",
+      "loop_rfid": "'RF loop' cannot be used without 'RF serial'.",
+      "loop_range": "'RF loop' must be an integer between 1 and 4."
     }
   },
   "services": {
     "alarm_keypress": {
+      "name": "Key press",
       "description": "Sends custom keypresses to the alarm.",
       "fields": {
         "keypress": {
-          "description": "String to send to the alarm panel.",
-          "name": "[%key:component::alarmdecoder::services::alarm_keypress::name%]"
+          "name": "[%key:component::alarmdecoder::services::alarm_keypress::name%]",
+          "description": "String to send to the alarm panel."
         }
-      },
-      "name": "Key press"
+      }
     },
     "alarm_toggle_chime": {
+      "name": "Toggle chime",
       "description": "Sends the alarm the toggle chime command.",
       "fields": {
         "code": {
-          "description": "Code to toggle the alarm control panel chime with.",
-          "name": "Code"
+          "name": "Code",
+          "description": "Code to toggle the alarm control panel chime with."
         }
-      },
-      "name": "Toggle chime"
+      }
     }
   }
 }

homeassistant/components/alert/strings.json

@@ -1,4 +1,5 @@
 {
+  "title": "Alert",
   "entity_component": {
     "_": {
       "name": "[%key:component::alert::title%]",
@@ -11,17 +12,16 @@
   },
   "services": {
     "toggle": {
-      "description": "Toggles alert's notifications.",
-      "name": "[%key:common::action::toggle%]"
+      "name": "[%key:common::action::toggle%]",
+      "description": "Toggles alert's notifications."
     },
     "turn_off": {
-      "description": "Silences alert's notifications.",
-      "name": "[%key:common::action::turn_off%]"
+      "name": "[%key:common::action::turn_off%]",
+      "description": "Silences alert's notifications."
     },
     "turn_on": {
-      "description": "Resets alert's notifications.",
-      "name": "[%key:common::action::turn_on%]"
+      "name": "[%key:common::action::turn_on%]",
+      "description": "Resets alert's notifications."
     }
-  },
-  "title": "Alert"
+  }
 }

homeassistant/components/alexa_devices/const.py

@@ -26,6 +26,3 @@ COUNTRY_DOMAINS = {
     "us": DEFAULT_DOMAIN,
     "za": "co.za",
 }
-
-CATEGORY_SENSORS = "sensors"
-CATEGORY_NOTIFICATIONS = "notifications"

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==6.5.5"]
+  "requirements": ["aioamazondevices==6.4.3"]
 }

homeassistant/components/alexa_devices/sensor.py

@@ -4,15 +4,9 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime
 from typing import Final
 
 from aioamazondevices.api import AmazonDevice
-from aioamazondevices.const import (
-    NOTIFICATION_ALARM,
-    NOTIFICATION_REMINDER,
-    NOTIFICATION_TIMER,
-)
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -25,7 +19,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from .const import CATEGORY_NOTIFICATIONS, CATEGORY_SENSORS
 from .coordinator import AmazonConfigEntry
 from .entity import AmazonEntity
 
@@ -43,20 +36,6 @@ class AmazonSensorEntityDescription(SensorEntityDescription):
         and (sensor := device.sensors.get(key)) is not None
         and sensor.error is False
     )
-    category: str = CATEGORY_SENSORS
-
-
-@dataclass(frozen=True, kw_only=True)
-class AmazonNotificationEntityDescription(SensorEntityDescription):
-    """Amazon Devices notification entity description."""
-
-    native_unit_of_measurement_fn: Callable[[AmazonDevice, str], str] | None = None
-    is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
-        device.online
-        and (notification := device.notifications.get(key)) is not None
-        and notification.next_occurrence is not None
-    )
-    category: str = CATEGORY_NOTIFICATIONS
 
 
 SENSORS: Final = (
@@ -77,23 +56,6 @@ SENSORS: Final = (
         state_class=SensorStateClass.MEASUREMENT,
     ),
 )
-NOTIFICATIONS: Final = (
-    AmazonNotificationEntityDescription(
-        key=NOTIFICATION_ALARM,
-        translation_key="alarm",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
-    AmazonNotificationEntityDescription(
-        key=NOTIFICATION_REMINDER,
-        translation_key="reminder",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
-    AmazonNotificationEntityDescription(
-        key=NOTIFICATION_TIMER,
-        translation_key="timer",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
-)
 
 
 async def async_setup_entry(
@@ -112,18 +74,12 @@ async def async_setup_entry(
         new_devices = current_devices - known_devices
         if new_devices:
             known_devices.update(new_devices)
-            sensors_list = [
+            async_add_entities(
                 AmazonSensorEntity(coordinator, serial_num, sensor_desc)
                 for sensor_desc in SENSORS
                 for serial_num in new_devices
                 if coordinator.data[serial_num].sensors.get(sensor_desc.key) is not None
-            ]
-            notifications_list = [
-                AmazonSensorEntity(coordinator, serial_num, notification_desc)
-                for notification_desc in NOTIFICATIONS
-                for serial_num in new_devices
-            ]
-            async_add_entities(sensors_list + notifications_list)
+            )
 
     _check_device()
     entry.async_on_unload(coordinator.async_add_listener(_check_device))
@@ -132,9 +88,7 @@ async def async_setup_entry(
 class AmazonSensorEntity(AmazonEntity, SensorEntity):
     """Sensor device."""
 
-    entity_description: (
-        AmazonSensorEntityDescription | AmazonNotificationEntityDescription
-    )
+    entity_description: AmazonSensorEntityDescription
 
     @property
     def native_unit_of_measurement(self) -> str | None:
@@ -147,13 +101,9 @@ class AmazonSensorEntity(AmazonEntity, SensorEntity):
         return super().native_unit_of_measurement
 
     @property
-    def native_value(self) -> StateType | datetime:
+    def native_value(self) -> StateType:
         """Return the state of the sensor."""
-        # Sensors
-        if self.entity_description.category == CATEGORY_SENSORS:
-            return self.device.sensors[self.entity_description.key].value
-        # Notifications
-        return self.device.notifications[self.entity_description.key].next_occurrence
+        return self.device.sensors[self.entity_description.key].value
 
     @property
     def available(self) -> bool:

homeassistant/components/alexa_devices/strings.json

@@ -1,12 +1,47 @@
 {
   "common": {
     "data_code": "One-time password (OTP code)",
-    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported.",
-    "data_description_password": "The password of your Amazon account.",
     "data_description_username": "The email address of your Amazon account.",
+    "data_description_password": "The password of your Amazon account.",
+    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported.",
     "device_id_description": "The ID of the device to send the command to."
   },
   "config": {
+    "flow_title": "{username}",
+    "step": {
+      "user": {
+        "data": {
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]",
+          "code": "[%key:component::alexa_devices::common::data_code%]"
+        },
+        "data_description": {
+          "username": "[%key:component::alexa_devices::common::data_description_username%]",
+          "password": "[%key:component::alexa_devices::common::data_description_password%]",
+          "code": "[%key:component::alexa_devices::common::data_description_code%]"
+        }
+      },
+      "reauth_confirm": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]",
+          "code": "[%key:component::alexa_devices::common::data_code%]"
+        },
+        "data_description": {
+          "password": "[%key:component::alexa_devices::common::data_description_password%]",
+          "code": "[%key:component::alexa_devices::common::data_description_code%]"
+        }
+      },
+      "reconfigure": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]",
+          "code": "[%key:component::alexa_devices::common::data_code%]"
+        },
+        "data_description": {
+          "password": "[%key:component::alexa_devices::common::data_description_password%]",
+          "code": "[%key:component::alexa_devices::common::data_description_code%]"
+        }
+      }
+    },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -20,61 +55,15 @@
       "cannot_retrieve_data": "Unable to retrieve data from Amazon. Please try again later.",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "flow_title": "{username}",
-    "step": {
-      "reauth_confirm": {
-        "data": {
-          "code": "[%key:component::alexa_devices::common::data_code%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "code": "[%key:component::alexa_devices::common::data_description_code%]",
-          "password": "[%key:component::alexa_devices::common::data_description_password%]"
-        }
-      },
-      "reconfigure": {
-        "data": {
-          "code": "[%key:component::alexa_devices::common::data_code%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "code": "[%key:component::alexa_devices::common::data_description_code%]",
-          "password": "[%key:component::alexa_devices::common::data_description_password%]"
-        }
-      },
-      "user": {
-        "data": {
-          "code": "[%key:component::alexa_devices::common::data_code%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::username%]"
-        },
-        "data_description": {
-          "code": "[%key:component::alexa_devices::common::data_description_code%]",
-          "password": "[%key:component::alexa_devices::common::data_description_password%]",
-          "username": "[%key:component::alexa_devices::common::data_description_username%]"
-        }
-      }
     }
   },
   "entity": {
     "notify": {
-      "announce": {
-        "name": "Announce"
-      },
       "speak": {
         "name": "Speak"
-      }
-    },
-    "sensor": {
-      "alarm": {
-        "name": "Next alarm"
       },
-      "reminder": {
-        "name": "Next reminder"
-      },
-      "timer": {
-        "name": "Next timer"
+      "announce": {
+        "name": "Announce"
       }
     },
     "switch": {
@@ -83,24 +72,34 @@
       }
     }
   },
-  "exceptions": {
-    "cannot_connect_with_error": {
-      "message": "Error connecting: {error}"
+  "services": {
+    "send_sound": {
+      "name": "Send sound",
+      "description": "Sends a sound to a device",
+      "fields": {
+        "device_id": {
+          "name": "Device",
+          "description": "[%key:component::alexa_devices::common::device_id_description%]"
+        },
+        "sound": {
+          "name": "Alexa Skill sound file",
+          "description": "The sound file to play."
+        }
+      }
     },
-    "cannot_retrieve_data_with_error": {
-      "message": "Error retrieving data: {error}"
-    },
-    "device_serial_number_missing": {
-      "message": "Device serial number missing: {device_id}"
-    },
-    "entry_not_loaded": {
-      "message": "Entry not loaded: {entry}"
-    },
-    "invalid_device_id": {
-      "message": "Invalid device ID specified: {device_id}"
-    },
-    "invalid_sound_value": {
-      "message": "Invalid sound {sound} specified"
+    "send_text_command": {
+      "name": "Send text command",
+      "description": "Sends a text command to a device",
+      "fields": {
+        "text_command": {
+          "name": "Alexa text command",
+          "description": "The text command to send."
+        },
+        "device_id": {
+          "name": "Device",
+          "description": "[%key:component::alexa_devices::common::device_id_description%]"
+        }
+      }
     }
   },
   "selector": {
@@ -150,34 +149,24 @@
       }
     }
   },
-  "services": {
-    "send_sound": {
-      "description": "Sends a sound to a device",
-      "fields": {
-        "device_id": {
-          "description": "[%key:component::alexa_devices::common::device_id_description%]",
-          "name": "Device"
-        },
-        "sound": {
-          "description": "The sound file to play.",
-          "name": "Alexa Skill sound file"
-        }
-      },
-      "name": "Send sound"
+  "exceptions": {
+    "cannot_connect_with_error": {
+      "message": "Error connecting: {error}"
     },
-    "send_text_command": {
-      "description": "Sends a text command to a device",
-      "fields": {
-        "device_id": {
-          "description": "[%key:component::alexa_devices::common::device_id_description%]",
-          "name": "Device"
-        },
-        "text_command": {
-          "description": "The text command to send.",
-          "name": "Alexa text command"
-        }
-      },
-      "name": "Send text command"
+    "cannot_retrieve_data_with_error": {
+      "message": "Error retrieving data: {error}"
+    },
+    "device_serial_number_missing": {
+      "message": "Device serial number missing: {device_id}"
+    },
+    "invalid_device_id": {
+      "message": "Invalid device ID specified: {device_id}"
+    },
+    "invalid_sound_value": {
+      "message": "Invalid sound {sound} specified"
+    },
+    "entry_not_loaded": {
+      "message": "Entry not loaded: {entry}"
     }
   }
 }

homeassistant/components/altruist/strings.json

@@ -1,12 +1,5 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
-    },
-    "error": {
-      "no_device_found": "[%key:common::config_flow::error::cannot_connect%]"
-    },
     "flow_title": "{name}",
     "step": {
       "discovery_confirm": {
@@ -21,30 +14,37 @@
         },
         "description": "Fill in Altruist IP address or hostname in your local network"
       }
+    },
+    "abort": {
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "no_device_found": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "entity": {
     "sensor": {
-      "co2": {
-        "name": "{sensor_name} CO2"
-      },
       "humidity": {
         "name": "{sensor_name} humidity"
       },
-      "noise_avg": {
-        "name": "Average noise"
-      },
-      "noise_max": {
-        "name": "Maximum noise"
-      },
       "pressure": {
         "name": "{sensor_name} pressure"
       },
-      "radiation": {
-        "name": "Radiation level"
-      },
       "temperature": {
         "name": "{sensor_name} temperature"
+      },
+      "noise_max": {
+        "name": "Maximum noise"
+      },
+      "noise_avg": {
+        "name": "Average noise"
+      },
+      "co2": {
+        "name": "{sensor_name} CO2"
+      },
+      "radiation": {
+        "name": "Radiation level"
       }
     }
   }

homeassistant/components/amberelectric/icons.json

@@ -1,26 +1,26 @@
 {
   "entity": {
-    "binary_sensor": {
-      "demand_window": {
-        "default": "mdi:meter-electric",
-        "state": {
-          "off": "mdi:meter-electric-outline"
-        }
-      }
-    },
     "sensor": {
+      "general": {
+        "default": "mdi:transmission-tower"
+      },
       "controlled_load": {
         "default": "mdi:clock-outline"
       },
       "feed_in": {
         "default": "mdi:solar-power"
       },
-      "general": {
-        "default": "mdi:transmission-tower"
-      },
       "renewables": {
         "default": "mdi:solar-power"
       }
+    },
+    "binary_sensor": {
+      "demand_window": {
+        "default": "mdi:meter-electric",
+        "state": {
+          "off": "mdi:meter-electric-outline"
+        }
+      }
     }
   },
   "services": {

homeassistant/components/amberelectric/strings.json

@@ -22,40 +22,40 @@
       }
     }
   },
+  "services": {
+    "get_forecasts": {
+      "name": "Get price forecasts",
+      "description": "Retrieves price forecasts from Amber Electric for a site.",
+      "fields": {
+        "config_entry_id": {
+          "description": "The config entry of the site to get forecasts for.",
+          "name": "Config entry"
+        },
+        "channel_type": {
+          "name": "Channel type",
+          "description": "The channel to get forecasts for."
+        }
+      }
+    }
+  },
   "exceptions": {
-    "channel_not_found": {
-      "message": "There is no {channel_type} channel at this site."
-    },
     "integration_not_found": {
       "message": "Config entry \"{target}\" not found in registry."
     },
     "not_loaded": {
       "message": "{target} is not loaded."
+    },
+    "channel_not_found": {
+      "message": "There is no {channel_type} channel at this site."
     }
   },
   "selector": {
     "channel_type": {
       "options": {
+        "general": "General",
         "controlled_load": "Controlled load",
-        "feed_in": "Feed-in",
-        "general": "General"
+        "feed_in": "Feed-in"
       }
     }
-  },
-  "services": {
-    "get_forecasts": {
-      "description": "Retrieves price forecasts from Amber Electric for a site.",
-      "fields": {
-        "channel_type": {
-          "description": "The channel to get forecasts for.",
-          "name": "Channel type"
-        },
-        "config_entry_id": {
-          "description": "The config entry of the site to get forecasts for.",
-          "name": "Config entry"
-        }
-      },
-      "name": "Get price forecasts"
-    }
   }
 }

homeassistant/components/ambient_network/icons.json

@@ -4,15 +4,15 @@
       "last_rain": {
         "default": "mdi:water"
       },
-      "lightning_distance": {
-        "default": "mdi:lightning-bolt"
-      },
       "lightning_strikes_per_day": {
         "default": "mdi:lightning-bolt"
       },
       "lightning_strikes_per_hour": {
         "default": "mdi:lightning-bolt"
       },
+      "lightning_distance": {
+        "default": "mdi:lightning-bolt"
+      },
       "wind_direction": {
         "default": "mdi:compass-outline"
       }

homeassistant/components/ambient_network/strings.json

@@ -1,30 +1,42 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    "step": {
+      "user": {
+        "title": "Select region",
+        "description": "Choose the region you want to survey in order to locate Ambient personal weather stations."
+      },
+      "station": {
+        "title": "Select station",
+        "description": "Select the weather station you want to add to Home Assistant.",
+        "data": {
+          "station": "Station"
+        }
+      }
     },
     "error": {
       "no_stations_found": "Did not find any stations in the selected region."
     },
-    "step": {
-      "station": {
-        "data": {
-          "station": "Station"
-        },
-        "description": "Select the weather station you want to add to Home Assistant.",
-        "title": "Select station"
-      },
-      "user": {
-        "description": "Choose the region you want to survey in order to locate Ambient personal weather stations.",
-        "title": "Select region"
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "entity": {
     "sensor": {
+      "pm25_24h_average": {
+        "name": "PM2.5 (24 hour average)"
+      },
+      "pm25_aqi": {
+        "name": "PM2.5 AQI"
+      },
+      "pm25_aqi_24h_average": {
+        "name": "PM2.5 AQI (24 hour average)"
+      },
       "absolute_pressure": {
         "name": "Absolute pressure"
       },
+      "relative_pressure": {
+        "name": "Relative pressure"
+      },
       "daily_rain": {
         "name": "Daily rain"
       },
@@ -40,33 +52,21 @@
       "last_rain": {
         "name": "Last rain"
       },
-      "lightning_distance": {
-        "name": "Lightning distance"
-      },
       "lightning_strikes_per_day": {
         "name": "Lightning strikes per day"
       },
       "lightning_strikes_per_hour": {
         "name": "Lightning strikes per hour"
       },
+      "lightning_distance": {
+        "name": "Lightning distance"
+      },
       "max_daily_gust": {
         "name": "Max daily gust"
       },
       "monthly_rain": {
         "name": "Monthly rain"
       },
-      "pm25_24h_average": {
-        "name": "PM2.5 (24 hour average)"
-      },
-      "pm25_aqi": {
-        "name": "PM2.5 AQI"
-      },
-      "pm25_aqi_24h_average": {
-        "name": "PM2.5 AQI (24 hour average)"
-      },
-      "relative_pressure": {
-        "name": "Relative pressure"
-      },
       "uv_index": {
         "name": "UV index"
       },

homeassistant/components/ambient_station/strings.json

@@ -1,20 +1,20 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    "step": {
+      "user": {
+        "title": "Fill in your information",
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "app_key": "Application Key"
+        }
+      }
     },
     "error": {
       "invalid_key": "[%key:common::config_flow::error::invalid_api_key%]",
       "no_devices": "No devices found in account"
     },
-    "step": {
-      "user": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "app_key": "Application Key"
-        },
-        "title": "Fill in your information"
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   },
   "entity": {
@@ -22,9 +22,6 @@
       "battery_1": {
         "name": "Battery 1"
       },
-      "battery_10": {
-        "name": "Battery 10"
-      },
       "battery_2": {
         "name": "Battery 2"
       },
@@ -49,24 +46,12 @@
       "battery_9": {
         "name": "Battery 9"
       },
-      "co2_battery": {
-        "name": "Carbon dioxide battery"
+      "battery_10": {
+        "name": "Battery 10"
       },
       "interior_battery": {
         "name": "Interior battery"
       },
-      "leak_detector_1": {
-        "name": "Leak detector 1"
-      },
-      "leak_detector_2": {
-        "name": "Leak detector 2"
-      },
-      "leak_detector_3": {
-        "name": "Leak detector 3"
-      },
-      "leak_detector_4": {
-        "name": "Leak detector 4"
-      },
       "leak_detector_battery_1": {
         "name": "Leak detector battery 1"
       },
@@ -79,21 +64,63 @@
       "leak_detector_battery_4": {
         "name": "Leak detector battery 4"
       },
+      "soil_monitor_battery_1": {
+        "name": "Soil monitor battery 1"
+      },
+      "soil_monitor_battery_2": {
+        "name": "Soil monitor battery 2"
+      },
+      "soil_monitor_battery_3": {
+        "name": "Soil monitor battery 3"
+      },
+      "soil_monitor_battery_4": {
+        "name": "Soil monitor battery 4"
+      },
+      "soil_monitor_battery_5": {
+        "name": "Soil monitor battery 5"
+      },
+      "soil_monitor_battery_6": {
+        "name": "Soil monitor battery 6"
+      },
+      "soil_monitor_battery_7": {
+        "name": "Soil monitor battery 7"
+      },
+      "soil_monitor_battery_8": {
+        "name": "Soil monitor battery 8"
+      },
+      "soil_monitor_battery_9": {
+        "name": "Soil monitor battery 9"
+      },
+      "soil_monitor_battery_10": {
+        "name": "Soil monitor battery 10"
+      },
+      "co2_battery": {
+        "name": "Carbon dioxide battery"
+      },
       "lightning_detector_battery": {
         "name": "Lightning detector battery"
       },
-      "pm25_battery": {
-        "name": "PM25 battery"
+      "leak_detector_1": {
+        "name": "Leak detector 1"
+      },
+      "leak_detector_2": {
+        "name": "Leak detector 2"
+      },
+      "leak_detector_3": {
+        "name": "Leak detector 3"
+      },
+      "leak_detector_4": {
+        "name": "Leak detector 4"
       },
       "pm25_indoor_battery": {
         "name": "PM25 indoor battery"
       },
+      "pm25_battery": {
+        "name": "PM25 battery"
+      },
       "relay_1": {
         "name": "Relay 1"
       },
-      "relay_10": {
-        "name": "Relay 10"
-      },
       "relay_2": {
         "name": "Relay 2"
       },
@@ -118,44 +145,32 @@
       "relay_9": {
         "name": "Relay 9"
       },
-      "soil_monitor_battery_1": {
-        "name": "Soil monitor battery 1"
-      },
-      "soil_monitor_battery_10": {
-        "name": "Soil monitor battery 10"
-      },
-      "soil_monitor_battery_2": {
-        "name": "Soil monitor battery 2"
-      },
-      "soil_monitor_battery_3": {
-        "name": "Soil monitor battery 3"
-      },
-      "soil_monitor_battery_4": {
-        "name": "Soil monitor battery 4"
-      },
-      "soil_monitor_battery_5": {
-        "name": "Soil monitor battery 5"
-      },
-      "soil_monitor_battery_6": {
-        "name": "Soil monitor battery 6"
-      },
-      "soil_monitor_battery_7": {
-        "name": "Soil monitor battery 7"
-      },
-      "soil_monitor_battery_8": {
-        "name": "Soil monitor battery 8"
-      },
-      "soil_monitor_battery_9": {
-        "name": "Soil monitor battery 9"
+      "relay_10": {
+        "name": "Relay 10"
       }
     },
     "sensor": {
       "24_hour_rain": {
         "name": "Rain 24 hours"
       },
+      "pm25_aqi": {
+        "name": "PM2.5 AQI"
+      },
+      "pm25_aqi_24h_average": {
+        "name": "PM2.5 AQI 24 hour average"
+      },
+      "pm25_indoor_aqi": {
+        "name": "PM2.5 indoor AQI"
+      },
+      "pm25_indoor_aqi_24h_average": {
+        "name": "PM2.5 indoor AQI"
+      },
       "absolute_pressure": {
         "name": "Absolute pressure"
       },
+      "relative_pressure": {
+        "name": "Relative pressure"
+      },
       "daily_rain": {
         "name": "Daily rain"
       },
@@ -171,9 +186,6 @@
       "humidity_1": {
         "name": "Humidity 1"
       },
-      "humidity_10": {
-        "name": "Humidity 10"
-      },
       "humidity_2": {
         "name": "Humidity 2"
       },
@@ -198,11 +210,14 @@
       "humidity_9": {
         "name": "Humidity 9"
       },
+      "humidity_10": {
+        "name": "Humidity 10"
+      },
       "humidity_indoor": {
         "name": "Humidity indoor"
       },
-      "inside_temperature": {
-        "name": "Inside temperature"
+      "last_rain": {
+        "name": "Last rain"
       },
       "last_lightning_strike": {
         "name": "Last Lightning strike"
@@ -210,12 +225,6 @@
       "last_lightning_strike_distance": {
         "name": "Last Lightning strike distance"
       },
-      "last_rain": {
-        "name": "Last rain"
-      },
-      "lifetime_rain": {
-        "name": "Lifetime rain"
-      },
       "lightning_strikes_per_day": {
         "name": "Lightning strikes per day"
       },
@@ -231,33 +240,15 @@
       "pm25_24h_average": {
         "name": "PM2.5 24 hour average"
       },
-      "pm25_aqi": {
-        "name": "PM2.5 AQI"
-      },
-      "pm25_aqi_24h_average": {
-        "name": "PM2.5 AQI 24 hour average"
-      },
       "pm25_indoor": {
         "name": "PM2.5 indoor"
       },
       "pm25_indoor_24h_average": {
         "name": "PM2.5 indoor 24 hour average"
       },
-      "pm25_indoor_aqi": {
-        "name": "PM2.5 indoor AQI"
-      },
-      "pm25_indoor_aqi_24h_average": {
-        "name": "PM2.5 indoor AQI"
-      },
-      "relative_pressure": {
-        "name": "Relative pressure"
-      },
       "soil_humidity_1": {
         "name": "Soil humidity 1"
       },
-      "soil_humidity_10": {
-        "name": "Soil humidity 10"
-      },
       "soil_humidity_2": {
         "name": "Soil humidity 2"
       },
@@ -282,12 +273,12 @@
       "soil_humidity_9": {
         "name": "Soil humidity 9"
       },
+      "soil_humidity_10": {
+        "name": "Soil humidity 10"
+      },
       "soil_temperature_1": {
         "name": "Soil temperature 1"
       },
-      "soil_temperature_10": {
-        "name": "Soil temperature 10"
-      },
       "soil_temperature_2": {
         "name": "Soil temperature 2"
       },
@@ -312,12 +303,12 @@
       "soil_temperature_9": {
         "name": "Soil temperature 9"
       },
+      "soil_temperature_10": {
+        "name": "Soil temperature 10"
+      },
       "temperature_1": {
         "name": "Temperature 1"
       },
-      "temperature_10": {
-        "name": "Temperature 10"
-      },
       "temperature_2": {
         "name": "Temperature 2"
       },
@@ -342,18 +333,21 @@
       "temperature_9": {
         "name": "Temperature 9"
       },
+      "temperature_10": {
+        "name": "Temperature 10"
+      },
+      "inside_temperature": {
+        "name": "Inside temperature"
+      },
+      "lifetime_rain": {
+        "name": "Lifetime rain"
+      },
       "uv_index": {
         "name": "UV index"
       },
       "weekly_rain": {
         "name": "Weekly rain"
       },
-      "wind_average_10m": {
-        "name": "Wind average 10 minutes"
-      },
-      "wind_average_2m": {
-        "name": "Wind average 2 minutes"
-      },
       "wind_direction": {
         "name": "Wind direction"
       },
@@ -363,11 +357,17 @@
       "wind_direction_average_2m": {
         "name": "Wind direction average 2 minutes"
       },
+      "wind_gust_direction": {
+        "name": "Wind gust direction"
+      },
       "wind_gust": {
         "name": "Wind gust"
       },
-      "wind_gust_direction": {
-        "name": "Wind gust direction"
+      "wind_average_10m": {
+        "name": "Wind average 10 minutes"
+      },
+      "wind_average_2m": {
+        "name": "Wind average 2 minutes"
       },
       "yearly_rain": {
         "name": "Yearly rain"

homeassistant/components/amcrest/icons.json

@@ -1,10 +1,7 @@
 {
   "services": {
-    "disable_audio": {
-      "service": "mdi:volume-off"
-    },
-    "disable_motion_recording": {
-      "service": "mdi:motion-sensor-off"
+    "enable_recording": {
+      "service": "mdi:record-rec"
     },
     "disable_recording": {
       "service": "mdi:stop"
@@ -12,18 +9,18 @@
     "enable_audio": {
       "service": "mdi:volume-high"
     },
+    "disable_audio": {
+      "service": "mdi:volume-off"
+    },
     "enable_motion_recording": {
       "service": "mdi:motion-sensor"
     },
-    "enable_recording": {
-      "service": "mdi:record-rec"
+    "disable_motion_recording": {
+      "service": "mdi:motion-sensor-off"
     },
     "goto_preset": {
       "service": "mdi:pan"
     },
-    "ptz_control": {
-      "service": "mdi:pan"
-    },
     "set_color_bw": {
       "service": "mdi:palette"
     },
@@ -32,6 +29,9 @@
     },
     "stop_tour": {
       "service": "mdi:panorama-outline"
+    },
+    "ptz_control": {
+      "service": "mdi:pan"
     }
   }
 }

homeassistant/components/amcrest/strings.json

@@ -1,130 +1,130 @@
 {
   "services": {
-    "disable_audio": {
-      "description": "Disables audio stream.",
-      "fields": {
-        "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
-        }
-      },
-      "name": "Disable audio"
-    },
-    "disable_motion_recording": {
-      "description": "Disables recording a clip to camera storage when motion is detected.",
-      "fields": {
-        "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
-        }
-      },
-      "name": "Disable motion recording"
-    },
-    "disable_recording": {
-      "description": "Disables continuous recording to camera storage.",
-      "fields": {
-        "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
-        }
-      },
-      "name": "Disable recording"
-    },
-    "enable_audio": {
-      "description": "Enables audio stream.",
-      "fields": {
-        "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
-        }
-      },
-      "name": "Enable audio"
-    },
-    "enable_motion_recording": {
-      "description": "Enables recording a clip to camera storage when motion is detected.",
-      "fields": {
-        "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
-        }
-      },
-      "name": "Enable motion recording"
-    },
     "enable_recording": {
+      "name": "Enable recording",
       "description": "Enables continuous recording to camera storage.",
       "fields": {
         "entity_id": {
-          "description": "Name(s) of the cameras, or 'all' for all cameras.",
-          "name": "Entity"
+          "name": "Entity",
+          "description": "Name(s) of the cameras, or 'all' for all cameras."
         }
-      },
-      "name": "Enable recording"
+      }
+    },
+    "disable_recording": {
+      "name": "Disable recording",
+      "description": "Disables continuous recording to camera storage.",
+      "fields": {
+        "entity_id": {
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+        }
+      }
+    },
+    "enable_audio": {
+      "name": "Enable audio",
+      "description": "Enables audio stream.",
+      "fields": {
+        "entity_id": {
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+        }
+      }
+    },
+    "disable_audio": {
+      "name": "Disable audio",
+      "description": "Disables audio stream.",
+      "fields": {
+        "entity_id": {
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+        }
+      }
+    },
+    "enable_motion_recording": {
+      "name": "Enable motion recording",
+      "description": "Enables recording a clip to camera storage when motion is detected.",
+      "fields": {
+        "entity_id": {
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+        }
+      }
+    },
+    "disable_motion_recording": {
+      "name": "Disable motion recording",
+      "description": "Disables recording a clip to camera storage when motion is detected.",
+      "fields": {
+        "entity_id": {
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+        }
+      }
     },
     "goto_preset": {
+      "name": "Go to preset",
       "description": "Moves camera to PTZ preset.",
       "fields": {
         "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
         },
         "preset": {
-          "description": "Preset number.",
-          "name": "Preset"
+          "name": "Preset",
+          "description": "Preset number."
         }
-      },
-      "name": "Go to preset"
-    },
-    "ptz_control": {
-      "description": "Moves (pan/tilt) and/or zoom a PTZ camera.",
-      "fields": {
-        "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
-        },
-        "movement": {
-          "description": "Direction to move the camera.",
-          "name": "Movement"
-        },
-        "travel_time": {
-          "description": "Travel time in fractional seconds: from 0 to 1.",
-          "name": "Travel time"
-        }
-      },
-      "name": "PTZ control"
+      }
     },
     "set_color_bw": {
+      "name": "Set color",
       "description": "Sets camera color mode.",
       "fields": {
-        "color_bw": {
-          "description": "Color mode.",
-          "name": "Color"
-        },
         "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+        },
+        "color_bw": {
+          "name": "Color",
+          "description": "Color mode."
         }
-      },
-      "name": "Set color"
+      }
     },
     "start_tour": {
+      "name": "Start tour",
       "description": "Starts camera's PTZ tour function.",
       "fields": {
         "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
         }
-      },
-      "name": "Start tour"
+      }
     },
     "stop_tour": {
+      "name": "Stop tour",
       "description": "Stops camera's PTZ tour function.",
       "fields": {
         "entity_id": {
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
         }
-      },
-      "name": "Stop tour"
+      }
+    },
+    "ptz_control": {
+      "name": "PTZ control",
+      "description": "Moves (pan/tilt) and/or zoom a PTZ camera.",
+      "fields": {
+        "entity_id": {
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+        },
+        "movement": {
+          "name": "Movement",
+          "description": "Direction to move the camera."
+        },
+        "travel_time": {
+          "name": "Travel time",
+          "description": "Travel time in fractional seconds: from 0 to 1."
+        }
+      }
     }
   }
 }

homeassistant/components/analytics_insights/strings.json

@@ -1,25 +1,47 @@
 {
   "config": {
+    "step": {
+      "user": {
+        "data": {
+          "tracked_addons": "Add-ons",
+          "tracked_integrations": "Integrations",
+          "tracked_custom_integrations": "Custom integrations"
+        },
+        "data_description": {
+          "tracked_addons": "Select the add-ons you want to track",
+          "tracked_integrations": "Select the integrations you want to track",
+          "tracked_custom_integrations": "Select the custom integrations you want to track"
+        }
+      }
+    },
     "abort": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "error": {
       "no_integrations_selected": "You must select at least one integration to track"
-    },
+    }
+  },
+  "options": {
     "step": {
-      "user": {
+      "init": {
         "data": {
-          "tracked_addons": "Add-ons",
-          "tracked_custom_integrations": "Custom integrations",
-          "tracked_integrations": "Integrations"
+          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data::tracked_addons%]",
+          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_integrations%]",
+          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_custom_integrations%]"
         },
         "data_description": {
-          "tracked_addons": "Select the add-ons you want to track",
-          "tracked_custom_integrations": "Select the custom integrations you want to track",
-          "tracked_integrations": "Select the integrations you want to track"
+          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data_description::tracked_addons%]",
+          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_integrations%]",
+          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_custom_integrations%]"
         }
       }
+    },
+    "abort": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "error": {
+      "no_integrations_selected": "[%key:component::analytics_insights::config::error::no_integrations_selected%]"
     }
   },
   "entity": {
@@ -34,27 +56,5 @@
         "name": "Total reported integrations"
       }
     }
-  },
-  "options": {
-    "abort": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "error": {
-      "no_integrations_selected": "[%key:component::analytics_insights::config::error::no_integrations_selected%]"
-    },
-    "step": {
-      "init": {
-        "data": {
-          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data::tracked_addons%]",
-          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_custom_integrations%]",
-          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_integrations%]"
-        },
-        "data_description": {
-          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data_description::tracked_addons%]",
-          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_custom_integrations%]",
-          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_integrations%]"
-        }
-      }
-    }
   }
 }

homeassistant/components/android_ip_webcam/icons.json

@@ -51,11 +51,11 @@
       "torch": {
         "default": "mdi:white-balance-sunny"
       },
-      "video_recording": {
-        "default": "mdi:record-rec"
-      },
       "whitebalance_lock": {
         "default": "mdi:white-balance-auto"
+      },
+      "video_recording": {
+        "default": "mdi:record-rec"
       }
     }
   }

homeassistant/components/android_ip_webcam/strings.json

@@ -1,24 +1,24 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
-    },
     "step": {
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "username": "[%key:common::config_flow::data::username%]"
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
           "host": "The IP address of the device running the Android IP Webcam app. The IP address is shown in the app once you start the server."
         }
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }

homeassistant/components/androidtv/icons.json

@@ -6,11 +6,11 @@
     "download": {
       "service": "mdi:download"
     },
-    "learn_sendevent": {
-      "service": "mdi:remote"
-    },
     "upload": {
       "service": "mdi:upload"
+    },
+    "learn_sendevent": {
+      "service": "mdi:remote"
     }
   }
 }

homeassistant/components/androidtv/strings.json

@@ -1,112 +1,112 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "invalid_unique_id": "Impossible to determine a valid unique ID for the device"
-    },
-    "error": {
-      "adbkey_not_file": "ADB key file not found",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
-      "key_and_server": "Only provide ADB Key or ADB Server",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
       "user": {
         "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "adbkey": "Path to your ADB key file (leave empty to auto generate)",
           "adb_server_ip": "IP address of the ADB server (leave empty to not use)",
           "adb_server_port": "Port of the ADB server",
-          "adbkey": "Path to your ADB key file (leave empty to auto generate)",
           "device_class": "The type of device",
-          "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
         }
       }
-    }
-  },
-  "exceptions": {
-    "failed_send": {
-      "message": "Failed to send command {cmd}"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
+      "adbkey_not_file": "ADB key file not found",
+      "key_and_server": "Only provide ADB Key or ADB Server",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "invalid_unique_id": "Impossible to determine a valid unique ID for the device"
     }
   },
   "options": {
-    "error": {
-      "invalid_det_rules": "Invalid state detection rules"
-    },
     "step": {
-      "apps": {
-        "data": {
-          "app_delete": "Check to delete this application",
-          "app_id": "Application ID",
-          "app_name": "Application name"
-        },
-        "description": "Configure application ID {app_id}",
-        "title": "Configure Android apps"
-      },
       "init": {
         "data": {
           "apps": "Configure applications list",
-          "exclude_unnamed_apps": "Exclude apps with unknown name from the sources list",
           "get_sources": "Retrieve the running apps as the list of sources",
+          "exclude_unnamed_apps": "Exclude apps with unknown name from the sources list",
           "screencap_interval": "Interval in minutes between screen capture for album art (set 0 to disable)",
           "state_detection_rules": "Configure state detection rules",
           "turn_off_command": "ADB shell turn off command (leave empty for default)",
           "turn_on_command": "ADB shell turn on command (leave empty for default)"
         }
       },
-      "rules": {
+      "apps": {
+        "title": "Configure Android apps",
+        "description": "Configure application ID {app_id}",
         "data": {
-          "rule_delete": "Check to delete this rule",
-          "rule_id": "[%key:component::androidtv::options::step::apps::data::app_id%]",
-          "rule_values": "List of state detection rules (see documentation)"
-        },
+          "app_name": "Application name",
+          "app_id": "Application ID",
+          "app_delete": "Check to delete this application"
+        }
+      },
+      "rules": {
+        "title": "Configure Android state detection rules",
         "description": "Configure detection rule for application ID {rule_id}",
-        "title": "Configure Android state detection rules"
+        "data": {
+          "rule_id": "[%key:component::androidtv::options::step::apps::data::app_id%]",
+          "rule_values": "List of state detection rules (see documentation)",
+          "rule_delete": "Check to delete this rule"
+        }
       }
+    },
+    "error": {
+      "invalid_det_rules": "Invalid state detection rules"
     }
   },
   "services": {
     "adb_command": {
+      "name": "ADB command",
       "description": "Sends an ADB command to an Android / Fire TV device.",
       "fields": {
         "command": {
-          "description": "Either a key command or an ADB shell command.",
-          "name": "Command"
+          "name": "Command",
+          "description": "Either a key command or an ADB shell command."
         }
-      },
-      "name": "ADB command"
+      }
     },
     "download": {
+      "name": "Download",
       "description": "Downloads a file from your Android / Fire TV device to your Home Assistant instance.",
       "fields": {
         "device_path": {
-          "description": "The filepath on the Android / Fire TV device.",
-          "name": "Device path"
+          "name": "Device path",
+          "description": "The filepath on the Android / Fire TV device."
         },
         "local_path": {
-          "description": "The filepath on your Home Assistant instance.",
-          "name": "Local path"
+          "name": "Local path",
+          "description": "The filepath on your Home Assistant instance."
         }
-      },
-      "name": "Download"
-    },
-    "learn_sendevent": {
-      "description": "Translates a key press on a remote into ADB 'sendevent' commands. You must press one button on the remote within 8 seconds of performing this action.",
-      "name": "Learn sendevent"
+      }
     },
     "upload": {
+      "name": "Upload",
       "description": "Uploads a file from your Home Assistant instance to an Android / Fire TV device.",
       "fields": {
         "device_path": {
-          "description": "[%key:component::androidtv::services::download::fields::device_path::description%]",
-          "name": "[%key:component::androidtv::services::download::fields::device_path::name%]"
+          "name": "[%key:component::androidtv::services::download::fields::device_path::name%]",
+          "description": "[%key:component::androidtv::services::download::fields::device_path::description%]"
         },
         "local_path": {
-          "description": "[%key:component::androidtv::services::download::fields::local_path::description%]",
-          "name": "[%key:component::androidtv::services::download::fields::local_path::name%]"
+          "name": "[%key:component::androidtv::services::download::fields::local_path::name%]",
+          "description": "[%key:component::androidtv::services::download::fields::local_path::description%]"
         }
-      },
-      "name": "Upload"
+      }
+    },
+    "learn_sendevent": {
+      "name": "Learn sendevent",
+      "description": "Translates a key press on a remote into ADB 'sendevent' commands. You must press one button on the remote within 8 seconds of performing this action."
+    }
+  },
+  "exceptions": {
+    "failed_send": {
+      "message": "Failed to send command {cmd}"
     }
   }
 }

homeassistant/components/androidtv_remote/config_flow.py

@@ -41,11 +41,6 @@ APPS_NEW_ID = "add_new"
 CONF_APP_DELETE = "app_delete"
 CONF_APP_ID = "app_id"
 
-_EXAMPLE_APP_ID = "com.plexapp.android"
-_EXAMPLE_APP_PLAY_STORE_URL = (
-    f"https://play.google.com/store/apps/details?id={_EXAMPLE_APP_ID}"
-)
-
 STEP_PAIR_DATA_SCHEMA = vol.Schema(
     {
         vol.Required("pin"): str,
@@ -360,7 +355,5 @@ class AndroidTVRemoteOptionsFlowHandler(OptionsFlowWithReload):
             data_schema=data_schema,
             description_placeholders={
                 "app_id": f"`{app_id}`" if app_id != APPS_NEW_ID else "",
-                "example_app_id": _EXAMPLE_APP_ID,
-                "example_app_play_store_url": _EXAMPLE_APP_PLAY_STORE_URL,
             },
         )

homeassistant/components/androidtv_remote/strings.json

@@ -1,11 +1,42 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "Please ensure you reconfigure against the same device."
+    "flow_title": "{name}",
+    "step": {
+      "user": {
+        "description": "Enter the IP address of the Android TV you want to add to Home Assistant. It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen.",
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the Android TV device."
+        }
+      },
+      "reconfigure": {
+        "description": "Update the IP address of this previously configured Android TV device.",
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the Android TV device."
+        }
+      },
+      "zeroconf_confirm": {
+        "title": "Discovered Android TV",
+        "description": "Do you want to add the Android TV ({name}) to Home Assistant? It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
+      },
+      "pair": {
+        "description": "Enter the pairing code displayed on the Android TV ({name}).",
+        "data": {
+          "pin": "[%key:common::config_flow::data::pin%]"
+        },
+        "data_description": {
+          "pin": "Pairing code displayed on the Android TV device."
+        }
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "You need to pair again with the Android TV ({name}). It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
+      }
     },
     "error": {
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
@@ -13,42 +44,41 @@
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
-    "flow_title": "{name}",
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+      "unique_id_mismatch": "Please ensure you reconfigure against the same device."
+    }
+  },
+  "options": {
     "step": {
-      "pair": {
+      "init": {
         "data": {
-          "pin": "[%key:common::config_flow::data::pin%]"
+          "apps": "Configure applications list",
+          "enable_ime": "Enable IME"
         },
         "data_description": {
-          "pin": "Pairing code displayed on the Android TV device."
-        },
-        "description": "Enter the pairing code displayed on the Android TV ({name})."
+          "apps": "Here you can define the list of applications, specify names and icons that will be displayed in the UI.",
+          "enable_ime": "Enable this option to be able to get the current app name and send text as keyboard input. Disable it for devices that show 'Use keyboard on mobile device screen' instead of the on-screen keyboard."
+        }
       },
-      "reauth_confirm": {
-        "description": "You need to pair again with the Android TV ({name}). It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen.",
-        "title": "[%key:common::config_flow::title::reauth%]"
-      },
-      "reconfigure": {
+      "apps": {
+        "title": "Configure Android apps",
+        "description": "Configure application ID {app_id}",
         "data": {
-          "host": "[%key:common::config_flow::data::host%]"
+          "app_name": "Application name",
+          "app_id": "Application ID",
+          "app_icon": "Application icon",
+          "app_delete": "Check to delete this application"
         },
         "data_description": {
-          "host": "The hostname or IP address of the Android TV device."
-        },
-        "description": "Update the IP address of this previously configured Android TV device."
-      },
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the Android TV device."
-        },
-        "description": "Enter the IP address of the Android TV you want to add to Home Assistant. It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
-      },
-      "zeroconf_confirm": {
-        "description": "Do you want to add the Android TV ({name}) to Home Assistant? It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen.",
-        "title": "Discovered Android TV"
+          "app_name": "Name of the application as you would like it to be displayed in Home Assistant.",
+          "app_id": "E.g. com.plexapp.android for https://play.google.com/store/apps/details?id=com.plexapp.android",
+          "app_icon": "Image URL. From the Play Store app page, right click on the icon and select 'Copy image address' and then paste it here. Alternatively, download the image, upload it under /config/www/ and use the URL /local/filename",
+          "app_delete": "Check this box to delete the application from the list."
+        }
       }
     }
   },
@@ -63,36 +93,6 @@
       "message": "Invalid media type: {media_type}"
     }
   },
-  "options": {
-    "step": {
-      "apps": {
-        "data": {
-          "app_delete": "Check to delete this application",
-          "app_icon": "Application icon",
-          "app_id": "Application ID",
-          "app_name": "Application name"
-        },
-        "data_description": {
-          "app_delete": "Check this box to delete the application from the list.",
-          "app_icon": "Image URL. From the Play Store app page, right click on the icon and select 'Copy image address' and then paste it here. Alternatively, download the image, upload it under /config/www/ and use the URL /local/filename",
-          "app_id": "E.g. {example_app_id} for {example_app_play_store_url}",
-          "app_name": "Name of the application as you would like it to be displayed in Home Assistant."
-        },
-        "description": "Configure application ID {app_id}",
-        "title": "Configure Android apps"
-      },
-      "init": {
-        "data": {
-          "apps": "Configure applications list",
-          "enable_ime": "Enable IME"
-        },
-        "data_description": {
-          "apps": "Here you can define the list of applications, specify names and icons that will be displayed in the UI.",
-          "enable_ime": "Enable this option to be able to get the current app name and send text as keyboard input. Disable it for devices that show 'Use keyboard on mobile device screen' instead of the on-screen keyboard."
-        }
-      }
-    }
-  },
   "selector": {
     "apps": {
       "options": {

homeassistant/components/anova/icons.json

@@ -4,15 +4,15 @@
       "cook_time": {
         "default": "mdi:clock-outline"
       },
+      "target_temperature": {
+        "default": "mdi:thermometer"
+      },
       "cook_time_remaining": {
         "default": "mdi:clock-outline"
       },
       "heater_temperature": {
         "default": "mdi:thermometer"
       },
-      "target_temperature": {
-        "default": "mdi:thermometer"
-      },
       "triac_temperature": {
         "default": "mdi:thermometer"
       },

homeassistant/components/anova/strings.json

@@ -1,19 +1,19 @@
 {
   "config": {
+    "step": {
+      "user": {
+        "data": {
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
+      "confirm": {
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
+      }
+    },
     "error": {
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "confirm": {
-        "description": "[%key:common::config_flow::description::confirm_setup%]"
-      },
-      "user": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::email%]"
-        }
-      }
     }
   },
   "entity": {
@@ -21,39 +21,39 @@
       "cook_time": {
         "name": "Cook time"
       },
+      "state": {
+        "name": "State",
+        "state": {
+          "preheating": "Preheating",
+          "cooking": "Cooking",
+          "maintaining": "Maintaining",
+          "timer_expired": "Timer expired",
+          "set_timer": "Set timer",
+          "no_state": "No state"
+        }
+      },
+      "mode": {
+        "name": "[%key:common::config_flow::data::mode%]",
+        "state": {
+          "startup": "Startup",
+          "idle": "[%key:common::state::idle%]",
+          "cook": "Cooking",
+          "low_water": "Low water",
+          "ota": "OTA update",
+          "provisioning": "Provisioning",
+          "high_temp": "High temperature",
+          "device_failure": "Device failure"
+        }
+      },
+      "target_temperature": {
+        "name": "Target temperature"
+      },
       "cook_time_remaining": {
         "name": "Cook time remaining"
       },
       "heater_temperature": {
         "name": "Heater temperature"
       },
-      "mode": {
-        "name": "[%key:common::config_flow::data::mode%]",
-        "state": {
-          "cook": "Cooking",
-          "device_failure": "Device failure",
-          "high_temp": "High temperature",
-          "idle": "[%key:common::state::idle%]",
-          "low_water": "Low water",
-          "ota": "OTA update",
-          "provisioning": "Provisioning",
-          "startup": "Startup"
-        }
-      },
-      "state": {
-        "name": "State",
-        "state": {
-          "cooking": "Cooking",
-          "maintaining": "Maintaining",
-          "no_state": "No state",
-          "preheating": "Preheating",
-          "set_timer": "Set timer",
-          "timer_expired": "Timer expired"
-        }
-      },
-      "target_temperature": {
-        "name": "Target temperature"
-      },
       "triac_temperature": {
         "name": "Triac temperature"
       },

homeassistant/components/anthemav/strings.json

@@ -1,12 +1,5 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "cannot_receive_deviceinfo": "Failed to retrieve MAC address. Make sure the device is turned on"
-    },
     "step": {
       "user": {
         "data": {
@@ -14,6 +7,13 @@
           "port": "[%key:common::config_flow::data::port%]"
         }
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "cannot_receive_deviceinfo": "Failed to retrieve MAC address. Make sure the device is turned on"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }

homeassistant/components/anthropic/strings.json

@@ -1,61 +1,61 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
-    },
-    "error": {
-      "authentication_error": "[%key:common::config_flow::error::invalid_auth%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
       "user": {
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]",
+      "authentication_error": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   },
   "config_subentries": {
     "conversation": {
-      "abort": {
-        "entry_not_loaded": "Cannot add things while the configuration is disabled.",
-        "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "initiate_flow": {
+        "user": "Add conversation agent",
+        "reconfigure": "Reconfigure conversation agent"
       },
       "entry_type": "Conversation agent",
 
-      "error": {
-        "thinking_budget_too_large": "Maximum tokens must be greater than the thinking budget.",
-        "web_search_unsupported_model": "Web search is not supported by the selected model. Please choose a compatible model or disable web search."
-      },
-      "initiate_flow": {
-        "reconfigure": "Reconfigure conversation agent",
-        "user": "Add conversation agent"
-      },
       "step": {
         "set_options": {
           "data": {
-            "chat_model": "[%key:common::generic::model%]",
-            "llm_hass_api": "[%key:common::config_flow::data::llm_hass_api%]",
-            "max_tokens": "Maximum tokens to return in response",
             "name": "[%key:common::config_flow::data::name%]",
             "prompt": "[%key:common::config_flow::data::prompt%]",
-            "recommended": "Recommended model settings",
+            "chat_model": "[%key:common::generic::model%]",
+            "max_tokens": "Maximum tokens to return in response",
             "temperature": "Temperature",
+            "llm_hass_api": "[%key:common::config_flow::data::llm_hass_api%]",
+            "recommended": "Recommended model settings",
             "thinking_budget": "Thinking budget",
-            "user_location": "Include home location",
             "web_search": "Enable web search",
-            "web_search_max_uses": "Maximum web searches"
+            "web_search_max_uses": "Maximum web searches",
+            "user_location": "Include home location"
           },
           "data_description": {
             "prompt": "Instruct how the LLM should respond. This can be a template.",
             "thinking_budget": "The number of tokens the model can use to think about the response out of the total maximum number of tokens. Set to 1024 or greater to enable extended thinking.",
-            "user_location": "Localize search results based on home location",
             "web_search": "The web search tool gives Claude direct access to real-time web content, allowing it to answer questions with up-to-date information beyond its knowledge cutoff",
-            "web_search_max_uses": "Limit the number of searches performed per response"
+            "web_search_max_uses": "Limit the number of searches performed per response",
+            "user_location": "Localize search results based on home location"
           }
         }
+      },
+      "abort": {
+        "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+        "entry_not_loaded": "Cannot add things while the configuration is disabled."
+      },
+      "error": {
+        "thinking_budget_too_large": "Maximum tokens must be greater than the thinking budget.",
+        "web_search_unsupported_model": "Web search is not supported by the selected model. Please choose a compatible model or disable web search."
       }
     }
   }

homeassistant/components/aosmith/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aosmith",
   "iot_class": "cloud_polling",
-  "requirements": ["py-aosmith==1.0.15"]
+  "requirements": ["py-aosmith==1.0.14"]
 }

homeassistant/components/aosmith/strings.json

@@ -1,28 +1,28 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    },
-    "error": {
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
-      "reauth_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "description": "Please update your password for {email}",
-        "title": "[%key:common::config_flow::title::reauth%]"
-      },
       "user": {
         "data": {
           "email": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]"
         },
         "description": "Please enter your A. O. Smith credentials."
+      },
+      "reauth_confirm": {
+        "description": "Please update your password for {email}",
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        }
       }
+    },
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "entity": {
@@ -30,19 +30,19 @@
       "hot_water_plus_level": {
         "name": "Hot Water+ level",
         "state": {
+          "off": "[%key:common::state::off%]",
           "level1": "Level 1",
           "level2": "Level 2",
-          "level3": "Level 3",
-          "off": "[%key:common::state::off%]"
+          "level3": "Level 3"
         }
       }
     },
     "sensor": {
-      "energy_usage": {
-        "name": "Energy usage"
-      },
       "hot_water_availability": {
         "name": "Hot water availability"
+      },
+      "energy_usage": {
+        "name": "Energy usage"
       }
     }
   }

homeassistant/components/apcupsd/icons.json

@@ -9,14 +9,11 @@
       "alarm_delay": {
         "default": "mdi:alarm"
       },
-      "apc_model": {
-        "default": "mdi:information-outline"
-      },
       "apc_status": {
         "default": "mdi:information-outline"
       },
-      "apparent_power": {
-        "default": "mdi:gauge"
+      "apc_model": {
+        "default": "mdi:information-outline"
       },
       "bad_batteries": {
         "default": "mdi:information-outline"
@@ -30,18 +27,30 @@
       "cable_type": {
         "default": "mdi:ethernet-cable"
       },
-      "date": {
-        "default": "mdi:calendar-clock"
+      "total_time_on_battery": {
+        "default": "mdi:timer-outline"
       },
-      "date_and_time": {
+      "date": {
         "default": "mdi:calendar-clock"
       },
       "dip_switch_settings": {
         "default": "mdi:information-outline"
       },
+      "low_battery_signal": {
+        "default": "mdi:clock-alert"
+      },
       "driver": {
         "default": "mdi:information-outline"
       },
+      "shutdown_delay": {
+        "default": "mdi:timer-outline"
+      },
+      "wake_delay": {
+        "default": "mdi:timer-outline"
+      },
+      "date_and_time": {
+        "default": "mdi:calendar-clock"
+      },
       "external_batteries": {
         "default": "mdi:information-outline"
       },
@@ -63,8 +72,8 @@
       "load_capacity": {
         "default": "mdi:gauge"
       },
-      "low_battery_signal": {
-        "default": "mdi:clock-alert"
+      "apparent_power": {
+        "default": "mdi:gauge"
       },
       "manufacture_date": {
         "default": "mdi:calendar"
@@ -72,20 +81,20 @@
       "master_update": {
         "default": "mdi:information-outline"
       },
-      "max_battery_charge": {
-        "default": "mdi:battery-alert"
-      },
       "max_time": {
         "default": "mdi:timer-off-outline"
       },
+      "max_battery_charge": {
+        "default": "mdi:battery-alert"
+      },
       "min_time": {
         "default": "mdi:timer-outline"
       },
       "model": {
         "default": "mdi:information-outline"
       },
-      "online_status": {
-        "default": "mdi:information-outline"
+      "transfer_count": {
+        "default": "mdi:counter"
       },
       "register_1_fault": {
         "default": "mdi:information-outline"
@@ -99,9 +108,6 @@
       "restore_capacity": {
         "default": "mdi:battery-alert"
       },
-      "self_test_interval": {
-        "default": "mdi:information-outline"
-      },
       "self_test_result": {
         "default": "mdi:information-outline"
       },
@@ -111,33 +117,24 @@
       "serial_number": {
         "default": "mdi:information-outline"
       },
-      "shutdown_delay": {
-        "default": "mdi:timer-outline"
-      },
       "startup_time": {
         "default": "mdi:calendar-clock"
       },
+      "online_status": {
+        "default": "mdi:information-outline"
+      },
       "status": {
         "default": "mdi:information-outline"
       },
+      "self_test_interval": {
+        "default": "mdi:information-outline"
+      },
       "time_left": {
         "default": "mdi:clock-alert"
       },
       "time_on_battery": {
         "default": "mdi:timer-outline"
       },
-      "total_time_on_battery": {
-        "default": "mdi:timer-outline"
-      },
-      "transfer_count": {
-        "default": "mdi:counter"
-      },
-      "transfer_from_battery": {
-        "default": "mdi:transfer"
-      },
-      "transfer_to_battery": {
-        "default": "mdi:transfer"
-      },
       "ups_mode": {
         "default": "mdi:information-outline"
       },
@@ -147,8 +144,11 @@
       "version": {
         "default": "mdi:information-outline"
       },
-      "wake_delay": {
-        "default": "mdi:timer-outline"
+      "transfer_from_battery": {
+        "default": "mdi:transfer"
+      },
+      "transfer_to_battery": {
+        "default": "mdi:transfer"
       }
     }
   }

homeassistant/components/apcupsd/strings.json

@@ -2,24 +2,13 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "wrong_apcupsd_daemon": "The reconfigured APC UPS Daemon is not the same as the one already configured."
+      "wrong_apcupsd_daemon": "The reconfigured APC UPS Daemon is not the same as the one already configured.",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "step": {
-      "reconfigure": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "port": "[%key:common::config_flow::data::port%]"
-        },
-        "data_description": {
-          "host": "[%key:component::apcupsd::config::step::user::data_description::host%]",
-          "port": "[%key:component::apcupsd::config::step::user::data_description::port%]"
-        },
-        "description": "[%key:component::apcupsd::config::step::user::description%]"
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
@@ -30,6 +19,17 @@
           "port": "The port the APC UPS Daemon is listening on"
         },
         "description": "Enter the host and port on which the apcupsd NIS is being served."
+      },
+      "reconfigure": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "host": "[%key:component::apcupsd::config::step::user::data_description::host%]",
+          "port": "[%key:component::apcupsd::config::step::user::data_description::port%]"
+        },
+        "description": "[%key:component::apcupsd::config::step::user::description%]"
       }
     }
   },
@@ -46,21 +46,15 @@
       "ambient_temperature": {
         "name": "Ambient temperature"
       },
-      "apc_model": {
-        "name": "Model"
-      },
       "apc_status": {
         "name": "Status data"
       },
-      "apparent_power": {
-        "name": "Load apparent power"
+      "apc_model": {
+        "name": "Model"
       },
       "bad_batteries": {
         "name": "Bad batteries"
       },
-      "battery_nominal_voltage": {
-        "name": "Battery nominal voltage"
-      },
       "battery_replacement_date": {
         "name": "Battery replaced"
       },
@@ -73,36 +67,45 @@
       "cable_type": {
         "name": "Cable type"
       },
+      "total_time_on_battery": {
+        "name": "Total time on battery"
+      },
       "date": {
         "name": "Status date"
       },
-      "date_and_time": {
-        "name": "Date and time"
-      },
       "dip_switch_settings": {
         "name": "DIP switch settings"
       },
+      "low_battery_signal": {
+        "name": "Low battery signal"
+      },
       "driver": {
         "name": "Driver"
       },
+      "shutdown_delay": {
+        "name": "Shutdown delay"
+      },
+      "wake_delay": {
+        "name": "Wake delay"
+      },
+      "date_and_time": {
+        "name": "Date and time"
+      },
       "external_batteries": {
         "name": "External batteries"
       },
       "firmware_version": {
         "name": "Firmware version"
       },
+      "transfer_high": {
+        "name": "Transfer high"
+      },
       "hostname": {
         "name": "Hostname"
       },
       "humidity": {
         "name": "Ambient humidity"
       },
-      "input_voltage_high": {
-        "name": "Input voltage high"
-      },
-      "input_voltage_low": {
-        "name": "Input voltage low"
-      },
       "internal_temperature": {
         "name": "Internal temperature"
       },
@@ -124,8 +127,11 @@
       "load_capacity": {
         "name": "Load"
       },
-      "low_battery_signal": {
-        "name": "Low battery signal"
+      "apparent_power": {
+        "name": "Load apparent power"
+      },
+      "transfer_low": {
+        "name": "Transfer low"
       },
       "manufacture_date": {
         "name": "Manufacture date"
@@ -133,32 +139,41 @@
       "master_update": {
         "name": "Master update"
       },
-      "max_battery_charge": {
-        "name": "Battery shutdown"
+      "input_voltage_high": {
+        "name": "Input voltage high"
       },
       "max_time": {
         "name": "Battery timeout"
       },
+      "max_battery_charge": {
+        "name": "Battery shutdown"
+      },
+      "input_voltage_low": {
+        "name": "Input voltage low"
+      },
       "min_time": {
         "name": "Shutdown time"
       },
       "model": {
         "name": "Model"
       },
-      "nominal_apparent_power": {
-        "name": "Nominal apparent power"
+      "battery_nominal_voltage": {
+        "name": "Battery nominal voltage"
       },
       "nominal_input_voltage": {
         "name": "Nominal input voltage"
       },
-      "nominal_output_power": {
-        "name": "Nominal output power"
-      },
       "nominal_output_voltage": {
         "name": "Nominal output voltage"
       },
-      "online_status": {
-        "name": "Status flag"
+      "nominal_output_power": {
+        "name": "Nominal output power"
+      },
+      "nominal_apparent_power": {
+        "name": "Nominal apparent power"
+      },
+      "transfer_count": {
+        "name": "Transfer count"
       },
       "output_current": {
         "name": "Output current"
@@ -178,9 +193,6 @@
       "restore_capacity": {
         "name": "Restore requirement"
       },
-      "self_test_interval": {
-        "name": "Self-test interval"
-      },
       "self_test_result": {
         "name": "Self-test result"
       },
@@ -190,39 +202,24 @@
       "serial_number": {
         "name": "Serial number"
       },
-      "shutdown_delay": {
-        "name": "Shutdown delay"
-      },
       "startup_time": {
         "name": "Startup time"
       },
+      "online_status": {
+        "name": "Status flag"
+      },
       "status": {
         "name": "Status"
       },
+      "self_test_interval": {
+        "name": "Self-test interval"
+      },
       "time_left": {
         "name": "Time left"
       },
       "time_on_battery": {
         "name": "Time on battery"
       },
-      "total_time_on_battery": {
-        "name": "Total time on battery"
-      },
-      "transfer_count": {
-        "name": "Transfer count"
-      },
-      "transfer_from_battery": {
-        "name": "Transfer from battery"
-      },
-      "transfer_high": {
-        "name": "Transfer high"
-      },
-      "transfer_low": {
-        "name": "Transfer low"
-      },
-      "transfer_to_battery": {
-        "name": "Transfer to battery"
-      },
       "ups_mode": {
         "name": "Mode"
       },
@@ -232,8 +229,11 @@
       "version": {
         "name": "Daemon version"
       },
-      "wake_delay": {
-        "name": "Wake delay"
+      "transfer_from_battery": {
+        "name": "Transfer from battery"
+      },
+      "transfer_to_battery": {
+        "name": "Transfer to battery"
       }
     }
   },

homeassistant/components/apple_tv/__init__.py

@@ -5,9 +5,14 @@ from __future__ import annotations
 import asyncio
 import logging
 from random import randrange
-import sys
 from typing import Any, cast
 
+from pyatv import connect, exceptions, scan
+from pyatv.conf import AppleTV
+from pyatv.const import DeviceModel, Protocol
+from pyatv.convert import model_str
+from pyatv.interface import AppleTV as AppleTVInterface, DeviceListener
+
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -24,11 +29,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant, callback
-from homeassistant.exceptions import (
-    ConfigEntryAuthFailed,
-    ConfigEntryNotReady,
-    HomeAssistantError,
-)
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import async_dispatcher_send
@@ -42,18 +43,6 @@ from .const import (
     SIGNAL_DISCONNECTED,
 )
 
-if sys.version_info < (3, 14):
-    from pyatv import connect, exceptions, scan
-    from pyatv.conf import AppleTV
-    from pyatv.const import DeviceModel, Protocol
-    from pyatv.convert import model_str
-    from pyatv.interface import AppleTV as AppleTVInterface, DeviceListener
-else:
-
-    class DeviceListener:
-        """Dummy class."""
-
-
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME_TV = "Apple TV"
@@ -64,41 +53,31 @@ BACKOFF_TIME_UPPER_LIMIT = 300  # Five minutes
 
 PLATFORMS = [Platform.MEDIA_PLAYER, Platform.REMOTE]
 
-if sys.version_info < (3, 14):
-    AUTH_EXCEPTIONS = (
-        exceptions.AuthenticationError,
-        exceptions.InvalidCredentialsError,
-        exceptions.NoCredentialsError,
-    )
-    CONNECTION_TIMEOUT_EXCEPTIONS = (
-        OSError,
-        asyncio.CancelledError,
-        TimeoutError,
-        exceptions.ConnectionLostError,
-        exceptions.ConnectionFailedError,
-    )
-    DEVICE_EXCEPTIONS = (
-        exceptions.ProtocolError,
-        exceptions.NoServiceError,
-        exceptions.PairingError,
-        exceptions.BackOffError,
-        exceptions.DeviceIdMissingError,
-    )
-else:
-    AUTH_EXCEPTIONS = ()
-    CONNECTION_TIMEOUT_EXCEPTIONS = ()
-    DEVICE_EXCEPTIONS = ()
-
+AUTH_EXCEPTIONS = (
+    exceptions.AuthenticationError,
+    exceptions.InvalidCredentialsError,
+    exceptions.NoCredentialsError,
+)
+CONNECTION_TIMEOUT_EXCEPTIONS = (
+    OSError,
+    asyncio.CancelledError,
+    TimeoutError,
+    exceptions.ConnectionLostError,
+    exceptions.ConnectionFailedError,
+)
+DEVICE_EXCEPTIONS = (
+    exceptions.ProtocolError,
+    exceptions.NoServiceError,
+    exceptions.PairingError,
+    exceptions.BackOffError,
+    exceptions.DeviceIdMissingError,
+)
 
 type AppleTvConfigEntry = ConfigEntry[AppleTVManager]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: AppleTvConfigEntry) -> bool:
     """Set up a config entry for Apple TV."""
-    if sys.version_info >= (3, 14):
-        raise HomeAssistantError(
-            "Apple TV is not supported on Python 3.14. Please use Python 3.13."
-        )
     manager = AppleTVManager(hass, entry)
 
     if manager.is_on:

homeassistant/components/apple_tv/manifest.json

@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
   "iot_class": "local_push",
   "loggers": ["pyatv", "srptools"],
-  "requirements": ["pyatv==0.16.1;python_version<'3.14'"],
+  "requirements": ["pyatv==0.16.1"],
   "zeroconf": [
     "_mediaremotetv._tcp.local.",
     "_companion-link._tcp.local.",
@@ -17,40 +17,40 @@
     "_appletv-v2._tcp.local.",
     "_hscp._tcp.local.",
     {
+      "type": "_airplay._tcp.local.",
       "properties": {
         "model": "appletv*"
-      },
-      "type": "_airplay._tcp.local."
+      }
     },
     {
+      "type": "_airplay._tcp.local.",
       "properties": {
         "model": "audioaccessory*"
-      },
-      "type": "_airplay._tcp.local."
+      }
     },
     {
+      "type": "_airplay._tcp.local.",
       "properties": {
         "am": "airport*"
-      },
-      "type": "_airplay._tcp.local."
+      }
     },
     {
+      "type": "_raop._tcp.local.",
       "properties": {
         "am": "appletv*"
-      },
-      "type": "_raop._tcp.local."
+      }
     },
     {
+      "type": "_raop._tcp.local.",
       "properties": {
         "am": "audioaccessory*"
-      },
-      "type": "_raop._tcp.local."
+      }
     },
     {
+      "type": "_raop._tcp.local.",
       "properties": {
         "am": "airport*"
-      },
-      "type": "_raop._tcp.local."
+      }
     }
   ]
 }

homeassistant/components/apple_tv/strings.json

@@ -1,74 +1,74 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "backoff": "Device does not accept pairing requests at this time (you might have entered an invalid PIN code too many times), try again later.",
-      "device_did_not_pair": "No attempt to finish pairing process was made from the device.",
-      "device_not_found": "Device was not found during discovery, please try adding it again.",
-      "inconsistent_device": "Expected protocols were not found during discovery. This normally indicates a problem with multicast DNS (Zeroconf). Please try adding the device again.",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "ipv6_not_supported": "IPv6 is not supported.",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "setup_failed": "Failed to set up device.",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "error": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
     "flow_title": "{name} ({type})",
     "step": {
-      "confirm": {
-        "description": "You are about to add `{name}` of type `{type}` to Home Assistant.\n\n**To complete the process, you may have to enter multiple PIN codes.**\n\nPlease note that you will *not* be able to power off your Apple TV with this integration. Only the media player in Home Assistant will turn off!",
-        "title": "Confirm adding Apple TV"
-      },
-      "pair_no_pin": {
-        "description": "Pairing is required for the `{protocol}` service. Please enter PIN {pin} on your device to continue.",
-        "title": "Pairing"
-      },
-      "pair_with_pin": {
-        "data": {
-          "pin": "[%key:common::config_flow::data::pin%]"
-        },
-        "description": "Pairing is required for the `{protocol}` protocol. Please enter the PIN code displayed on screen. Leading zeros shall be omitted, i.e. enter 123 if the displayed code is 0123.",
-        "title": "Pairing"
-      },
-      "password": {
-        "description": "A password is required by `{protocol}`. This is not yet supported, please disable password to continue.",
-        "title": "Password required"
-      },
-      "protocol_disabled": {
-        "description": "Pairing is required for `{protocol}` but it is disabled on the device. Please review potential access restrictions (e.g. allow all devices on the local network to connect) on the device.\n\nYou may continue without pairing this protocol, but some functionality will be limited.",
-        "title": "Pairing not possible"
-      },
-      "restore_device": {
-        "description": "Reconfigure this device to restore its functionality.",
-        "title": "Device reconfiguration"
-      },
-      "service_problem": {
-        "description": "A problem occurred while pairing protocol `{protocol}`. It will be ignored.",
-        "title": "Failed to add service"
-      },
       "user": {
+        "title": "Set up a new Apple TV",
+        "description": "Start by entering the device name (e.g. Kitchen or Bedroom) or IP address of the Apple TV you want to add.\n\nIf you cannot see your device or experience any issues, try specifying the device IP address.",
         "data": {
           "device_input": "[%key:common::config_flow::data::device%]"
-        },
-        "description": "Start by entering the device name (e.g. Kitchen or Bedroom) or IP address of the Apple TV you want to add.\n\nIf you cannot see your device or experience any issues, try specifying the device IP address.",
-        "title": "Set up a new Apple TV"
+        }
+      },
+      "restore_device": {
+        "title": "Device reconfiguration",
+        "description": "Reconfigure this device to restore its functionality."
+      },
+      "pair_with_pin": {
+        "title": "Pairing",
+        "description": "Pairing is required for the `{protocol}` protocol. Please enter the PIN code displayed on screen. Leading zeros shall be omitted, i.e. enter 123 if the displayed code is 0123.",
+        "data": {
+          "pin": "[%key:common::config_flow::data::pin%]"
+        }
+      },
+      "pair_no_pin": {
+        "title": "Pairing",
+        "description": "Pairing is required for the `{protocol}` service. Please enter PIN {pin} on your device to continue."
+      },
+      "protocol_disabled": {
+        "title": "Pairing not possible",
+        "description": "Pairing is required for `{protocol}` but it is disabled on the device. Please review potential access restrictions (e.g. allow all devices on the local network to connect) on the device.\n\nYou may continue without pairing this protocol, but some functionality will be limited."
+      },
+      "confirm": {
+        "title": "Confirm adding Apple TV",
+        "description": "You are about to add `{name}` of type `{type}` to Home Assistant.\n\n**To complete the process, you may have to enter multiple PIN codes.**\n\nPlease note that you will *not* be able to power off your Apple TV with this integration. Only the media player in Home Assistant will turn off!"
+      },
+      "service_problem": {
+        "title": "Failed to add service",
+        "description": "A problem occurred while pairing protocol `{protocol}`. It will be ignored."
+      },
+      "password": {
+        "title": "Password required",
+        "description": "A password is required by `{protocol}`. This is not yet supported, please disable password to continue."
       }
+    },
+    "error": {
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "abort": {
+      "ipv6_not_supported": "IPv6 is not supported.",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "device_did_not_pair": "No attempt to finish pairing process was made from the device.",
+      "backoff": "Device does not accept pairing requests at this time (you might have entered an invalid PIN code too many times), try again later.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "setup_failed": "Failed to set up device.",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "device_not_found": "Device was not found during discovery, please try adding it again.",
+      "inconsistent_device": "Expected protocols were not found during discovery. This normally indicates a problem with multicast DNS (Zeroconf). Please try adding the device again."
     }
   },
   "options": {
     "step": {
       "init": {
+        "description": "Configure general device settings",
         "data": {
           "start_off": "Do not turn device on when starting Home Assistant"
-        },
-        "description": "Configure general device settings"
+        }
       }
     }
   }

homeassistant/components/aprilaire/strings.json

@@ -1,11 +1,5 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "connection_failed": "Connection failed. Please check that the host and port is correct."
-    },
     "step": {
       "user": {
         "data": {
@@ -16,6 +10,12 @@
           "port": "Usually 7000 or 8000"
         }
       }
+    },
+    "error": {
+      "connection_failed": "Connection failed. Please check that the host and port is correct."
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "entity": {
@@ -25,96 +25,96 @@
       }
     },
     "humidifier": {
-      "dehumidifier": {
-        "name": "[%key:component::humidifier::entity_component::dehumidifier::name%]"
-      },
       "humidifier": {
         "name": "[%key:component::humidifier::title%]"
+      },
+      "dehumidifier": {
+        "name": "[%key:component::humidifier::entity_component::dehumidifier::name%]"
       }
     },
     "select": {
       "air_cleaning_event": {
         "name": "Air cleaning event",
         "state": {
-          "allergies": "Allergies (24 hour)",
+          "off": "[%key:common::state::off%]",
           "event_clean": "Event clean (3 hour)",
-          "off": "[%key:common::state::off%]"
+          "allergies": "Allergies (24 hour)"
         }
       },
       "air_cleaning_mode": {
         "name": "Air cleaning mode",
         "state": {
-          "automatic": "Automatic",
+          "off": "[%key:common::state::off%]",
           "constant_clean": "Constant clean",
-          "off": "[%key:common::state::off%]"
+          "automatic": "Automatic"
         }
       },
       "fresh_air_event": {
         "name": "Fresh air event",
         "state": {
+          "off": "[%key:common::state::off%]",
           "3hour": "3 hour event",
-          "24hour": "24 hour event",
-          "off": "[%key:common::state::off%]"
+          "24hour": "24 hour event"
         }
       },
       "fresh_air_mode": {
         "name": "Fresh air mode",
         "state": {
-          "automatic": "[%key:component::aprilaire::entity::select::air_cleaning_mode::state::automatic%]",
-          "off": "[%key:common::state::off%]"
+          "off": "[%key:common::state::off%]",
+          "automatic": "[%key:component::aprilaire::entity::select::air_cleaning_mode::state::automatic%]"
         }
       }
     },
     "sensor": {
-      "air_cleaning_status": {
-        "name": "Air cleaning status",
-        "state": {
-          "idle": "[%key:common::state::idle%]",
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]"
-        }
+      "indoor_humidity_controlling_sensor": {
+        "name": "Indoor humidity controlling sensor"
+      },
+      "outdoor_humidity_controlling_sensor": {
+        "name": "Outdoor humidity controlling sensor"
+      },
+      "indoor_temperature_controlling_sensor": {
+        "name": "Indoor temperature controlling sensor"
+      },
+      "outdoor_temperature_controlling_sensor": {
+        "name": "Outdoor temperature controlling sensor"
       },
       "dehumidification_status": {
         "name": "Dehumidification status",
         "state": {
           "idle": "[%key:common::state::idle%]",
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]"
-        }
-      },
-      "fan_status": {
-        "name": "Fan status",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]"
+          "on": "[%key:common::state::on%]",
+          "off": "[%key:common::state::off%]"
         }
       },
       "humidification_status": {
         "name": "Humidification status",
         "state": {
           "idle": "[%key:common::state::idle%]",
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]"
+          "on": "[%key:common::state::on%]",
+          "off": "[%key:common::state::off%]"
         }
       },
-      "indoor_humidity_controlling_sensor": {
-        "name": "Indoor humidity controlling sensor"
-      },
-      "indoor_temperature_controlling_sensor": {
-        "name": "Indoor temperature controlling sensor"
-      },
-      "outdoor_humidity_controlling_sensor": {
-        "name": "Outdoor humidity controlling sensor"
-      },
-      "outdoor_temperature_controlling_sensor": {
-        "name": "Outdoor temperature controlling sensor"
-      },
       "ventilation_status": {
         "name": "Ventilation status",
         "state": {
           "idle": "[%key:common::state::idle%]",
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]"
+          "on": "[%key:common::state::on%]",
+          "off": "[%key:common::state::off%]"
+        }
+      },
+      "air_cleaning_status": {
+        "name": "Air cleaning status",
+        "state": {
+          "idle": "[%key:common::state::idle%]",
+          "on": "[%key:common::state::on%]",
+          "off": "[%key:common::state::off%]"
+        }
+      },
+      "fan_status": {
+        "name": "Fan status",
+        "state": {
+          "on": "[%key:common::state::on%]",
+          "off": "[%key:common::state::off%]"
         }
       }
     }

homeassistant/components/apsystems/strings.json

@@ -1,11 +1,5 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
     "step": {
       "user": {
         "data": {
@@ -16,29 +10,39 @@
           "port": "The integration will default to 8050, if not set, which should be suitable for most installs"
         }
       }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "entity": {
     "binary_sensor": {
+      "off_grid_status": {
+        "name": "Off-grid status"
+      },
       "dc_1_short_circuit_error_status": {
         "name": "DC 1 short circuit error status"
       },
       "dc_2_short_circuit_error_status": {
         "name": "DC 2 short circuit error status"
       },
-      "off_grid_status": {
-        "name": "Off-grid status"
-      },
       "output_fault_status": {
         "name": "Output fault status"
       }
     },
-    "number": {
-      "max_output": {
-        "name": "Max output"
-      }
-    },
     "sensor": {
+      "total_power": {
+        "name": "Total power"
+      },
+      "total_power_p1": {
+        "name": "Power of P1"
+      },
+      "total_power_p2": {
+        "name": "Power of P2"
+      },
       "lifetime_production": {
         "name": "Total lifetime production"
       },
@@ -56,15 +60,11 @@
       },
       "today_production_p2": {
         "name": "Production of today from P2"
-      },
-      "total_power": {
-        "name": "Total power"
-      },
-      "total_power_p1": {
-        "name": "Power of P1"
-      },
-      "total_power_p2": {
-        "name": "Power of P2"
+      }
+    },
+    "number": {
+      "max_output": {
+        "name": "Max output"
       }
     },
     "switch": {

homeassistant/components/aquacell/icons.json

@@ -13,9 +13,9 @@
       "wi_fi_strength": {
         "default": "mdi:wifi",
         "state": {
-          "high": "mdi:wifi-strength-4",
           "low": "mdi:wifi-strength-1",
-          "medium": "mdi:wifi-strength-2"
+          "medium": "mdi:wifi-strength-2",
+          "high": "mdi:wifi-strength-4"
         }
       }
     }

homeassistant/components/aquacell/strings.json

@@ -1,22 +1,22 @@
 {
   "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    "step": {
+      "user": {
+        "description": "Select the brand of the softener and fill in your softener mobile app credentials",
+        "data": {
+          "brand": "Brand",
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
-    "step": {
-      "user": {
-        "data": {
-          "brand": "Brand",
-          "email": "[%key:common::config_flow::data::email%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "description": "Select the brand of the softener and fill in your softener mobile app credentials"
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "entity": {
@@ -27,21 +27,21 @@
       "salt_left_side_percentage": {
         "name": "Salt left side percentage"
       },
-      "salt_left_side_time_remaining": {
-        "name": "Salt left side time remaining"
-      },
       "salt_right_side_percentage": {
         "name": "Salt right side percentage"
       },
+      "salt_left_side_time_remaining": {
+        "name": "Salt left side time remaining"
+      },
       "salt_right_side_time_remaining": {
         "name": "Salt right side time remaining"
       },
       "wi_fi_strength": {
         "name": "Wi-Fi strength",
         "state": {
-          "high": "[%key:common::state::high%]",
           "low": "[%key:common::state::low%]",
-          "medium": "[%key:common::state::medium%]"
+          "medium": "[%key:common::state::medium%]",
+          "high": "[%key:common::state::high%]"
         }
       }
     }

homeassistant/components/aranet/icons.json

@@ -1,10 +1,10 @@
 {
   "entity": {
     "sensor": {
-      "radiation_rate": {
+      "radiation_total": {
         "default": "mdi:radioactive"
       },
-      "radiation_total": {
+      "radiation_rate": {
         "default": "mdi:radioactive"
       },
       "radon_concentration": {

homeassistant/components/aranet/manifest.json

@@ -3,14 +3,14 @@
   "name": "Aranet",
   "bluetooth": [
     {
-      "connectable": false,
       "manufacturer_id": 1794,
-      "service_uuid": "f0cd1400-95da-4f4b-9ac8-aa55d312af0c"
+      "service_uuid": "f0cd1400-95da-4f4b-9ac8-aa55d312af0c",
+      "connectable": false
     },
     {
-      "connectable": false,
       "manufacturer_id": 1794,
-      "service_uuid": "0000fce0-0000-1000-8000-00805f9b34fb"
+      "service_uuid": "0000fce0-0000-1000-8000-00805f9b34fb",
+      "connectable": false
     }
   ],
   "codeowners": ["@aschmitz", "@thecode", "@anrijs"],

homeassistant/components/aranet/strings.json

@@ -1,25 +1,25 @@
 {
   "config": {
+    "step": {
+      "user": {
+        "description": "[%key:component::bluetooth::config::step::user::description%]",
+        "data": {
+          "address": "[%key:common::config_flow::data::device%]"
+        }
+      },
+      "bluetooth_confirm": {
+        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
+      }
+    },
+    "flow_title": "{name}",
+    "error": {
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "integrations_disabled": "This device doesn't have integrations enabled. Please enable smart home integrations using the app and try again.",
       "no_devices_found": "No unconfigured Aranet devices found.",
       "outdated_version": "This device is using outdated firmware. Please update it to at least v1.2.0 and try again."
-    },
-    "error": {
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "flow_title": "{name}",
-    "step": {
-      "bluetooth_confirm": {
-        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
-      },
-      "user": {
-        "data": {
-          "address": "[%key:common::config_flow::data::device%]"
-        },
-        "description": "[%key:component::bluetooth::config::step::user::description%]"
-      }
     }
   },
   "entity": {
@@ -28,8 +28,8 @@
         "state": {
           "error": "[%key:common::state::error%]",
           "green": "Green",
-          "red": "Red",
-          "yellow": "Yellow"
+          "yellow": "Yellow",
+          "red": "Red"
         }
       }
     }