Bumped version to 1.0.0b3

Fix ignored Axis config entries doesn't break set up of new entries (#44062 )
Some lights only support hs, like the lidl christmas lights (#44059 )
2025-09-25 12:59:29 +00:00 · 2020-12-09 19:08:29 +01:00 · 2020-12-09 19:07:38 +01:00 · 2020-12-09 19:07:34 +01:00 · 2020-12-09 19:07:29 +01:00 · 2020-12-09 19:07:25 +01:00
4730 changed files with 64093 additions and 23380 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -48,7 +48,9 @@ omit =
    homeassistant/components/anel_pwrctrl/switch.py
    homeassistant/components/anthemav/media_player.py
    homeassistant/components/apcupsd/*
-    homeassistant/components/apple_tv/*
+    homeassistant/components/apple_tv/__init__.py
+    homeassistant/components/apple_tv/media_player.py
+    homeassistant/components/apple_tv/remote.py
    homeassistant/components/aqualogic/*
    homeassistant/components/aquostv/media_player.py
    homeassistant/components/arcam_fmj/media_player.py
@@ -65,6 +67,9 @@ omit =
    homeassistant/components/asterisk_mbox/*
    homeassistant/components/aten_pe/*
    homeassistant/components/atome/*
+    homeassistant/components/aurora/__init__.py
+    homeassistant/components/aurora/binary_sensor.py
+    homeassistant/components/aurora/const.py
    homeassistant/components/aurora_abb_powerone/sensor.py
    homeassistant/components/avea/light.py
    homeassistant/components/avion/light.py
@@ -119,7 +124,6 @@ omit =
    homeassistant/components/buienradar/weather.py
    homeassistant/components/caldav/calendar.py
    homeassistant/components/canary/camera.py
-    homeassistant/components/cast/*
    homeassistant/components/cert_expiry/helper.py
    homeassistant/components/channels/*
    homeassistant/components/circuit/*
@@ -260,6 +264,11 @@ omit =
    homeassistant/components/fibaro/*
    homeassistant/components/filesize/sensor.py
    homeassistant/components/fints/sensor.py
+    homeassistant/components/fireservicerota/__init__.py
+    homeassistant/components/fireservicerota/binary_sensor.py
+    homeassistant/components/fireservicerota/const.py
+    homeassistant/components/fireservicerota/sensor.py
+    homeassistant/components/fireservicerota/switch.py
    homeassistant/components/firmata/__init__.py
    homeassistant/components/firmata/binary_sensor.py
    homeassistant/components/firmata/board.py
@@ -305,6 +314,7 @@ omit =
    homeassistant/components/garmin_connect/__init__.py
    homeassistant/components/garmin_connect/const.py
    homeassistant/components/garmin_connect/sensor.py
+    homeassistant/components/garmin_connect/alarm_util.py
    homeassistant/components/gc100/*
    homeassistant/components/geniushub/*
    homeassistant/components/geizhals/sensor.py
@@ -377,7 +387,6 @@ omit =
    homeassistant/components/hvv_departures/__init__.py
    homeassistant/components/hydrawise/*
    homeassistant/components/hyperion/light.py
-    homeassistant/components/ialarm/alarm_control_panel.py
    homeassistant/components/iammeter/sensor.py
    homeassistant/components/iaqualink/binary_sensor.py
    homeassistant/components/iaqualink/climate.py
@@ -460,6 +469,7 @@ omit =
    homeassistant/components/lametric/*
    homeassistant/components/lannouncer/notify.py
    homeassistant/components/lastfm/sensor.py
+    homeassistant/components/launch_library/const.py
    homeassistant/components/launch_library/sensor.py
    homeassistant/components/lcn/*
    homeassistant/components/lg_netcast/media_player.py
@@ -533,12 +543,16 @@ omit =
    homeassistant/components/minio/*
    homeassistant/components/mitemp_bt/sensor.py
    homeassistant/components/mjpeg/camera.py
-    homeassistant/components/mobile_app/*
    homeassistant/components/mochad/*
    homeassistant/components/modbus/climate.py
    homeassistant/components/modbus/cover.py
    homeassistant/components/modbus/switch.py
+    homeassistant/components/modbus/sensor.py
    homeassistant/components/modem_callerid/sensor.py
+    homeassistant/components/motion_blinds/__init__.py
+    homeassistant/components/motion_blinds/const.py
+    homeassistant/components/motion_blinds/cover.py
+    homeassistant/components/motion_blinds/sensor.py
    homeassistant/components/mpchc/media_player.py
    homeassistant/components/mpd/media_player.py
    homeassistant/components/mqtt_room/sensor.py
@@ -560,7 +574,18 @@ omit =
    homeassistant/components/neato/vacuum.py
    homeassistant/components/nederlandse_spoorwegen/sensor.py
    homeassistant/components/nello/lock.py
-    homeassistant/components/nest/*
+    homeassistant/components/nest/__init__.py
+    homeassistant/components/nest/api.py
+    homeassistant/components/nest/binary_sensor.py
+    homeassistant/components/nest/camera.py
+    homeassistant/components/nest/camera_legacy.py
+    homeassistant/components/nest/camera_sdm.py
+    homeassistant/components/nest/climate.py
+    homeassistant/components/nest/climate_legacy.py
+    homeassistant/components/nest/climate_sdm.py
+    homeassistant/components/nest/local_auth.py
+    homeassistant/components/nest/sensor.py
+    homeassistant/components/nest/sensor_legacy.py
    homeassistant/components/netatmo/__init__.py
    homeassistant/components/netatmo/api.py
    homeassistant/components/netatmo/camera.py
@@ -632,7 +657,6 @@ omit =
    homeassistant/components/openuv/sensor.py
    homeassistant/components/openweathermap/sensor.py
    homeassistant/components/openweathermap/weather.py
-    homeassistant/components/openweathermap/forecast_update_coordinator.py
    homeassistant/components/openweathermap/weather_update_coordinator.py
    homeassistant/components/openweathermap/abstract_owm_sensor.py
    homeassistant/components/opnsense/*
@@ -667,6 +691,7 @@ omit =
    homeassistant/components/pjlink/media_player.py
    homeassistant/components/plaato/*
    homeassistant/components/plex/media_player.py
+    homeassistant/components/plex/models.py
    homeassistant/components/plex/sensor.py
    homeassistant/components/plum_lightpad/light.py
    homeassistant/components/pocketcasts/sensor.py
@@ -709,6 +734,7 @@ omit =
    homeassistant/components/rainforest_eagle/sensor.py
    homeassistant/components/raspihats/*
    homeassistant/components/raspyrfm/*
+    homeassistant/components/recollect_waste/__init__.py
    homeassistant/components/recollect_waste/sensor.py
    homeassistant/components/recswitch/switch.py
    homeassistant/components/reddit/*
@@ -730,6 +756,7 @@ omit =
    homeassistant/components/roomba/vacuum.py
    homeassistant/components/roon/__init__.py
    homeassistant/components/roon/const.py
+    homeassistant/components/roon/media_browser.py
    homeassistant/components/roon/media_player.py
    homeassistant/components/roon/server.py
    homeassistant/components/route53/*
@@ -745,7 +772,6 @@ omit =
    homeassistant/components/russound_rnet/media_player.py
    homeassistant/components/sabnzbd/*
    homeassistant/components/saj/sensor.py
-    homeassistant/components/salt/device_tracker.py
    homeassistant/components/satel_integra/*
    homeassistant/components/schluter/*
    homeassistant/components/scrape/sensor.py
@@ -770,6 +796,7 @@ omit =
    homeassistant/components/shelly/light.py
    homeassistant/components/shelly/sensor.py
    homeassistant/components/shelly/switch.py
+    homeassistant/components/shelly/utils.py
    homeassistant/components/sht31/sensor.py
    homeassistant/components/sigfox/sensor.py
    homeassistant/components/simplepush/notify.py
@@ -820,6 +847,7 @@ omit =
    homeassistant/components/spotcrime/sensor.py
    homeassistant/components/spotify/__init__.py
    homeassistant/components/spotify/media_player.py
+    homeassistant/components/spotify/system_health.py
    homeassistant/components/squeezebox/__init__.py
    homeassistant/components/squeezebox/browse_media.py
    homeassistant/components/squeezebox/media_player.py
@@ -934,7 +962,6 @@ omit =
    homeassistant/components/twilio_call/notify.py
    homeassistant/components/twilio_sms/notify.py
    homeassistant/components/twitter/notify.py
-    homeassistant/components/ubee/device_tracker.py
    homeassistant/components/ubus/device_tracker.py
    homeassistant/components/ue_smart_radio/media_player.py
    homeassistant/components/unifiled/*
@@ -1053,7 +1080,6 @@ omit =
    homeassistant/components/zha/core/device.py
    homeassistant/components/zha/core/gateway.py
    homeassistant/components/zha/core/helpers.py
-    homeassistant/components/zha/core/patches.py
    homeassistant/components/zha/core/registries.py
    homeassistant/components/zha/core/typing.py
    homeassistant/components/zha/entity.py
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -12,17 +12,21 @@
    "redhat.vscode-yaml",
    "esbenp.prettier-vscode"
  ],
+  // Please keep this file in sync with settings in home-assistant/.vscode/settings.default.json
  "settings": {
    "python.pythonPath": "/usr/local/bin/python",
    "python.linting.pylintEnabled": true,
    "python.linting.enabled": true,
    "python.formatting.provider": "black",
+    "python.testing.pytestArgs": ["--no-cov"],
+    "python.testing.pytestEnabled": true,
    "editor.formatOnPaste": false,
    "editor.formatOnSave": true,
    "editor.formatOnType": true,
    "files.trimTrailingWhitespace": true,
    "terminal.integrated.shell.linux": "/bin/bash",
    "yaml.customTags": [
+      "!input scalar",
      "!secret scalar",
      "!include_dir_named scalar",
      "!include_dir_list scalar",
--- a/.github/lock.yml
+++ b/.github/lock.yml
@@ -1,27 +0,0 @@
-# Configuration for Lock Threads - https://github.com/dessant/lock-threads
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 1
-
-# Skip issues and pull requests created before a given timestamp. Timestamp must
-# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
-skipCreatedBefore: 2019-07-01
-
-# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
-exemptLabels: []
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
-lockLabel: false
-
-# Comment to post before locking. Set to `false` to disable
-lockComment: false
-
-# Assign `resolved` as the reason for locking. Set to `false` to disable
-setLockReason: false
-
-# Limit to only `issues` or `pulls`
-only: pulls
-
-# Optionally, specify configuration settings just for `issues` or `pulls`
-issues:
-  daysUntilLock: 30
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,66 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 90
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 7
-
-# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
-onlyLabels: []
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels:
-  - under investigation
-  - Help wanted
-
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: true
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: true
-
-# Set to true to ignore issues with an assignee (defaults to false)
-exemptAssignees: false
-
-# Label to use when marking as stale
-staleLabel: stale
-
-# Comment to post when marking as stale. Set to `false` to disable
-markComment: >
-  There hasn't been any activity on this issue recently. Due to the high number
-  of incoming GitHub notifications, we have to clean some of the old issues,
-  as many of them have already been resolved with the latest updates.
-
-  Please make sure to update to the latest Home Assistant version and check
-  if that solves the issue. Let us know if that works for you by adding a
-  comment 👍
-
-  This issue now has been marked as stale and will be closed if no further
-  activity occurs. Thank you for your contributions.
-
-# Comment to post when removing the stale label.
-# unmarkComment: >
-#   Your comment here.
-
-# Comment to post when closing a stale Issue or Pull Request.
-# closeComment: >
-#   Your comment here.
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Handle pull requests a little bit faster and with an adjusted comment.
-pulls:
-  daysUntilStale: 30
-  exemptProjects: false
-  markComment: >
-    There hasn't been any activity on this pull request recently. This pull
-    request has been automatically marked as stale because of that and will
-    be closed if no further activity occurs within 7 days.
-
-    Thank you for your contributions.
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,7 +48,7 @@ jobs:
        run: |
          python -m venv venv
          . venv/bin/activate
-          pip install -U pip setuptools
+          pip install -U "pip<20.3" setuptools
          pip install -r requirements.txt -r requirements_test.txt
      - name: Restore pre-commit environment from cache
        id: cache-precommit
@@ -214,11 +214,11 @@ jobs:
        run: |
          echo "::add-matcher::.github/workflows/matchers/hadolint.json"
      - name: Check Dockerfile
-        uses: docker://hadolint/hadolint:v1.18.0
+        uses: docker://hadolint/hadolint:v1.18.2
        with:
          args: hadolint Dockerfile
      - name: Check Dockerfile.dev
-        uses: docker://hadolint/hadolint:v1.18.0
+        uses: docker://hadolint/hadolint:v1.18.2
        with:
          args: hadolint Dockerfile.dev

@@ -590,7 +590,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name:
+          Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache@v2
        with:
@@ -604,12 +605,13 @@ jobs:
            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ matrix.python-version }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('requirements_all.txt') }}
            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ matrix.python-version }}-${{ hashFiles('requirements_test.txt') }}
            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ matrix.python-version }}-
-      - name: Create full Python ${{ matrix.python-version }} virtual environment
+      - name:
+          Create full Python ${{ matrix.python-version }} virtual environment
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
          python -m venv venv
          . venv/bin/activate
-          pip install -U pip setuptools wheel
+          pip install -U "pip<20.3" setuptools wheel
          pip install -r requirements_all.txt
          pip install -r requirements_test.txt
          pip install -e .
@@ -625,7 +627,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name:
+          Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache@v2
        with:
@@ -659,7 +662,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name:
+          Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache@v2
        with:
@@ -695,7 +699,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name:
+          Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache@v2
        with:
@@ -736,7 +741,7 @@ jobs:
            -p no:sugar \
            tests
      - name: Upload coverage artifact
-        uses: actions/upload-artifact@v2.2.0
+        uses: actions/upload-artifact@v2.2.1
        with:
          name: coverage-${{ matrix.python-version }}-group${{ matrix.group }}
          path: .coverage
@@ -755,7 +760,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name:
+          Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache@v2
        with:
@@ -779,4 +785,4 @@ jobs:
          coverage report --fail-under=94
          coverage xml
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.0.14
+        uses: codecov/codecov-action@v1.0.15
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -0,0 +1,20 @@
+name: Lock
+
+# yamllint disable-line rule:truthy
+on:
+  schedule:
+    - cron: "0 * * * *"
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2.0.1
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: "30"
+          issue-exclude-created-before: "2020-10-01T00:00:00Z"
+          issue-lock-reason: ""
+          pr-lock-inactive-days: "1"
+          pr-exclude-created-before: "2020-11-01T00:00:00Z"
+          pr-lock-reason: ""
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,84 @@
+name: Stale
+
+# yamllint disable-line rule:truthy
+on:
+  schedule:
+    - cron: "0 * * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      # The 90 day stale policy
+      # Used for: Everything (unless 30 day policy below beats it)
+      - name: 90 days stale policy
+        uses: actions/stale@v3.0.14
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: 90
+          days-before-close: 7
+          operations-per-run: 25
+          remove-stale-when-updated: true
+          stale-issue-label: "stale"
+          exempt-issue-labels: "no-stale,Help%20wanted,help-wanted"
+          stale-issue-message: >
+            There hasn't been any activity on this issue recently. Due to the
+            high number of incoming GitHub notifications, we have to clean some
+            of the old issues, as many of them have already been resolved with
+            the latest updates.
+
+            Please make sure to update to the latest Home Assistant version and
+            check if that solves the issue. Let us know if that works for you by
+            adding a comment 👍
+
+            This issue has now been marked as stale and will be closed if no
+            further activity occurs. Thank you for your contributions.
+
+          stale-pr-label: "stale"
+          exempt-pr-labels: "no-stale"
+          stale-pr-message: >
+            There hasn't been any activity on this pull request recently. This
+            pull request has been automatically marked as stale because of that
+            and will be closed if no further activity occurs within 7 days.
+
+            Thank you for your contributions.
+
+      # The 30 day stale policy
+      # Used for:
+      # - Issues that are pending more information (incomplete issues)
+      # - PRs that are not marked as new-integration
+      - name: 30 days stale policy
+        uses: actions/stale@v3.0.14
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          # PRs have a CLA signed label, we can misuse it to apply this policy
+          only-labels: "cla-signed,needs-more-information"
+          days-before-stale: 30
+          days-before-close: 7
+          operations-per-run: 5
+          remove-stale-when-updated: true
+          stale-issue-label: "stale"
+          exempt-issue-labels: "no-stale,Help%20wanted,help-wanted"
+          stale-issue-message: >
+            There hasn't been any activity on this issue recently. Due to the
+            high number of incoming GitHub notifications, we have to clean some
+            of the old issues, as many of them have already been resolved with
+            the latest updates.
+
+            Please make sure to update to the latest Home Assistant version and
+            check if that solves the issue. Let us know if that works for you by
+            adding a comment 👍
+
+            This issue has now been marked as stale and will be closed if no
+            further activity occurs. Thank you for your contributions.
+
+          stale-pr-label: "stale"
+          # Exempt new integrations, these often take more time.
+          # They will automatically be handled by the 90 day version above.
+          exempt-pr-labels: "no-stale,new-integration"
+          stale-pr-message: >
+            There hasn't been any activity on this pull request recently. This
+            pull request has been automatically marked as stale because of that
+            and will be closed if no further activity occurs within 7 days.
+
+            Thank you for your contributions.
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -48,6 +48,7 @@ repos:
      - id: check-executables-have-shebangs
        stages: [manual]
      - id: check-json
+        exclude: (.vscode|.devcontainer)
      - id: no-commit-to-branch
        args:
          - --branch=dev
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: bionic
+dist: focal
 addons:
  apt:
    packages:
@@ -11,9 +11,6 @@ addons:
      - libswscale-dev
      - libswresample-dev
      - libavfilter-dev
-    sources:
-      - sourceline: ppa:savoury1/ffmpeg4
-      - sourceline: ppa:savoury1/multimedia

 python:
  - "3.7.1"
@@ -42,4 +39,4 @@ cache:
    - $HOME/.cache/pre-commit
 install: pip install -U tox tox-travis
 language: python
-script: ${TRAVIS_WAIT:+travis_wait $TRAVIS_WAIT} tox --develop ${TOX_ARGS-}
+script: ${TRAVIS_WAIT:+travis_wait $TRAVIS_WAIT} tox -vv --develop ${TOX_ARGS-}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Home Assistant",
+      "type": "python",
+      "request": "launch",
+      "module": "homeassistant",
+      "args": ["--debug", "-c", "config"]
+    }
+  ]
+}
--- a/.vscode/settings.default.json
+++ b/.vscode/settings.default.json
@@ -0,0 +1,9 @@
+{
+  // Please keep this file in sync with settings in home-assistant/.devcontainer/devcontainer.json
+  "python.formatting.provider": "black",
+  // Added --no-cov to work around TypeError: message must be set
+  // https://github.com/microsoft/vscode-python/issues/14067
+  "python.testing.pytestArgs": ["--no-cov"],
+  // https://code.visualstudio.com/docs/python/testing#_pytest-configuration-settings
+  "python.testing.pytestEnabled": true
+}
--- a/39
+++ b/39
@@ -9,6 +9,12 @@ homeassistant/*.py @home-assistant/core
 homeassistant/helpers/* @home-assistant/core
 homeassistant/util/* @home-assistant/core

+# Home Assistant Supervisor
+build.json @home-assistant/supervisor
+machine/* @home-assistant/supervisor
+rootfs/* @home-assistant/supervisor
+Dockerfile @home-assistant/supervisor
+
 # Other code
 homeassistant/scripts/check_config.py @kellerza

@@ -31,6 +37,7 @@ homeassistant/components/amcrest/* @pnbruckner
 homeassistant/components/androidtv/* @JeffLIrion
 homeassistant/components/apache_kafka/* @bachya
 homeassistant/components/api/* @home-assistant/core
+homeassistant/components/apple_tv/* @postlund
 homeassistant/components/apprise/* @caronc
 homeassistant/components/aprs/* @PhilRW
 homeassistant/components/arcam_fmj/* @elupus
@@ -42,6 +49,7 @@ homeassistant/components/atag/* @MatsNL
 homeassistant/components/aten_pe/* @mtdcr
 homeassistant/components/atome/* @baqs
 homeassistant/components/august/* @bdraco
+homeassistant/components/aurora/* @djtimca
 homeassistant/components/aurora_abb_powerone/* @davet2001
 homeassistant/components/auth/* @home-assistant/core
 homeassistant/components/automation/* @home-assistant/core
@@ -58,6 +66,7 @@ homeassistant/components/bitcoin/* @fabaff
 homeassistant/components/bizkaibus/* @UgaitzEtxebarria
 homeassistant/components/blebox/* @gadgetmobile
 homeassistant/components/blink/* @fronzbot
+homeassistant/components/blueprint/* @home-assistant/core
 homeassistant/components/bmp280/* @belidzs
 homeassistant/components/bmw_connected_drive/* @gerard33 @rikroe
 homeassistant/components/bond/* @prystupa
@@ -76,6 +85,7 @@ homeassistant/components/cisco_mobility_express/* @fbradyirl
 homeassistant/components/cisco_webex_teams/* @fbradyirl
 homeassistant/components/cloud/* @home-assistant/cloud
 homeassistant/components/cloudflare/* @ludeeus @ctalkington
+homeassistant/components/color_extractor/* @GenericStudent
 homeassistant/components/comfoconnect/* @michaelarnauts
 homeassistant/components/config/* @home-assistant/core
 homeassistant/components/configurator/* @home-assistant/core
@@ -108,7 +118,6 @@ homeassistant/components/dunehd/* @bieniu
 homeassistant/components/dwd_weather_warnings/* @runningman84 @stephan192 @Hummel95
 homeassistant/components/dweet/* @fabaff
 homeassistant/components/dynalite/* @ziv1234
-homeassistant/components/dyson/* @etheralm
 homeassistant/components/eafm/* @Jc2k
 homeassistant/components/ecobee/* @marthoc
 homeassistant/components/ecovacs/* @OverloadUT
@@ -123,9 +132,11 @@ homeassistant/components/emoncms/* @borpin
 homeassistant/components/emulated_kasa/* @kbickar
 homeassistant/components/enigma2/* @fbradyirl
 homeassistant/components/enocean/* @bdurrer
+homeassistant/components/enphase_envoy/* @gtdiehl
 homeassistant/components/entur_public_transport/* @hfurubotten
 homeassistant/components/environment_canada/* @michaeldavie
 homeassistant/components/ephember/* @ttroy50
+homeassistant/components/epson/* @pszafer
 homeassistant/components/epsonworkforce/* @ThaStealth
 homeassistant/components/eq3btsmart/* @rytilahti
 homeassistant/components/esphome/* @OttoWinter
@@ -135,6 +146,7 @@ homeassistant/components/ezviz/* @baqs
 homeassistant/components/fastdotcom/* @rohankapoorcom
 homeassistant/components/file/* @fabaff
 homeassistant/components/filter/* @dgomes
+homeassistant/components/fireservicerota/* @cyberjunky
 homeassistant/components/firmata/* @DaAwesomeP
 homeassistant/components/fixer/* @fabaff
 homeassistant/components/flick_electric/* @ZephireNZ
@@ -169,7 +181,7 @@ homeassistant/components/group/* @home-assistant/core
 homeassistant/components/growatt_server/* @indykoning
 homeassistant/components/guardian/* @bachya
 homeassistant/components/harmony/* @ehendrix23 @bramkragten @bdraco
-homeassistant/components/hassio/* @home-assistant/hass-io
+homeassistant/components/hassio/* @home-assistant/supervisor
 homeassistant/components/hdmi_cec/* @newAM
 homeassistant/components/heatmiser/* @andylockran
 homeassistant/components/heos/* @andrewsayre
@@ -186,7 +198,6 @@ homeassistant/components/homekit/* @bdraco
 homeassistant/components/homekit_controller/* @Jc2k
 homeassistant/components/homematic/* @pvizeli @danielperna84
 homeassistant/components/homematicip_cloud/* @SukramJ
-homeassistant/components/honeywell/* @zxdavb
 homeassistant/components/http/* @home-assistant/core
 homeassistant/components/huawei_lte/* @scop @fphammerle
 homeassistant/components/huawei_router/* @abmantis
@@ -231,6 +242,7 @@ homeassistant/components/keyboard_remote/* @bendavid
 homeassistant/components/knx/* @Julius2342 @farmio @marvin-w
 homeassistant/components/kodi/* @OnFreund @cgtobi
 homeassistant/components/konnected/* @heythisisnate @kit-klein
+homeassistant/components/kulersky/* @emlove
 homeassistant/components/lametric/* @robbiet480
 homeassistant/components/launch_library/* @ludeeus
 homeassistant/components/lcn/* @alengwenus
@@ -257,7 +269,7 @@ homeassistant/components/met/* @danielhiversen @thimic
 homeassistant/components/meteo_france/* @hacf-fr @oncleben31 @Quentame
 homeassistant/components/meteoalarm/* @rolfberkenbosch
 homeassistant/components/metoffice/* @MrHarcombe
-homeassistant/components/miflora/* @danielhiversen @ChristianKuehnel @basnijholt
+homeassistant/components/miflora/* @danielhiversen @basnijholt
 homeassistant/components/mikrotik/* @engrbm87
 homeassistant/components/mill/* @danielhiversen
 homeassistant/components/min_max/* @fabaff
@@ -267,6 +279,7 @@ homeassistant/components/mobile_app/* @robbiet480
 homeassistant/components/modbus/* @adamchengtkc @janiversen @vzahradnik
 homeassistant/components/monoprice/* @etsinko @OnFreund
 homeassistant/components/moon/* @fabaff
+homeassistant/components/motion_blinds/* @starkillerOG
 homeassistant/components/mpd/* @fabaff
 homeassistant/components/mqtt/* @home-assistant/core @emontnemery
 homeassistant/components/msteams/* @peroyvind
@@ -297,6 +310,7 @@ homeassistant/components/nsw_rural_fire_service_feed/* @exxamalte
 homeassistant/components/nuheat/* @bdraco
 homeassistant/components/nuki/* @pschmitt @pvizeli
 homeassistant/components/numato/* @clssn
+homeassistant/components/number/* @home-assistant/core @Shulyaka
 homeassistant/components/nut/* @bdraco
 homeassistant/components/nws/* @MatthewFlamm
 homeassistant/components/nzbget/* @chriscla
@@ -311,7 +325,7 @@ homeassistant/components/openerz/* @misialq
 homeassistant/components/opengarage/* @danielhiversen
 homeassistant/components/opentherm_gw/* @mvn23
 homeassistant/components/openuv/* @bachya
-homeassistant/components/openweathermap/* @fabaff @freekode
+homeassistant/components/openweathermap/* @fabaff @freekode @nzapponi
 homeassistant/components/opnsense/* @mtreinish
 homeassistant/components/orangepi_gpio/* @pascallj
 homeassistant/components/oru/* @bvlaicu
@@ -326,9 +340,8 @@ homeassistant/components/pi4ioe5v9xxxx/* @antonverburg
 homeassistant/components/pi_hole/* @fabaff @johnluetke @shenxn
 homeassistant/components/pilight/* @trekky12
 homeassistant/components/plaato/* @JohNan
-homeassistant/components/plant/* @ChristianKuehnel
 homeassistant/components/plex/* @jjlawren
-homeassistant/components/plugwise/* @CoMPaTech @bouwew
+homeassistant/components/plugwise/* @CoMPaTech @bouwew @brefra
 homeassistant/components/plum_lightpad/* @ColinHarrington @prystupa
 homeassistant/components/point/* @fredrike
 homeassistant/components/poolsense/* @haemishkyd
@@ -353,6 +366,7 @@ homeassistant/components/raincloud/* @vanstinator
 homeassistant/components/rainforest_eagle/* @gtdiehl @jcalbert
 homeassistant/components/rainmachine/* @bachya
 homeassistant/components/random/* @fabaff
+homeassistant/components/recollect_waste/* @bachya
 homeassistant/components/rejseplanen/* @DarkFox
 homeassistant/components/repetier/* @MTrab
 homeassistant/components/rfxtrx/* @danielhiversen @elupus @RobBie1221
@@ -362,11 +376,11 @@ homeassistant/components/rmvtransport/* @cgtobi
 homeassistant/components/roku/* @ctalkington
 homeassistant/components/roomba/* @pschmitt @cyr-ius @shenxn
 homeassistant/components/roon/* @pavoni
+homeassistant/components/rpi_gpio_pwm/* @soldag
 homeassistant/components/rpi_power/* @shenxn @swetoast
 homeassistant/components/ruckus_unleashed/* @gabe565
 homeassistant/components/safe_mode/* @home-assistant/core
 homeassistant/components/saj/* @fredericvl
-homeassistant/components/salt/* @bjornorri
 homeassistant/components/samsungtv/* @escoand
 homeassistant/components/scene/* @home-assistant/core
 homeassistant/components/schluter/* @prairieapps
@@ -381,7 +395,7 @@ homeassistant/components/seven_segments/* @fabaff
 homeassistant/components/seventeentrack/* @bachya
 homeassistant/components/sharkiq/* @ajmarks
 homeassistant/components/shell_command/* @home-assistant/core
-homeassistant/components/shelly/* @balloob @bieniu
+homeassistant/components/shelly/* @balloob @bieniu @thecode
 homeassistant/components/shiftr/* @fabaff
 homeassistant/components/shodan/* @fabaff
 homeassistant/components/sighthound/* @robmarkcole
@@ -390,6 +404,7 @@ homeassistant/components/simplisafe/* @bachya
 homeassistant/components/sinch/* @bendikrb
 homeassistant/components/sisyphus/* @jkeljo
 homeassistant/components/sky_hub/* @rogerselwyn
+homeassistant/components/slack/* @bachya
 homeassistant/components/slide/* @ualex73
 homeassistant/components/sma/* @kellerza
 homeassistant/components/smappee/* @bsmappee
@@ -414,6 +429,7 @@ homeassistant/components/splunk/* @Bre77
 homeassistant/components/spotify/* @frenck
 homeassistant/components/sql/* @dgomes
 homeassistant/components/squeezebox/* @rajlaud
+homeassistant/components/srp_energy/* @briglx
 homeassistant/components/starline/* @anonym-tsk
 homeassistant/components/statistics/* @fabaff
 homeassistant/components/stiebel_eltron/* @fucm
@@ -430,7 +446,7 @@ homeassistant/components/switchbot/* @danielhiversen
 homeassistant/components/switcher_kis/* @tomerfi
 homeassistant/components/switchmate/* @danielhiversen
 homeassistant/components/syncthru/* @nielstron
-homeassistant/components/synology_dsm/* @hacf-fr @Quentame
+homeassistant/components/synology_dsm/* @hacf-fr @Quentame @mib1185
 homeassistant/components/synology_srm/* @aerialls
 homeassistant/components/syslog/* @fabaff
 homeassistant/components/tado/* @michaelarnauts @bdraco
@@ -461,7 +477,7 @@ homeassistant/components/transmission/* @engrbm87 @JPHutchins
 homeassistant/components/tts/* @pvizeli
 homeassistant/components/tuya/* @ollo69
 homeassistant/components/twentemilieu/* @frenck
-homeassistant/components/ubee/* @mzdrale
+homeassistant/components/twinkly/* @dr1rrb
 homeassistant/components/unifi/* @Kane610
 homeassistant/components/unifiled/* @florisvdk
 homeassistant/components/upb/* @gwww
@@ -508,7 +524,6 @@ homeassistant/components/yamaha_musiccast/* @jalmeroth
 homeassistant/components/yandex_transport/* @rishatik92 @devbis
 homeassistant/components/yeelight/* @rytilahti @zewelor @shenxn
 homeassistant/components/yeelightsunflower/* @lindsaymarkward
-homeassistant/components/yessssms/* @flowolf
 homeassistant/components/yi/* @bachya
 homeassistant/components/zeroconf/* @bdraco
 homeassistant/components/zerproc/* @emlove
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -14,7 +14,7 @@ schedules:
    always: true
 variables:
  - name: versionBuilder
-    value: '7.2.0'
+    value: '2020.11.0'
  - group: docker
  - group: github
  - group: twine
@@ -82,19 +82,14 @@ stages:
      matrix:
        amd64:
          buildArch: 'amd64'
-          buildMachine: 'qemux86-64,intel-nuc'
        i386:
          buildArch: 'i386'
-          buildMachine: 'qemux86'
        armhf:
          buildArch: 'armhf'
-          buildMachine: 'qemuarm,raspberrypi'
        armv7:
          buildArch: 'armv7'
-          buildMachine: 'raspberrypi2,raspberrypi3,raspberrypi4,odroid-xu,tinker'
        aarch64:
          buildArch: 'aarch64'
-          buildMachine: 'qemuarm-64,raspberrypi3-64,raspberrypi4-64,odroid-c2,odroid-n2'
    steps:
    - template: templates/azp-step-ha-version.yaml@azure
    - script: |
@@ -111,6 +106,57 @@ stages:
          -v $(pwd):/data:ro \
          homeassistant/amd64-builder:$(versionBuilder) \
          --generic $(homeassistantRelease) "--$(buildArch)" -t /data \
+      displayName: 'Build Release'
+  - job: 'ReleaseMachine'
+    dependsOn:
+    - ReleaseDocker
+    timeoutInMinutes: 240
+    pool:
+      vmImage: 'ubuntu-latest'
+    strategy:
+      maxParallel: 15
+      matrix:
+        qemux86-64:
+          buildMachine: 'qemux86-64'
+        intel-nuc:
+          buildMachine: 'intel-nuc'
+        qemux86:
+          buildMachine: 'qemux86'
+        qemuarm:
+          buildMachine: 'qemuarm'
+        raspberrypi:
+          buildMachine: 'raspberrypi'
+        raspberrypi2:
+          buildMachine: 'raspberrypi2'
+        raspberrypi3:
+          buildMachine: 'raspberrypi3'
+        raspberrypi4:
+          buildMachine: 'raspberrypi4'
+        odroid-xu:
+          buildMachine: 'odroid-xu'
+        tinker:
+          buildMachine: 'tinker'
+        qemuarm-64:
+          buildMachine: 'qemuarm-64'
+        raspberrypi3-64:
+          buildMachine: 'raspberrypi3-64'
+        raspberrypi4-64:
+          buildMachine: 'raspberrypi4-64'
+        odroid-c2:
+          buildMachine: 'odroid-c2'
+        odroid-c4:
+          buildMachine: 'odroid-c4'
+        odroid-n2:
+          buildMachine: 'odroid-n2'
+    steps:
+    - template: templates/azp-step-ha-version.yaml@azure
+    - script: |
+        docker login -u $(dockerUser) -p $(dockerPassword)
+      displayName: 'Docker hub login'
+    - script: docker pull homeassistant/amd64-builder:$(versionBuilder)
+      displayName: 'Install Builder'
+    - script: |
+        set -e

        docker run --rm --privileged \
          -v ~/.docker:/root/.docker \
@@ -119,7 +165,7 @@ stages:
          homeassistant/amd64-builder:$(versionBuilder) \
          --homeassistant-machine "$(homeassistantRelease)=$(buildMachine)" \
          -t /data/machine --docker-hub homeassistant
-      displayName: 'Build Release'
+      displayName: 'Build Machine'

 - stage: 'Publish'
  jobs:
--- a/build.json
+++ b/build.json
@@ -1,11 +1,11 @@
 {
  "image": "homeassistant/{arch}-homeassistant",
  "build_from": {
-    "aarch64": "homeassistant/aarch64-homeassistant-base:2020.10.0",
-    "armhf": "homeassistant/armhf-homeassistant-base:2020.10.0",
-    "armv7": "homeassistant/armv7-homeassistant-base:2020.10.0",
-    "amd64": "homeassistant/amd64-homeassistant-base:2020.10.0",
-    "i386": "homeassistant/i386-homeassistant-base:2020.10.0"
+    "aarch64": "homeassistant/aarch64-homeassistant-base:2020.11.2",
+    "armhf": "homeassistant/armhf-homeassistant-base:2020.11.2",
+    "armv7": "homeassistant/armv7-homeassistant-base:2020.11.2",
+    "amd64": "homeassistant/amd64-homeassistant-base:2020.11.2",
+    "i386": "homeassistant/i386-homeassistant-base:2020.11.2"
  },
  "labels": {
    "io.hass.type": "core"
--- a/homeassistant/auth/init.py
+++ b/homeassistant/auth/init.py
@@ -284,6 +284,7 @@ class AuthManager:
        self,
        user: models.User,
        name: Optional[str] = None,
+        is_active: Optional[bool] = None,
        group_ids: Optional[List[str]] = None,
    ) -> None:
        """Update a user."""
@@ -294,6 +295,12 @@ class AuthManager:
            kwargs["group_ids"] = group_ids
        await self._store.async_update_user(user, **kwargs)

+        if is_active is not None:
+            if is_active is True:
+                await self.async_activate_user(user)
+            else:
+                await self.async_deactivate_user(user)
+
    async def async_activate_user(self, user: models.User) -> None:
        """Activate a user."""
        await self._store.async_activate_user(user)
--- a/homeassistant/auth/providers/init.py
+++ b/homeassistant/auth/providers/init.py
@@ -207,7 +207,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
            errors["base"] = "invalid_auth_module"

        if len(self.available_mfa_modules) == 1:
-            self._auth_module_id = list(self.available_mfa_modules.keys())[0]
+            self._auth_module_id = list(self.available_mfa_modules)[0]
            return await self.async_step_mfa()

        return self.async_show_form(
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -15,11 +15,7 @@ import yarl

 from homeassistant import config as conf_util, config_entries, core, loader
 from homeassistant.components import http
-from homeassistant.const import (
-    EVENT_HOMEASSISTANT_STOP,
-    REQUIRED_NEXT_PYTHON_DATE,
-    REQUIRED_NEXT_PYTHON_VER,
-)
+from homeassistant.const import REQUIRED_NEXT_PYTHON_DATE, REQUIRED_NEXT_PYTHON_VER
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.setup import (
@@ -28,6 +24,7 @@ from homeassistant.setup import (
    async_set_domains_to_be_loaded,
    async_setup_component,
 )
+from homeassistant.util.async_ import gather_with_concurrency
 from homeassistant.util.logging import async_activate_log_queue_handler
 from homeassistant.util.package import async_get_user_site, is_virtual_env
 from homeassistant.util.yaml import clear_secret_cache
@@ -49,6 +46,8 @@ STAGE_2_TIMEOUT = 300
 WRAP_UP_TIMEOUT = 300
 COOLDOWN_TIME = 60

+MAX_LOAD_CONCURRENTLY = 6
+
 DEBUGGER_INTEGRATIONS = {"debugpy", "ptvsd"}
 CORE_INTEGRATIONS = ("homeassistant", "persistent_notification")
 LOGGING_INTEGRATIONS = {
@@ -139,11 +138,9 @@ async def async_setup_hass(
        _LOGGER.warning("Detected that frontend did not load. Activating safe mode")
        # Ask integrations to shut down. It's messy but we can't
        # do a clean stop without knowing what is broken
-        hass.async_track_tasks()
-        hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP, {})
        with contextlib.suppress(asyncio.TimeoutError):
            async with hass.timeout.async_timeout(10):
-                await hass.async_block_till_done()
+                await hass.async_stop()

        safe_mode = True
        old_config = hass.config
@@ -372,7 +369,7 @@ async def async_mount_local_lib_path(config_dir: str) -> str:
 def _get_domains(hass: core.HomeAssistant, config: Dict[str, Any]) -> Set[str]:
    """Get domains of components to set up."""
    # Filter out the repeating and common config section [homeassistant]
-    domains = {key.split(" ")[0] for key in config.keys() if key != core.DOMAIN}
+    domains = {key.split(" ")[0] for key in config if key != core.DOMAIN}

    # Add config entry domains
    if not hass.config.safe_mode:
@@ -442,7 +439,8 @@ async def _async_set_up_integrations(

        integrations_to_process = [
            int_or_exc
-            for int_or_exc in await asyncio.gather(
+            for int_or_exc in await gather_with_concurrency(
+                loader.MAX_LOAD_CONCURRENTLY,
                *(
                    loader.async_get_integration(hass, domain)
                    for domain in old_to_resolve
@@ -530,7 +528,7 @@ async def _async_set_up_integrations(
            _LOGGER.warning("Setup timed out for stage 1 - moving forward")

    # Enables after dependencies
-    async_set_domains_to_be_loaded(hass, stage_1_domains | stage_2_domains)
+    async_set_domains_to_be_loaded(hass, stage_2_domains)

    if stage_2_domains:
        _LOGGER.info("Setting up stage 2: %s", stage_2_domains)
--- a/homeassistant/components/abode/init.py
+++ b/homeassistant/components/abode/init.py
@@ -4,12 +4,12 @@ from copy import deepcopy
 from functools import partial

 from abodepy import Abode
-from abodepy.exceptions import AbodeException
+from abodepy.exceptions import AbodeAuthenticationException, AbodeException
 import abodepy.helpers.timeline as TIMELINE
 from requests.exceptions import ConnectTimeout, HTTPError
 import voluptuous as vol

-from homeassistant.config_entries import SOURCE_IMPORT
+from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH
 from homeassistant.const import (
    ATTR_ATTRIBUTION,
    ATTR_DATE,
@@ -110,18 +110,34 @@ async def async_setup_entry(hass, config_entry):
    username = config_entry.data.get(CONF_USERNAME)
    password = config_entry.data.get(CONF_PASSWORD)
    polling = config_entry.data.get(CONF_POLLING)
+    cache = hass.config.path(DEFAULT_CACHEDB)
+
+    # For previous config entries where unique_id is None
+    if config_entry.unique_id is None:
+        hass.config_entries.async_update_entry(
+            config_entry, unique_id=config_entry.data[CONF_USERNAME]
+        )

    try:
-        cache = hass.config.path(DEFAULT_CACHEDB)
        abode = await hass.async_add_executor_job(
            Abode, username, password, True, True, True, cache
        )
-        hass.data[DOMAIN] = AbodeSystem(abode, polling)
+
+    except AbodeAuthenticationException as ex:
+        LOGGER.error("Invalid credentials: %s", ex)
+        await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_REAUTH},
+            data=config_entry.data,
+        )
+        return False

    except (AbodeException, ConnectTimeout, HTTPError) as ex:
-        LOGGER.error("Unable to connect to Abode: %s", str(ex))
+        LOGGER.error("Unable to connect to Abode: %s", ex)
        raise ConfigEntryNotReady from ex

+    hass.data[DOMAIN] = AbodeSystem(abode, polling)
+
    for platform in ABODE_PLATFORMS:
        hass.async_create_task(
            hass.config_entries.async_forward_entry_setup(config_entry, platform)
--- a/homeassistant/components/abode/config_flow.py
+++ b/homeassistant/components/abode/config_flow.py
@@ -1,15 +1,16 @@
 """Config flow for the Abode Security System component."""
 from abodepy import Abode
-from abodepy.exceptions import AbodeException
+from abodepy.exceptions import AbodeAuthenticationException, AbodeException
+from abodepy.helpers.errors import MFA_CODE_REQUIRED
 from requests.exceptions import ConnectTimeout, HTTPError
 import voluptuous as vol

 from homeassistant import config_entries
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, HTTP_BAD_REQUEST
-from homeassistant.core import callback

 from .const import DEFAULT_CACHEDB, DOMAIN, LOGGER  # pylint: disable=unused-import

+CONF_MFA = "mfa_code"
 CONF_POLLING = "polling"


@@ -25,53 +26,146 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
            vol.Required(CONF_USERNAME): str,
            vol.Required(CONF_PASSWORD): str,
        }
+        self.mfa_data_schema = {
+            vol.Required(CONF_MFA): str,
+        }
+
+        self._cache = None
+        self._mfa_code = None
+        self._password = None
+        self._polling = False
+        self._username = None
+
+    async def _async_abode_login(self, step_id):
+        """Handle login with Abode."""
+        self._cache = self.hass.config.path(DEFAULT_CACHEDB)
+        errors = {}
+
+        try:
+            await self.hass.async_add_executor_job(
+                Abode, self._username, self._password, True, False, False, self._cache
+            )
+
+        except (AbodeException, ConnectTimeout, HTTPError) as ex:
+            if ex.errcode == MFA_CODE_REQUIRED[0]:
+                return await self.async_step_mfa()
+
+            LOGGER.error("Unable to connect to Abode: %s", ex)
+
+            if ex.errcode == HTTP_BAD_REQUEST:
+                errors = {"base": "invalid_auth"}
+
+            else:
+                errors = {"base": "cannot_connect"}
+
+        if errors:
+            return self.async_show_form(
+                step_id=step_id, data_schema=vol.Schema(self.data_schema), errors=errors
+            )
+
+        return await self._async_create_entry()
+
+    async def _async_abode_mfa_login(self):
+        """Handle multi-factor authentication (MFA) login with Abode."""
+        try:
+            # Create instance to access login method for passing MFA code
+            abode = Abode(
+                auto_login=False,
+                get_devices=False,
+                get_automations=False,
+                cache_path=self._cache,
+            )
+            await self.hass.async_add_executor_job(
+                abode.login, self._username, self._password, self._mfa_code
+            )
+
+        except AbodeAuthenticationException:
+            return self.async_show_form(
+                step_id="mfa",
+                data_schema=vol.Schema(self.mfa_data_schema),
+                errors={"base": "invalid_mfa_code"},
+            )
+
+        return await self._async_create_entry()
+
+    async def _async_create_entry(self):
+        """Create the config entry."""
+        config_data = {
+            CONF_USERNAME: self._username,
+            CONF_PASSWORD: self._password,
+            CONF_POLLING: self._polling,
+        }
+        existing_entry = await self.async_set_unique_id(self._username)
+
+        if existing_entry:
+            self.hass.config_entries.async_update_entry(
+                existing_entry, data=config_data
+            )
+            # Reload the Abode config entry otherwise devices will remain unavailable
+            self.hass.async_create_task(
+                self.hass.config_entries.async_reload(existing_entry.entry_id)
+            )
+
+            return self.async_abort(reason="reauth_successful")
+
+        return self.async_create_entry(title=self._username, data=config_data)

    async def async_step_user(self, user_input=None):
        """Handle a flow initialized by the user."""
        if self._async_current_entries():
            return self.async_abort(reason="single_instance_allowed")

-        if not user_input:
-            return self._show_form()
-
-        username = user_input[CONF_USERNAME]
-        password = user_input[CONF_PASSWORD]
-        polling = user_input.get(CONF_POLLING, False)
-        cache = self.hass.config.path(DEFAULT_CACHEDB)
-
-        try:
-            await self.hass.async_add_executor_job(
-                Abode, username, password, True, True, True, cache
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user", data_schema=vol.Schema(self.data_schema)
            )

-        except (AbodeException, ConnectTimeout, HTTPError) as ex:
-            LOGGER.error("Unable to connect to Abode: %s", str(ex))
-            if ex.errcode == HTTP_BAD_REQUEST:
-                return self._show_form({"base": "invalid_auth"})
-            return self._show_form({"base": "cannot_connect"})
+        self._username = user_input[CONF_USERNAME]
+        self._password = user_input[CONF_PASSWORD]

-        return self.async_create_entry(
-            title=user_input[CONF_USERNAME],
-            data={
-                CONF_USERNAME: username,
-                CONF_PASSWORD: password,
-                CONF_POLLING: polling,
-            },
-        )
+        return await self._async_abode_login(step_id="user")

-    @callback
-    def _show_form(self, errors=None):
-        """Show the form to the user."""
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(self.data_schema),
-            errors=errors if errors else {},
-        )
+    async def async_step_mfa(self, user_input=None):
+        """Handle a multi-factor authentication (MFA) flow."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="mfa", data_schema=vol.Schema(self.mfa_data_schema)
+            )
+
+        self._mfa_code = user_input[CONF_MFA]
+
+        return await self._async_abode_mfa_login()
+
+    async def async_step_reauth(self, config):
+        """Handle reauthorization request from Abode."""
+        self._username = config[CONF_USERNAME]
+
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(self, user_input=None):
+        """Handle reauthorization flow."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                data_schema=vol.Schema(
+                    {
+                        vol.Required(CONF_USERNAME, default=self._username): str,
+                        vol.Required(CONF_PASSWORD): str,
+                    }
+                ),
+            )
+
+        self._username = user_input[CONF_USERNAME]
+        self._password = user_input[CONF_PASSWORD]
+
+        return await self._async_abode_login(step_id="reauth_confirm")

    async def async_step_import(self, import_config):
        """Import a config entry from configuration.yaml."""
        if self._async_current_entries():
-            LOGGER.warning("Only one configuration of abode is allowed.")
+            LOGGER.warning("Already configured. Only a single configuration possible.")
            return self.async_abort(reason="single_instance_allowed")

+        self._polling = import_config.get(CONF_POLLING, False)
+
        return await self.async_step_user(import_config)
--- a/homeassistant/components/abode/manifest.json
+++ b/homeassistant/components/abode/manifest.json
@@ -3,7 +3,7 @@
  "name": "Abode",
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/abode",
-  "requirements": ["abodepy==1.1.0"],
+  "requirements": ["abodepy==1.2.0"],
  "codeowners": ["@shred86"],
  "homekit": {
    "models": ["Abode", "Iota"]
--- a/homeassistant/components/abode/strings.json
+++ b/homeassistant/components/abode/strings.json
@@ -7,14 +7,30 @@
          "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)"
+        }
+      },
+      "reauth_confirm": {
+        "title": "Fill in your Abode login information",
+        "data": {
+          "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%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_mfa_code": "Invalid MFA code"
+
    },
    "abort": {
-      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
    }
  }
 }
--- a/homeassistant/components/abode/translations/bg.json
+++ b/homeassistant/components/abode/translations/bg.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0430 \u0435 \u0441\u0430\u043c\u043e \u0435\u0434\u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043d\u0430 Abode."
        },
-        "error": {
-            "connection_error": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u0432\u044a\u0440\u0437\u0432\u0430\u043d\u0435 \u0441 Abode.",
-            "identifier_exists": "\u041f\u0440\u043e\u0444\u0438\u043b\u044a\u0442 \u0435 \u0432\u0435\u0447\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0430\u043d.",
-            "invalid_credentials": "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0438 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u0438 \u0434\u0430\u043d\u043d\u0438."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/ca.json
+++ b/homeassistant/components/abode/translations/ca.json
@@ -5,10 +5,7 @@
        },
        "error": {
            "cannot_connect": "Ha fallat la connexi\u00f3",
-            "connection_error": "No es pot connectar amb Abode.",
-            "identifier_exists": "Compte ja registrat.",
-            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
-            "invalid_credentials": "Credencials inv\u00e0lides."
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
        },
        "step": {
            "user": {
--- a/homeassistant/components/abode/translations/cs.json
+++ b/homeassistant/components/abode/translations/cs.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9",
            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
        },
        "error": {
            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
-            "connection_error": "Nelze se p\u0159ipojit k Abode.",
-            "identifier_exists": "\u00da\u010det je ji\u017e zaregistrov\u00e1n.",
            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
-            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje."
+            "invalid_mfa_code": "Neplatn\u00fd k\u00f3d MFA"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "K\u00f3d MFA (6 \u010d\u00edslic)"
+                },
+                "title": "Zadejte k\u00f3d MFA pro Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "E-mail"
+                },
+                "title": "Vypl\u0148te sv\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje do Abode"
+            },
            "user": {
                "data": {
                    "password": "Heslo",
--- a/homeassistant/components/abode/translations/da.json
+++ b/homeassistant/components/abode/translations/da.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "Det er kun n\u00f8dvendigt med en ops\u00e6tning af Abode."
        },
-        "error": {
-            "connection_error": "Kunne ikke oprette forbindelse til Abode.",
-            "identifier_exists": "Konto er allerede registreret.",
-            "invalid_credentials": "Ugyldige legitimationsoplysninger."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/de.json
+++ b/homeassistant/components/abode/translations/de.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "Es ist nur eine einzige Konfiguration von Abode erlaubt."
        },
-        "error": {
-            "connection_error": "Es kann keine Verbindung zu Abode hergestellt werden.",
-            "identifier_exists": "Das Konto ist bereits registriert.",
-            "invalid_credentials": "Ung\u00fcltige Anmeldeinformationen"
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/en.json
+++ b/homeassistant/components/abode/translations/en.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "Re-authentication was successful",
            "single_instance_allowed": "Already configured. Only a single configuration possible."
        },
        "error": {
            "cannot_connect": "Failed to connect",
-            "connection_error": "Unable to connect to Abode.",
-            "identifier_exists": "Account already registered.",
            "invalid_auth": "Invalid authentication",
-            "invalid_credentials": "Invalid credentials."
+            "invalid_mfa_code": "Invalid MFA code"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "MFA code (6-digits)"
+                },
+                "title": "Enter your MFA code for Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Password",
+                    "username": "Email"
+                },
+                "title": "Fill in your Abode login information"
+            },
            "user": {
                "data": {
                    "password": "Password",
--- a/homeassistant/components/abode/translations/es-419.json
+++ b/homeassistant/components/abode/translations/es-419.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "Solo se permite una \u00fanica configuraci\u00f3n de Abode."
        },
-        "error": {
-            "connection_error": "No se puede conectar a Abode.",
-            "identifier_exists": "Cuenta ya registrada.",
-            "invalid_credentials": "Credenciales inv\u00e1lidas."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/es.json
+++ b/homeassistant/components/abode/translations/es.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "La reautenticaci\u00f3n fue exitosa",
            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
        },
        "error": {
            "cannot_connect": "No se pudo conectar",
-            "connection_error": "No se puede conectar a Abode.",
-            "identifier_exists": "Cuenta ya registrada.",
            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
-            "invalid_credentials": "Credenciales inv\u00e1lidas."
+            "invalid_mfa_code": "C\u00f3digo MFA inv\u00e1lido"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "C\u00f3digo MFA (6 d\u00edgitos)"
+                },
+                "title": "Introduce tu c\u00f3digo MFA para Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Contrase\u00f1a",
+                    "username": "Correo electronico"
+                },
+                "title": "Rellene su informaci\u00f3n de inicio de sesi\u00f3n de Abode"
+            },
            "user": {
                "data": {
                    "password": "Contrase\u00f1a",
--- a/homeassistant/components/abode/translations/et.json
+++ b/homeassistant/components/abode/translations/et.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "Taastuvastamine \u00f5nnestus",
            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
        },
        "error": {
            "cannot_connect": "\u00dchendamine nurjus",
-            "connection_error": "\u00dchendus Abode-iga nurjus.",
-            "identifier_exists": "Konto on juba seadistatud",
            "invalid_auth": "Tuvastamise viga",
-            "invalid_credentials": "Sobimatu mandaat."
+            "invalid_mfa_code": "Kehtetu MFA-kood"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "MFA kood (6-kohaline)"
+                },
+                "title": "Sisesta oma Abode MFA kood"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                },
+                "title": "Sisesta oma Abode sisselogimisteave"
+            },
            "user": {
                "data": {
                    "password": "Salas\u00f5na",
--- a/homeassistant/components/abode/translations/fi.json
+++ b/homeassistant/components/abode/translations/fi.json
@@ -1,7 +0,0 @@
-{
-    "config": {
-        "error": {
-            "connection_error": "Yhteytt\u00e4 Abodeen ei voi muodostaa."
-        }
-    }
-}
--- a/homeassistant/components/abode/translations/fr.json
+++ b/homeassistant/components/abode/translations/fr.json
@@ -5,10 +5,7 @@
        },
        "error": {
            "cannot_connect": "\u00c9chec de connexion",
-            "connection_error": "Impossible de se connecter \u00e0 Abode.",
-            "identifier_exists": "Compte d\u00e9j\u00e0 enregistr\u00e9.",
-            "invalid_auth": "Authentification invalide",
-            "invalid_credentials": "Informations d'identification invalides."
+            "invalid_auth": "Authentification invalide"
        },
        "step": {
            "user": {
--- a/homeassistant/components/abode/translations/hu.json
+++ b/homeassistant/components/abode/translations/hu.json
@@ -4,9 +4,7 @@
            "single_instance_allowed": "Csak egyetlen Abode konfigur\u00e1ci\u00f3 enged\u00e9lyezett."
        },
        "error": {
-            "connection_error": "Nem lehet csatlakozni az Abode-hez.",
-            "identifier_exists": "Fi\u00f3k m\u00e1r regisztr\u00e1lva van",
-            "invalid_credentials": "\u00c9rv\u00e9nytelen hiteles\u00edt\u0151 adatok"
+            "cannot_connect": "Sikertelen csatlakoz\u00e1s"
        },
        "step": {
            "user": {
--- a/homeassistant/components/abode/translations/it.json
+++ b/homeassistant/components/abode/translations/it.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "La riautenticazione ha avuto successo",
            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
        },
        "error": {
            "cannot_connect": "Impossibile connettersi",
-            "connection_error": "Impossibile connettersi ad Abode.",
-            "identifier_exists": "Account gi\u00e0 registrato",
            "invalid_auth": "Autenticazione non valida",
-            "invalid_credentials": "Credenziali non valide"
+            "invalid_mfa_code": "Codice MFA non valido"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "Codice MFA (6 cifre)"
+                },
+                "title": "Inserisci il tuo codice MFA per Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Password",
+                    "username": "E-mail"
+                },
+                "title": "Inserisci le tue informazioni di accesso Abode"
+            },
            "user": {
                "data": {
                    "password": "Password",
--- a/homeassistant/components/abode/translations/ko.json
+++ b/homeassistant/components/abode/translations/ko.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "\ud558\ub098\uc758 Abode \ub9cc \uad6c\uc131\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
        },
-        "error": {
-            "connection_error": "Abode \uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
-            "identifier_exists": "\uacc4\uc815\uc774 \uc774\ubbf8 \ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
-            "invalid_credentials": "\uc0ac\uc6a9\uc790 \uc774\ub984 \ud639\uc740 \ube44\ubc00\ubc88\ud638\uac00 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4"
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/lb.json
+++ b/homeassistant/components/abode/translations/lb.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
-            "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vun ZHA ass erlaabt."
+            "reauth_successful": "Re-authentifikatioun war erfollegr\u00e4ich",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun m\u00e9iglech."
        },
        "error": {
            "cannot_connect": "Feeler beim verbannen",
-            "connection_error": "Kann sech net mat Abode verbannen.",
-            "identifier_exists": "Konto ass scho registr\u00e9iert",
            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
-            "invalid_credentials": "Ong\u00eblteg Login Informatioune"
+            "invalid_mfa_code": "Ong\u00ebltege MFA Code"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "MFA code (6 Zifferen)"
+                },
+                "title": "G\u00ebff dain MFA code fir Abode un"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Passwuert",
+                    "username": "E-Mail"
+                },
+                "title": "F\u00ebll deng Abode Login Informatiounen aus"
+            },
            "user": {
                "data": {
                    "password": "Passwuert",
--- a/homeassistant/components/abode/translations/nl.json
+++ b/homeassistant/components/abode/translations/nl.json
@@ -5,9 +5,7 @@
        },
        "error": {
            "cannot_connect": "Kan geen verbinding maken",
-            "connection_error": "Kan geen verbinding maken met Abode.",
-            "identifier_exists": "Account is al geregistreerd.",
-            "invalid_credentials": "Ongeldige inloggegevens."
+            "invalid_auth": "Ongeldige authenticatie"
        },
        "step": {
            "user": {
--- a/homeassistant/components/abode/translations/no.json
+++ b/homeassistant/components/abode/translations/no.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "Reautentisering var vellykket",
            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
        },
        "error": {
            "cannot_connect": "Tilkobling mislyktes",
-            "connection_error": "Kan ikke koble til Abode.",
-            "identifier_exists": "Kontoen er allerede registrert.",
            "invalid_auth": "Ugyldig godkjenning",
-            "invalid_credentials": "Ugyldig legitimasjon"
+            "invalid_mfa_code": "Ugyldig MFA-kode"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "MFA-kode (6-sifre)"
+                },
+                "title": "Skriv inn din MFA-kode for Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Passord",
+                    "username": "E-post"
+                },
+                "title": "Fyll ut innloggingsinformasjonen for Abode"
+            },
            "user": {
                "data": {
                    "password": "Passord",
--- a/homeassistant/components/abode/translations/pl.json
+++ b/homeassistant/components/abode/translations/pl.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119",
            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
        },
        "error": {
            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z Abode",
-            "identifier_exists": "Konto jest ju\u017c zarejestrowane",
            "invalid_auth": "Niepoprawne uwierzytelnienie",
-            "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce"
+            "invalid_mfa_code": "Nieprawid\u0142owy kod uwierzytelniania wielosk\u0142adnikowego"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "6-cyfrowy kod uwierzytelniania wielosk\u0142adnikowego"
+                },
+                "title": "Wprowad\u017a kod uwierzytelniania wielosk\u0142adnikowego dla Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Has\u0142o",
+                    "username": "Adres e-mail"
+                },
+                "title": "Wprowad\u017a informacje logowania Abode"
+            },
            "user": {
                "data": {
                    "password": "Has\u0142o",
--- a/homeassistant/components/abode/translations/pt-BR.json
+++ b/homeassistant/components/abode/translations/pt-BR.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "Somente uma \u00fanica configura\u00e7\u00e3o de Abode \u00e9 permitida."
        },
-        "error": {
-            "connection_error": "N\u00e3o foi poss\u00edvel conectar ao Abode.",
-            "identifier_exists": "Conta j\u00e1 cadastrada.",
-            "invalid_credentials": "Credenciais inv\u00e1lidas."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/pt.json
+++ b/homeassistant/components/abode/translations/pt.json
@@ -1,8 +1,5 @@
 {
    "config": {
-        "error": {
-            "identifier_exists": "Conta j\u00e1 registada"
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/ru.json
+++ b/homeassistant/components/abode/translations/ru.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e.",
            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
        },
        "error": {
            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
-            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a Abode.",
-            "identifier_exists": "\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0430.",
            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
-            "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435."
+            "invalid_mfa_code": "\u041d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043a\u043e\u0434 MFA."
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "\u041a\u043e\u0434 MFA (6 \u0446\u0438\u0444\u0440)"
+                },
+                "title": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0434 MFA \u0434\u043b\u044f Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
+                    "username": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b"
+                },
+                "title": "Abode"
+            },
            "user": {
                "data": {
                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
--- a/homeassistant/components/abode/translations/sl.json
+++ b/homeassistant/components/abode/translations/sl.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "Dovoljena je samo ena konfiguracija Abode."
        },
-        "error": {
-            "connection_error": "Ni mogo\u010de vzpostaviti povezave z Abode.",
-            "identifier_exists": "Ra\u010dun je \u017ee registriran.",
-            "invalid_credentials": "Neveljavne poverilnice."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/sv.json
+++ b/homeassistant/components/abode/translations/sv.json
@@ -3,11 +3,6 @@
        "abort": {
            "single_instance_allowed": "Endast en enda konfiguration av Abode \u00e4r till\u00e5ten."
        },
-        "error": {
-            "connection_error": "Det gick inte att ansluta till Abode.",
-            "identifier_exists": "Kontot \u00e4r redan registrerat.",
-            "invalid_credentials": "Ogiltiga autentiseringsuppgifter."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/abode/translations/zh-Hant.json
+++ b/homeassistant/components/abode/translations/zh-Hant.json
@@ -1,16 +1,28 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f",
            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
        },
        "error": {
            "cannot_connect": "\u9023\u7dda\u5931\u6557",
-            "connection_error": "\u7121\u6cd5\u9023\u7dda\u81f3 Abode\u3002",
-            "identifier_exists": "\u5e33\u865f\u5df2\u8a3b\u518a\u3002",
            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
-            "invalid_credentials": "\u6191\u8b49\u7121\u6548\u3002"
+            "invalid_mfa_code": "\u591a\u6b65\u9a5f\u8a8d\u8b49\u78bc\u7121\u6548"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "\u591a\u6b65\u9a5f\u8a8d\u8b49\u78bc\uff086 \u4f4d\uff09"
+                },
+                "title": "\u8f38\u5165 Abode \u591a\u6b65\u9a5f\u8a8d\u8b49\u78bc"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "\u5bc6\u78bc",
+                    "username": "\u96fb\u5b50\u90f5\u4ef6"
+                },
+                "title": "\u586b\u5beb Abode \u767b\u5165\u8cc7\u8a0a"
+            },
            "user": {
                "data": {
                    "password": "\u5bc6\u78bc",
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -1,6 +1,23 @@
 """Constants for AccuWeather integration."""
+from homeassistant.components.weather import (
+    ATTR_CONDITION_CLEAR_NIGHT,
+    ATTR_CONDITION_CLOUDY,
+    ATTR_CONDITION_EXCEPTIONAL,
+    ATTR_CONDITION_FOG,
+    ATTR_CONDITION_HAIL,
+    ATTR_CONDITION_LIGHTNING,
+    ATTR_CONDITION_LIGHTNING_RAINY,
+    ATTR_CONDITION_PARTLYCLOUDY,
+    ATTR_CONDITION_POURING,
+    ATTR_CONDITION_RAINY,
+    ATTR_CONDITION_SNOWY,
+    ATTR_CONDITION_SNOWY_RAINY,
+    ATTR_CONDITION_SUNNY,
+    ATTR_CONDITION_WINDY,
+)
 from homeassistant.const import (
    ATTR_DEVICE_CLASS,
+    CONCENTRATION_PARTS_PER_CUBIC_METER,
    DEVICE_CLASS_TEMPERATURE,
    LENGTH_FEET,
    LENGTH_INCHES,
@@ -13,7 +30,6 @@ from homeassistant.const import (
    TEMP_FAHRENHEIT,
    TIME_HOURS,
    UV_INDEX,
-    VOLUME_CUBIC_METERS,
 )

 ATTRIBUTION = "Data provided by AccuWeather"
@@ -22,7 +38,6 @@ ATTR_FORECAST = CONF_FORECAST = "forecast"
 ATTR_LABEL = "label"
 ATTR_UNIT_IMPERIAL = "Imperial"
 ATTR_UNIT_METRIC = "Metric"
-CONCENTRATION_PARTS_PER_CUBIC_METER = f"p/{VOLUME_CUBIC_METERS}"
 COORDINATOR = "coordinator"
 DOMAIN = "accuweather"
 MANUFACTURER = "AccuWeather, Inc."
@@ -30,20 +45,20 @@ NAME = "AccuWeather"
 UNDO_UPDATE_LISTENER = "undo_update_listener"

 CONDITION_CLASSES = {
-    "clear-night": [33, 34, 37],
-    "cloudy": [7, 8, 38],
-    "exceptional": [24, 30, 31],
-    "fog": [11],
-    "hail": [25],
-    "lightning": [15],
-    "lightning-rainy": [16, 17, 41, 42],
-    "partlycloudy": [4, 6, 35, 36],
-    "pouring": [18],
-    "rainy": [12, 13, 14, 26, 39, 40],
-    "snowy": [19, 20, 21, 22, 23, 43, 44],
-    "snowy-rainy": [29],
-    "sunny": [1, 2, 3, 5],
-    "windy": [32],
+    ATTR_CONDITION_CLEAR_NIGHT: [33, 34, 37],
+    ATTR_CONDITION_CLOUDY: [7, 8, 38],
+    ATTR_CONDITION_EXCEPTIONAL: [24, 30, 31],
+    ATTR_CONDITION_FOG: [11],
+    ATTR_CONDITION_HAIL: [25],
+    ATTR_CONDITION_LIGHTNING: [15],
+    ATTR_CONDITION_LIGHTNING_RAINY: [16, 17, 41, 42],
+    ATTR_CONDITION_PARTLYCLOUDY: [4, 6, 35, 36],
+    ATTR_CONDITION_POURING: [18],
+    ATTR_CONDITION_RAINY: [12, 13, 14, 26, 39, 40],
+    ATTR_CONDITION_SNOWY: [19, 20, 21, 22, 23, 43, 44],
+    ATTR_CONDITION_SNOWY_RAINY: [29],
+    ATTR_CONDITION_SUNNY: [1, 2, 3, 5],
+    ATTR_CONDITION_WINDY: [32],
 }

 FORECAST_DAYS = [0, 1, 2, 3, 4]
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -31,5 +31,11 @@
        }
      }
    }
+  },
+  "system_health": {
+    "info": {
+      "can_reach_server": "Reach AccuWeather server",
+      "remaining_requests": "Remaining allowed requests"
+    }
  }
 }
--- a/homeassistant/components/accuweather/system_health.py
+++ b/homeassistant/components/accuweather/system_health.py
@@ -0,0 +1,27 @@
+"""Provide info to system health."""
+from accuweather.const import ENDPOINT
+
+from homeassistant.components import system_health
+from homeassistant.core import HomeAssistant, callback
+
+from .const import COORDINATOR, DOMAIN
+
+
+@callback
+def async_register(
+    hass: HomeAssistant, register: system_health.SystemHealthRegistration
+) -> None:
+    """Register system health callbacks."""
+    register.async_register_info(system_health_info)
+
+
+async def system_health_info(hass):
+    """Get info for the info page."""
+    remaining_requests = list(hass.data[DOMAIN].values())[0][
+        COORDINATOR
+    ].accuweather.requests_remaining
+
+    return {
+        "can_reach_server": system_health.async_check_can_reach_url(hass, ENDPOINT),
+        "remaining_requests": remaining_requests,
+    }
--- a/homeassistant/components/accuweather/translations/de.json
+++ b/homeassistant/components/accuweather/translations/de.json
@@ -4,7 +4,8 @@
            "user": {
                "data": {
                    "latitude": "Breitengrad",
-                    "longitude": "L\u00e4ngengrad"
+                    "longitude": "L\u00e4ngengrad",
+                    "name": "Name"
                },
                "title": "AccuWeather"
            }
--- a/homeassistant/components/accuweather/translations/en.json
+++ b/homeassistant/components/accuweather/translations/en.json
@@ -31,5 +31,11 @@
                "title": "AccuWeather Options"
            }
        }
+    },
+    "system_health": {
+        "info": {
+            "can_reach_server": "Reach AccuWeather server",
+            "remaining_requests": "Remaining allowed requests"
+        }
    }
 }
--- a/homeassistant/components/accuweather/translations/es-419.json
+++ b/homeassistant/components/accuweather/translations/es-419.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "error": {
+            "requests_exceeded": "Se super\u00f3 el n\u00famero permitido de solicitudes a la API de Accuweather. Tiene que esperar o cambiar la clave de API."
+        },
+        "step": {
+            "user": {
+                "description": "Si necesita ayuda con la configuraci\u00f3n, eche un vistazo aqu\u00ed: https://www.home-assistant.io/integrations/accuweather/ \n\nAlgunos sensores no est\u00e1n habilitados de forma predeterminada. Puede habilitarlos en el registro de entidades despu\u00e9s de la configuraci\u00f3n de integraci\u00f3n. La previsi\u00f3n meteorol\u00f3gica no est\u00e1 habilitada de forma predeterminada. Puede habilitarlo en las opciones de integraci\u00f3n.",
+                "title": "AccuWeather"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "forecast": "Pron\u00f3stico del tiempo"
+                },
+                "description": "Debido a las limitaciones de la versi\u00f3n gratuita de la clave API de AccuWeather, cuando habilita el pron\u00f3stico del tiempo, las actualizaciones de datos se realizar\u00e1n cada 64 minutos en lugar de cada 32 minutos."
+            }
+        }
+    }
+}
--- a/homeassistant/components/accuweather/translations/et.json
+++ b/homeassistant/components/accuweather/translations/et.json
@@ -31,5 +31,11 @@
                "title": "AccuWeatheri valikud"
            }
        }
+    },
+    "system_health": {
+        "info": {
+            "can_reach_server": "\u00dchendu Accuweatheri serveriga",
+            "remaining_requests": "Lubatud taotlusi on j\u00e4\u00e4nud"
+        }
    }
 }
--- a/homeassistant/components/accuweather/translations/lb.json
+++ b/homeassistant/components/accuweather/translations/lb.json
@@ -16,7 +16,7 @@
                    "longitude": "L\u00e4ngegrad",
                    "name": "Numm"
                },
-                "description": "Falls du H\u00ebllef mat der Konfiguratioun brauch kuck h\u00e9i:\nhttps://www.home-assistant.io/integrations/accuweather/\n\nWieder Pr\u00e9visounen si standardm\u00e9isseg net aktiv. Du kanns d\u00e9i an den Optioune vun der Integratioun aschalten.",
+                "description": "Falls du H\u00ebllef mat der Konfiguratioun brauch kuck h\u00e9i:\nhttps://www.home-assistant.io/integrations/accuweather/\n\nVerschidde Sensoren si standardm\u00e9isseg net aktiv. Du kanns d\u00e9i an der Entit\u00e9ie Registry no der Konfiguratioun vun der Integratioun aschalten.\n\nWieder Pr\u00e9visounen si standardm\u00e9isseg net aktiv. Du kanns d\u00e9i an den Optioune vun der Integratioun aschalten.",
                "title": "AccuWeather"
            }
        }
--- a/homeassistant/components/accuweather/translations/nl.json
+++ b/homeassistant/components/accuweather/translations/nl.json
@@ -1,11 +1,30 @@
 {
    "config": {
+        "error": {
+            "invalid_api_key": "API-sleutel",
+            "requests_exceeded": "Het toegestane aantal verzoeken aan de Accuweather API is overschreden. U moet wachten of de API-sleutel wijzigen."
+        },
        "step": {
            "user": {
                "data": {
+                    "api_key": "API-sleutel",
+                    "latitude": "Breedtegraad",
                    "longitude": "Lengtegraad",
                    "name": "Naam"
-                }
+                },
+                "description": "Als je hulp nodig hebt bij de configuratie, kijk dan hier: https://www.home-assistant.io/integrations/accuweather/ \n\n Sommige sensoren zijn niet standaard ingeschakeld. U kunt ze inschakelen in het entiteitenregister na de integratieconfiguratie.\n Weersvoorspelling is niet standaard ingeschakeld. U kunt het inschakelen in de integratieopties.",
+                "title": "AccuWeather"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "forecast": "Weervoorspelling"
+                },
+                "description": "Vanwege de beperkingen van de gratis versie van de AccuWeather API-sleutel, worden gegevensupdates elke 64 minuten in plaats van elke 32 minuten uitgevoerd wanneer u weersvoorspelling inschakelt.",
+                "title": "AccuWeather-opties"
            }
        }
    }
--- a/homeassistant/components/accuweather/translations/no.json
+++ b/homeassistant/components/accuweather/translations/no.json
@@ -16,7 +16,7 @@
                    "longitude": "Lengdegrad",
                    "name": "Navn"
                },
-                "description": "Hvis du trenger hjelp med konfigurasjonen, kan du se her: https://www.home-assistant.io/integrations/accuweather/ \n\n Noen sensorer er ikke aktivert som standard. Du kan aktivere dem i enhetsregisteret etter integrasjonskonfigurasjonen. \n V\u00e6rmelding er ikke aktivert som standard. Du kan aktivere det i integrasjonsalternativene.",
+                "description": "Hvis du trenger hjelp med konfigurasjonen, kan du se her: https://www.home-assistant.io/integrations/accuweather/ \n\nNoen sensorer er ikke aktivert som standard. Du kan aktivere dem i entitetsregisteret etter integrasjonskonfigurasjonen. \nV\u00e6rmelding er ikke aktivert som standard. Du kan aktivere det i integrasjonsalternativene.",
                "title": ""
            }
        }
--- a/homeassistant/components/accuweather/translations/sensor.nl.json
+++ b/homeassistant/components/accuweather/translations/sensor.nl.json
@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "Ondergang",
+            "rising": "Opkomst",
+            "steady": "Stabiel"
+        }
+    }
+}
--- a/homeassistant/components/acmeda/manifest.json
+++ b/homeassistant/components/acmeda/manifest.json
@@ -3,7 +3,7 @@
  "name": "Rollease Acmeda Automate",
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/acmeda",
-  "requirements": ["aiopulse==0.4.0"],
+  "requirements": ["aiopulse==0.4.2"],
  "codeowners": [
    "@atmurray"
  ]
--- a/homeassistant/components/acmeda/strings.json
+++ b/homeassistant/components/acmeda/strings.json
@@ -1,5 +1,4 @@
 {
-  "title": "Rollease Acmeda Automate",
  "config": {
    "step": {
      "user": {
--- a/homeassistant/components/acmeda/translations/ca.json
+++ b/homeassistant/components/acmeda/translations/ca.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "No s'han descobert nous hubs de Pulse.",
            "no_devices_found": "No s'han trobat dispositius a la xarxa"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "Selecci\u00f3 del Hub a afegir"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/cs.json
+++ b/homeassistant/components/acmeda/translations/cs.json
@@ -2,6 +2,13 @@
    "config": {
        "abort": {
            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "id": "ID hostitele"
+                }
+            }
        }
    }
 }
--- a/homeassistant/components/acmeda/translations/en.json
+++ b/homeassistant/components/acmeda/translations/en.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "No new Pulse hubs discovered.",
            "no_devices_found": "No devices found on the network"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "Pick a hub to add"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/es.json
+++ b/homeassistant/components/acmeda/translations/es.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "No se han descubierto nuevos hubs Pulse.",
            "no_devices_found": "No se encontraron dispositivos en la red"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "Elige un hub para a\u00f1adir"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/et.json
+++ b/homeassistant/components/acmeda/translations/et.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "Uusi Pulse'i jaotureid ei avastatud.",
            "no_devices_found": "V\u00f5rgus ei tuvastatud \u00fchtegi seadet"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "Vali lisatav jaotur"
            }
        }
-    },
-    "title": ""
+    }
 }
--- a/homeassistant/components/acmeda/translations/fr.json
+++ b/homeassistant/components/acmeda/translations/fr.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "Aucun nouveau hub Pulse n'a \u00e9t\u00e9 d\u00e9couvert.",
            "no_devices_found": "Aucun appareil trouv\u00e9 sur le r\u00e9seau"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "Choisissez un hub \u00e0 ajouter"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/it.json
+++ b/homeassistant/components/acmeda/translations/it.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "Non sono stati scoperti nuovi hub Pulse.",
            "no_devices_found": "Nessun dispositivo trovato sulla rete"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "Scegliere un hub da aggiungere"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/ko.json
+++ b/homeassistant/components/acmeda/translations/ko.json
@@ -1,8 +1,5 @@
 {
    "config": {
-        "abort": {
-            "all_configured": "\ubc1c\uacac\ub41c \uc0c8\ub85c\uc6b4 Pulse \ud5c8\ube0c\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."
-        },
        "step": {
            "user": {
                "data": {
@@ -11,6 +8,5 @@
                "title": "\ucd94\uac00\ud560 \ud5c8\ube0c \uc120\ud0dd\ud558\uae30"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/lb.json
+++ b/homeassistant/components/acmeda/translations/lb.json
@@ -1,7 +1,7 @@
 {
    "config": {
        "abort": {
-            "all_configured": "Keng nei Pulse Hubs entdeckt."
+            "no_devices_found": "Keng Apparater am Netzwierk fonnt"
        },
        "step": {
            "user": {
@@ -11,6 +11,5 @@
                "title": "Wiel den Hub aus dee soll dob\u00e4igesat ginn."
            }
        }
-    },
-    "title": "Rollease ACmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/nl.json
+++ b/homeassistant/components/acmeda/translations/nl.json
@@ -1,8 +1,5 @@
 {
    "config": {
-        "abort": {
-            "all_configured": "Geen nieuwe Pulse hubs ontdekt."
-        },
        "step": {
            "user": {
                "data": {
@@ -11,6 +8,5 @@
                "title": "Kies een hub om toe te voegen"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/no.json
+++ b/homeassistant/components/acmeda/translations/no.json
@@ -1,17 +1,15 @@
 {
    "config": {
        "abort": {
-            "all_configured": "Ingen nye Pulse-hub oppdaget.",
            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket"
        },
        "step": {
            "user": {
                "data": {
-                    "id": "Verts-ID"
+                    "id": "Vert ID"
                },
                "title": "Velg en hub du vil legge til"
            }
        }
-    },
-    "title": ""
+    }
 }
--- a/homeassistant/components/acmeda/translations/pl.json
+++ b/homeassistant/components/acmeda/translations/pl.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "Nie wykryto hub\u00f3w Pulse",
            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "Wybierz hub, kt\u00f3ry chcesz doda\u0107"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/ru.json
+++ b/homeassistant/components/acmeda/translations/ru.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b.",
            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438."
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0445\u0430\u0431, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u043d\u0443\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/acmeda/translations/zh-Hant.json
+++ b/homeassistant/components/acmeda/translations/zh-Hant.json
@@ -1,7 +1,6 @@
 {
    "config": {
        "abort": {
-            "all_configured": "\u672a\u641c\u5c0b\u5230 Pulse hub",
            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099"
        },
        "step": {
@@ -12,6 +11,5 @@
                "title": "\u9078\u64c7\u6240\u8981\u65b0\u589e\u7684 Hub"
            }
        }
-    },
-    "title": "Rollease Acmeda Automate"
+    }
 }
--- a/homeassistant/components/adguard/translations/bg.json
+++ b/homeassistant/components/adguard/translations/bg.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430\u0449\u0430\u0442\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f.",
            "single_instance_allowed": "\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0430 \u0435 \u0441\u0430\u043c\u043e \u0435\u0434\u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043d\u0430 AdGuard Home."
        },
-        "error": {
-            "connection_error": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u0432\u044a\u0440\u0437\u0432\u0430\u043d\u0435."
-        },
        "step": {
            "hassio_confirm": {
                "description": "\u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u0442\u0435 Home Assistant \u0434\u0430 \u0441\u0435 \u0441\u0432\u044a\u0440\u0437\u0432\u0430 \u0441 AdGuard Home, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0435\u043d \u043e\u0442 Hass.io \u0434\u043e\u0431\u0430\u0432\u043a\u0430\u0442\u0430: {addon} ?",
--- a/homeassistant/components/adguard/translations/ca.json
+++ b/homeassistant/components/adguard/translations/ca.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
        },
        "error": {
-            "cannot_connect": "Ha fallat la connexi\u00f3",
-            "connection_error": "No s'ha pogut connectar."
+            "cannot_connect": "Ha fallat la connexi\u00f3"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/adguard/translations/cs.json
+++ b/homeassistant/components/adguard/translations/cs.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
        },
        "error": {
-            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
-            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit."
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
        },
        "step": {
            "hassio_confirm": {
@@ -21,7 +20,8 @@
                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
-                }
+                },
+                "description": "Nastavte svou instanci AdGuard Home pro monitorov\u00e1n\u00ed a \u0159\u00edzen\u00ed."
            }
        }
    }
--- a/homeassistant/components/adguard/translations/da.json
+++ b/homeassistant/components/adguard/translations/da.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "Opdaterede eksisterende konfiguration.",
            "single_instance_allowed": "Kun en enkelt konfiguration af AdGuard Home er tilladt."
        },
-        "error": {
-            "connection_error": "Forbindelse mislykkedes."
-        },
        "step": {
            "hassio_confirm": {
                "description": "Vil du konfigurere Home Assistant til at oprette forbindelse til AdGuard Home leveret af Hass.io-tilf\u00f8jelsen: {addon}?",
--- a/homeassistant/components/adguard/translations/de.json
+++ b/homeassistant/components/adguard/translations/de.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "Bestehende Konfiguration wurde aktualisiert.",
            "single_instance_allowed": "Es ist nur eine einzige Konfiguration von AdGuard Home zul\u00e4ssig."
        },
-        "error": {
-            "connection_error": "Fehler beim Herstellen einer Verbindung."
-        },
        "step": {
            "hassio_confirm": {
                "description": "M\u00f6chtest du Home Assistant so konfigurieren, dass eine Verbindung mit AdGuard Home als Hass.io-Add-On hergestellt wird: {addon}?",
--- a/homeassistant/components/adguard/translations/en.json
+++ b/homeassistant/components/adguard/translations/en.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Already configured. Only a single configuration possible."
        },
        "error": {
-            "cannot_connect": "Failed to connect",
-            "connection_error": "Failed to connect."
+            "cannot_connect": "Failed to connect"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/adguard/translations/es-419.json
+++ b/homeassistant/components/adguard/translations/es-419.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "Se actualiz\u00f3 la configuraci\u00f3n existente.",
            "single_instance_allowed": "Solo se permite una \u00fanica configuraci\u00f3n de AdGuard Home."
        },
-        "error": {
-            "connection_error": "Error al conectar."
-        },
        "step": {
            "hassio_confirm": {
                "description": "\u00bfDesea configurar Home Assistant para conectarse a la p\u00e1gina principal de AdGuard proporcionada por el complemento Hass.io: {addon}?",
--- a/homeassistant/components/adguard/translations/es.json
+++ b/homeassistant/components/adguard/translations/es.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "S\u00f3lo se permite una \u00fanica configuraci\u00f3n de AdGuard Home."
        },
        "error": {
-            "cannot_connect": "No se pudo conectar",
-            "connection_error": "No se conect\u00f3."
+            "cannot_connect": "No se pudo conectar"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/adguard/translations/et.json
+++ b/homeassistant/components/adguard/translations/et.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
        },
        "error": {
-            "cannot_connect": "\u00dchendamine nurjus",
-            "connection_error": "\u00dchenduse loomine nurjus"
+            "cannot_connect": "\u00dchendamine nurjus"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/adguard/translations/fi.json
+++ b/homeassistant/components/adguard/translations/fi.json
@@ -1,8 +1,5 @@
 {
    "config": {
-        "error": {
-            "connection_error": "Yhdist\u00e4minen ep\u00e4onnistui."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/fr.json
+++ b/homeassistant/components/adguard/translations/fr.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Une seule configuration d'AdGuard Home est autoris\u00e9e."
        },
        "error": {
-            "cannot_connect": "\u00c9chec de connexion",
-            "connection_error": "\u00c9chec de connexion."
+            "cannot_connect": "\u00c9chec de connexion"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/adguard/translations/hu.json
+++ b/homeassistant/components/adguard/translations/hu.json
@@ -1,5 +1,8 @@
 {
    "config": {
+        "error": {
+            "cannot_connect": "Sikertelen csatlakoz\u00e1s"
+        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/id.json
+++ b/homeassistant/components/adguard/translations/id.json
@@ -1,8 +1,5 @@
 {
    "config": {
-        "error": {
-            "connection_error": "Gagal terhubung."
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/it.json
+++ b/homeassistant/components/adguard/translations/it.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
        },
        "error": {
-            "cannot_connect": "Impossibile connettersi",
-            "connection_error": "Impossibile connettersi."
+            "cannot_connect": "Impossibile connettersi"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/adguard/translations/ko.json
+++ b/homeassistant/components/adguard/translations/ko.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "\uae30\uc874 \uad6c\uc131\uc744 \uc5c5\ub370\uc774\ud2b8\ud588\uc2b5\ub2c8\ub2e4.",
            "single_instance_allowed": "\ud558\ub098\uc758 AdGuard Home \ub9cc \uad6c\uc131\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
        },
-        "error": {
-            "connection_error": "\uc5f0\uacb0\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4."
-        },
        "step": {
            "hassio_confirm": {
                "description": "Hass.io {addon} \uc560\ub4dc\uc628\uc73c\ub85c AdGuard Home \uc5d0 \uc5f0\uacb0\ud558\ub3c4\ub85d Home Assistant \ub97c \uad6c\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
--- a/homeassistant/components/adguard/translations/lb.json
+++ b/homeassistant/components/adguard/translations/lb.json
@@ -2,11 +2,10 @@
    "config": {
        "abort": {
            "existing_instance_updated": "D\u00e9i bestehend Konfiguratioun ass ge\u00e4nnert.",
-            "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vun AdGuard Home ass erlaabt."
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun m\u00e9iglech."
        },
        "error": {
-            "cannot_connect": "Feeler beim verbannen",
-            "connection_error": "Feeler beim verbannen."
+            "cannot_connect": "Feeler beim verbannen"
        },
        "step": {
            "hassio_confirm": {
@@ -18,9 +17,9 @@
                    "host": "Host",
                    "password": "Passwuert",
                    "port": "Port",
-                    "ssl": "AdGuard Home benotzt een SSL Zertifikat",
+                    "ssl": "Benotzt een SSL Zertifikat",
                    "username": "Benotzernumm",
-                    "verify_ssl": "AdGuard Home benotzt een eegenen Zertifikat"
+                    "verify_ssl": "SSL Zertifikat iwwerpr\u00e9iwen"
                },
                "description": "Konfigur\u00e9iert \u00e4r AdGuard Home Instanz fir d'Iwwerwaachung an d'Kontroll z'erlaben."
            }
--- a/homeassistant/components/adguard/translations/nl.json
+++ b/homeassistant/components/adguard/translations/nl.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Slechts \u00e9\u00e9n configuratie van AdGuard Home is toegestaan."
        },
        "error": {
-            "cannot_connect": "Kan geen verbinding maken",
-            "connection_error": "Kon niet verbinden."
+            "cannot_connect": "Kan geen verbinding maken"
        },
        "step": {
            "hassio_confirm": {
@@ -15,6 +14,7 @@
            },
            "user": {
                "data": {
+                    "host": "Host",
                    "password": "Wachtwoord",
                    "port": "Poort",
                    "ssl": "AdGuard Home maakt gebruik van een SSL certificaat",
--- a/homeassistant/components/adguard/translations/no.json
+++ b/homeassistant/components/adguard/translations/no.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
        },
        "error": {
-            "cannot_connect": "Tilkobling mislyktes",
-            "connection_error": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/adguard/translations/pl.json
+++ b/homeassistant/components/adguard/translations/pl.json
@@ -5,12 +5,11 @@
            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
        },
        "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
        },
        "step": {
            "hassio_confirm": {
-                "description": "Czy chcesz skonfigurowa\u0107 Home Assistant, aby po\u0142\u0105czy\u0142 si\u0119 z AdGuard Home przez dodatek Hass.io {addon}?",
+                "description": "Czy chcesz skonfigurowa\u0107 Home Assistanta, aby po\u0142\u0105czy\u0142 si\u0119 z AdGuard Home przez dodatek Hass.io {addon}?",
                "title": "AdGuard Home przez dodatek Hass.io"
            },
            "user": {
--- a/homeassistant/components/adguard/translations/pt-BR.json
+++ b/homeassistant/components/adguard/translations/pt-BR.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "Configura\u00e7\u00e3o existente atualizada.",
            "single_instance_allowed": "Apenas uma \u00fanica configura\u00e7\u00e3o do AdGuard Home \u00e9 permitida."
        },
-        "error": {
-            "connection_error": "Falhou ao conectar."
-        },
        "step": {
            "hassio_confirm": {
                "description": "Deseja configurar o Home Assistant para se conectar ao AdGuard Home fornecido pelo complemento Hass.io: {addon} ?",
--- a/homeassistant/components/adguard/translations/pt.json
+++ b/homeassistant/components/adguard/translations/pt.json
@@ -1,8 +1,5 @@
 {
    "config": {
-        "error": {
-            "connection_error": "Falha na liga\u00e7\u00e3o"
-        },
        "step": {
            "hassio_confirm": {
                "title": "AdGuard Home via Hass.io add-on"
--- a/homeassistant/components/adguard/translations/ru.json
+++ b/homeassistant/components/adguard/translations/ru.json
@@ -5,13 +5,12 @@
            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
        },
        "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
-            "connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
        },
        "step": {
            "hassio_confirm": {
-                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a AdGuard Home (\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 \u0434\u043b\u044f Hass.io \"{addon}\")?",
-                "title": "AdGuard Home (\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 \u0434\u043b\u044f Hass.io)"
+                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a AdGuard Home (\u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u0434\u043b\u044f Hass.io \"{addon}\")?",
+                "title": "AdGuard Home (\u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u0434\u043b\u044f Hass.io)"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/sl.json
+++ b/homeassistant/components/adguard/translations/sl.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "Posodobljena obstoje\u010da konfiguracija.",
            "single_instance_allowed": "Dovoljena je samo ena konfiguracija AdGuard Home."
        },
-        "error": {
-            "connection_error": "Povezava ni uspela."
-        },
        "step": {
            "hassio_confirm": {
                "description": "\u017delite konfigurirati Home Assistant-a za povezavo z AdGuard Home, ki ga ponuja Hass.io add-on {addon} ?",
--- a/homeassistant/components/adguard/translations/sv.json
+++ b/homeassistant/components/adguard/translations/sv.json
@@ -4,9 +4,6 @@
            "existing_instance_updated": "Uppdaterade existerande konfiguration.",
            "single_instance_allowed": "Endast en enda konfiguration av AdGuard Home \u00e4r till\u00e5ten."
        },
-        "error": {
-            "connection_error": "Det gick inte att ansluta."
-        },
        "step": {
            "hassio_confirm": {
                "description": "Vill du konfigurera Home Assistant f\u00f6r att ansluta till AdGuard Home som tillhandah\u00e5lls av Hass.io Add-on: {addon}?",
--- a/homeassistant/components/adguard/translations/zh-Hans.json
+++ b/homeassistant/components/adguard/translations/zh-Hans.json
@@ -3,9 +3,6 @@
        "abort": {
            "existing_instance_updated": "\u66f4\u65b0\u4e86\u73b0\u6709\u914d\u7f6e\u3002"
        },
-        "error": {
-            "connection_error": "\u8fde\u63a5\u5931\u8d25\u3002"
-        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/zh-Hant.json
+++ b/homeassistant/components/adguard/translations/zh-Hant.json
@@ -5,8 +5,7 @@
            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
        },
        "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557",
-            "connection_error": "\u9023\u7dda\u5931\u6557\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
        },
        "step": {
            "hassio_confirm": {
--- a/homeassistant/components/ads/light.py
+++ b/homeassistant/components/ads/light.py
@@ -68,10 +68,9 @@ class AdsLight(AdsEntity, LightEntity):
    @property
    def supported_features(self):
        """Flag supported features."""
-        support = 0
        if self._ads_var_brightness is not None:
-            support = SUPPORT_BRIGHTNESS
-        return support
+            return SUPPORT_BRIGHTNESS
+        return 0

    @property
    def is_on(self):
--- a/homeassistant/components/advantage_air/const.py
+++ b/homeassistant/components/advantage_air/const.py
@@ -1,6 +1,6 @@
 """Constants used by Advantage Air integration."""
 DOMAIN = "advantage_air"
-ADVANTAGE_AIR_RETRY = 5
+ADVANTAGE_AIR_RETRY = 10
 ADVANTAGE_AIR_STATE_OPEN = "open"
 ADVANTAGE_AIR_STATE_CLOSE = "close"
 ADVANTAGE_AIR_STATE_ON = "on"
--- a/Show More
+++ b/Show More