From edecf9d58f51b2c063184e9e4c05a4615e712061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 13 Oct 2019 14:05:34 +0300
Subject: [PATCH 01/70] Improve customize.yaml non-inclusion warning message

Link to relevant docs, note that changes won't be applied after a
restart if the include isn't in place (changes _do_ actually affect the
current runtime configuration and are persisted in customize.yaml).
---
 src/panels/config/customize/ha-form-customize.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/panels/config/customize/ha-form-customize.js b/src/panels/config/customize/ha-form-customize.js
index 17799f8415..139ea4bbcc 100644
--- a/src/panels/config/customize/ha-form-customize.js
+++ b/src/panels/config/customize/ha-form-customize.js
@@ -26,9 +26,10 @@ class HaFormCustomize extends PolymerElement {
         if="[[computeShowWarning(localConfig, globalConfig)]]"
       >
         <div class="warning">
-          It seems that your configuration.yaml doesn't properly include
-          customize.yaml<br />
-          Changes made here won't affect your configuration.
+          It seems that your configuration.yaml doesn't properly
+          <a href="https://www.home-assistant.io/docs/configuration/customizing-devices/#customization-using-the-ui" target="_blank">include customize.yaml</a>.<br />
+          Changes made here are written in it, but will not be applied after a
+          restart unless the include is in place.
         </div>
       </template>
       <template is="dom-if" if="[[hasLocalAttributes]]">

From 5f29b66a8d37fb808e2ef59a36acccc598b44509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 13 Oct 2019 21:15:06 +0300
Subject: [PATCH 02/70] Further tweak the message

---
 src/panels/config/customize/ha-form-customize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panels/config/customize/ha-form-customize.js b/src/panels/config/customize/ha-form-customize.js
index 139ea4bbcc..7c3290ae45 100644
--- a/src/panels/config/customize/ha-form-customize.js
+++ b/src/panels/config/customize/ha-form-customize.js
@@ -29,7 +29,7 @@ class HaFormCustomize extends PolymerElement {
           It seems that your configuration.yaml doesn't properly
           <a href="https://www.home-assistant.io/docs/configuration/customizing-devices/#customization-using-the-ui" target="_blank">include customize.yaml</a>.<br />
           Changes made here are written in it, but will not be applied after a
-          restart unless the include is in place.
+          configuration reload unless the include is in place.
         </div>
       </template>
       <template is="dom-if" if="[[hasLocalAttributes]]">

From 88567df36dd0186d8cd8a1d451a72114c61c0094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 14 Oct 2019 22:03:28 +0300
Subject: [PATCH 03/70] Prettier

---
 src/panels/config/customize/ha-form-customize.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/panels/config/customize/ha-form-customize.js b/src/panels/config/customize/ha-form-customize.js
index 7c3290ae45..7b1bca7a49 100644
--- a/src/panels/config/customize/ha-form-customize.js
+++ b/src/panels/config/customize/ha-form-customize.js
@@ -27,7 +27,11 @@ class HaFormCustomize extends PolymerElement {
       >
         <div class="warning">
           It seems that your configuration.yaml doesn't properly
-          <a href="https://www.home-assistant.io/docs/configuration/customizing-devices/#customization-using-the-ui" target="_blank">include customize.yaml</a>.<br />
+          <a
+            href="https://www.home-assistant.io/docs/configuration/customizing-devices/#customization-using-the-ui"
+            target="_blank"
+            >include customize.yaml</a
+          >.<br />
           Changes made here are written in it, but will not be applied after a
           configuration reload unless the include is in place.
         </div>

From 555b746f4ba72ca929bac6f01cc0e55e145f33cb Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Mon, 14 Oct 2019 21:27:51 +0200
Subject: [PATCH 04/70] Allow device actions to specify extra fields (#4002)

* Allow device actions to specify extra fields

* Typing etc.

* Use deviceAutomationsEqual to compare automations
---
 src/data/device_automation.ts             | 11 ++-
 src/panels/config/js/condition/device.tsx |  2 +-
 src/panels/config/js/script/device.tsx    | 86 +++++++++++++++++++++--
 src/panels/config/js/trigger/device.tsx   |  2 +-
 src/translations/en.json                  |  5 +-
 5 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/src/data/device_automation.ts b/src/data/device_automation.ts
index 0a308fcdbc..58be904d62 100644
--- a/src/data/device_automation.ts
+++ b/src/data/device_automation.ts
@@ -39,6 +39,15 @@ export const fetchDeviceTriggers = (hass: HomeAssistant, deviceId: string) =>
     device_id: deviceId,
   });
 
+export const fetchDeviceActionCapabilities = (
+  hass: HomeAssistant,
+  action: DeviceAction
+) =>
+  hass.callWS<DeviceAction[]>({
+    type: "device_automation/action/capabilities",
+    action,
+  });
+
 export const fetchDeviceConditionCapabilities = (
   hass: HomeAssistant,
   condition: DeviceCondition
@@ -57,7 +66,7 @@ export const fetchDeviceTriggerCapabilities = (
     trigger,
   });
 
-const whitelist = ["above", "below", "for"];
+const whitelist = ["above", "below", "code", "for"];
 
 export const deviceAutomationsEqual = (
   a: DeviceAutomation,
diff --git a/src/panels/config/js/condition/device.tsx b/src/panels/config/js/condition/device.tsx
index 6c3206c4b6..1fd9a8385e 100644
--- a/src/panels/config/js/condition/device.tsx
+++ b/src/panels/config/js/condition/device.tsx
@@ -83,7 +83,7 @@ export default class DeviceCondition extends Component<any, any> {
   }
 
   public componentDidUpdate(prevProps) {
-    if (prevProps.condition !== this.props.condition) {
+    if (!deviceAutomationsEqual(prevProps.condition, this.props.condition)) {
       this._getCapabilities();
     }
   }
diff --git a/src/panels/config/js/script/device.tsx b/src/panels/config/js/script/device.tsx
index 7689f09aa3..344ff96253 100644
--- a/src/panels/config/js/script/device.tsx
+++ b/src/panels/config/js/script/device.tsx
@@ -2,8 +2,14 @@ import { h, Component } from "preact";
 
 import "../../../../components/device/ha-device-picker";
 import "../../../../components/device/ha-device-action-picker";
-import { HomeAssistant } from "../../../../types";
+import "../../../../components/ha-form";
+
+import {
+  fetchDeviceActionCapabilities,
+  deviceAutomationsEqual,
+} from "../../../../data/device_automation";
 import { DeviceAction } from "../../../../data/script";
+import { HomeAssistant } from "../../../../types";
 
 export default class DeviceActionEditor extends Component<
   {
@@ -14,6 +20,7 @@ export default class DeviceActionEditor extends Component<
   },
   {
     device_id: string | undefined;
+    capabilities: any | undefined;
   }
 > {
   public static defaultConfig: DeviceAction = {
@@ -22,16 +29,26 @@ export default class DeviceActionEditor extends Component<
     entity_id: "",
   };
 
+  private _origAction;
+
   constructor() {
     super();
     this.devicePicked = this.devicePicked.bind(this);
     this.deviceActionPicked = this.deviceActionPicked.bind(this);
-    this.state = { device_id: undefined };
+    this._extraFieldsChanged = this._extraFieldsChanged.bind(this);
+    this.state = { device_id: undefined, capabilities: undefined };
   }
 
   public render() {
     const { action, hass } = this.props;
     const deviceId = this.state.device_id || action.device_id;
+    const capabilities = this.state.capabilities;
+    const extraFieldsData =
+      capabilities && capabilities.extra_fields
+        ? capabilities.extra_fields.map((item) => {
+            return { [item.name]: this.props.action[item.name] };
+          })
+        : undefined;
 
     return (
       <div>
@@ -48,16 +65,77 @@ export default class DeviceActionEditor extends Component<
           hass={hass}
           label="Action"
         />
+        {extraFieldsData && (
+          <ha-form
+            data={Object.assign({}, ...extraFieldsData)}
+            onData-changed={this._extraFieldsChanged}
+            schema={this.state.capabilities.extra_fields}
+            computeLabel={this._extraFieldsComputeLabelCallback(hass.localize)}
+          />
+        )}
       </div>
     );
   }
 
+  public componentDidMount() {
+    if (!this.state.capabilities) {
+      this._getCapabilities();
+    }
+    if (this.props.action) {
+      this._origAction = this.props.action;
+    }
+  }
+
+  public componentDidUpdate(prevProps) {
+    if (!deviceAutomationsEqual(prevProps.action, this.props.action)) {
+      this._getCapabilities();
+    }
+  }
+
   private devicePicked(ev) {
-    this.setState({ device_id: ev.target.value });
+    this.setState({ ...this.state, device_id: ev.target.value });
   }
 
   private deviceActionPicked(ev) {
-    const deviceAction = { ...ev.target.value };
+    let deviceAction = ev.target.value;
+    if (
+      this._origAction &&
+      deviceAutomationsEqual(this._origAction, deviceAction)
+    ) {
+      deviceAction = this._origAction;
+    }
     this.props.onChange(this.props.index, deviceAction);
   }
+
+  private async _getCapabilities() {
+    const action = this.props.action;
+
+    const capabilities = action.domain
+      ? await fetchDeviceActionCapabilities(this.props.hass, action)
+      : null;
+    this.setState({ ...this.state, capabilities });
+  }
+
+  private _extraFieldsChanged(ev) {
+    if (!ev.detail.path) {
+      return;
+    }
+    const item = ev.detail.path.replace("data.", "");
+    const value = ev.detail.value || undefined;
+
+    this.props.onChange(this.props.index, {
+      ...this.props.action,
+      [item]: value,
+    });
+  }
+
+  private _extraFieldsComputeLabelCallback(localize) {
+    // Returns a callback for ha-form to calculate labels per schema object
+    return (schema) =>
+      localize(
+        `ui.panel.config.automation.editor.actions.type.device_id.extra_fields.${
+          schema.name
+        }`
+      ) || schema.name;
+  }
 }
diff --git a/src/panels/config/js/trigger/device.tsx b/src/panels/config/js/trigger/device.tsx
index 982fe55a01..a9dd929ac1 100644
--- a/src/panels/config/js/trigger/device.tsx
+++ b/src/panels/config/js/trigger/device.tsx
@@ -84,7 +84,7 @@ export default class DeviceTrigger extends Component<any, any> {
   }
 
   public componentDidUpdate(prevProps) {
-    if (prevProps.trigger !== this.props.trigger) {
+    if (!deviceAutomationsEqual(prevProps.trigger, this.props.trigger)) {
       this._getCapabilities();
     }
   }
diff --git a/src/translations/en.json b/src/translations/en.json
index abd73af154..a7f99e6645 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -908,7 +908,10 @@
                   "service_data": "[%key:ui::panel::config::automation::editor::actions::type::service::service_data%]"
                 },
                 "device_id": {
-                  "label": "Device"
+                  "label": "Device",
+                  "extra_fields": {
+                    "code": "Code"
+                  }
                 },
                 "scene": {
                   "label": "Activate scene"

From 9d3dfad98cda184ecd03f6315788d6a89e75edb2 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 14 Oct 2019 21:28:13 +0200
Subject: [PATCH 05/70] Update integration-badge.ts (#4001)

---
 src/onboarding/integration-badge.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/onboarding/integration-badge.ts b/src/onboarding/integration-badge.ts
index 3035c8b893..df2adb3c18 100644
--- a/src/onboarding/integration-badge.ts
+++ b/src/onboarding/integration-badge.ts
@@ -74,6 +74,7 @@ class IntegrationBadge extends LitElement {
 
       .title {
         min-height: 2.3em;
+        word-break: break-word;
       }
     `;
   }

From 59e4cdc62a834f817a2a1f353ce1bfd41aa4a18a Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Mon, 14 Oct 2019 21:28:44 +0200
Subject: [PATCH 06/70] Added integration name to System Options dialog (#3996)

* Added integration name to System Options dialog

* Passed integration name into translation string

* Translated integration name

* Added option for no translation
---
 .../dialog-config-entry-system-options.ts        | 16 ++++++++++++++--
 src/translations/en.json                         |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts b/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts
index 1064d41b36..2950d4c61a 100644
--- a/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts
+++ b/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts
@@ -60,7 +60,13 @@ class DialogConfigEntrySystemOptions extends LitElement {
         @opened-changed="${this._openedChanged}"
       >
         <h2>
-          ${this.hass.localize("ui.dialogs.config_entry_system_options.title")}
+          ${this.hass.localize(
+            "ui.dialogs.config_entry_system_options.title",
+            "integration",
+            this.hass.localize(
+              `component.${this._params.entry.domain}.config.title`
+            ) || this._params.entry.domain
+          )}
         </h2>
         <paper-dialog-scrollable>
           ${this._loading
@@ -89,7 +95,13 @@ class DialogConfigEntrySystemOptions extends LitElement {
                       </p>
                       <p class="secondary">
                         ${this.hass.localize(
-                          "ui.dialogs.config_entry_system_options.enable_new_entities_description"
+                          "ui.dialogs.config_entry_system_options.enable_new_entities_description",
+                          "integration",
+                          this.hass.localize(
+                            `component.${
+                              this._params.entry.domain
+                            }.config.title`
+                          ) || this._params.entry.domain
                         )}
                       </p>
                     </div>
diff --git a/src/translations/en.json b/src/translations/en.json
index a7f99e6645..aecc059a9f 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -559,9 +559,9 @@
         }
       },
       "config_entry_system_options": {
-        "title": "System Options",
+        "title": "System Options for {integration}",
         "enable_new_entities_label": "Enable newly added entities.",
-        "enable_new_entities_description": "If disabled, newly discovered entities will not be automatically added to Home Assistant."
+        "enable_new_entities_description": "If disabled, newly discovered entities for {integration} will not be automatically added to Home Assistant."
       },
       "zha_device_info": {
         "manuf": "by {manufacturer}",

From 424d677bcba79599528cadc93979a75da536e578 Mon Sep 17 00:00:00 2001
From: Marcus Fredlund <33879283+mr-awk@users.noreply.github.com>
Date: Mon, 14 Oct 2019 21:29:37 +0200
Subject: [PATCH 07/70] Alarm Panel card: number buttons outline and adjusted
 padding and font-size fixing #2812 (#3991)

* outline on alarm panel buttons

* Fix for font-size before mwc-button is working.

* suggested edits from review

* changed to just outline

* Remove base-unit
---
 .../lovelace/cards/hui-alarm-panel-card.ts       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
index e8a9fccc80..bcd217f305 100644
--- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts
+++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
@@ -164,7 +164,7 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
                         <mwc-button
                           .value="${value}"
                           @click="${this._handlePadClick}"
-                          dense
+                          outlined
                         >
                           ${value === "clear"
                             ? this._label("clear_code")
@@ -226,8 +226,6 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
         --alarm-color-armed: var(--label-badge-red);
         --alarm-color-autoarm: rgba(0, 153, 255, 0.1);
         --alarm-state-color: var(--alarm-color-armed);
-        --base-unit: 15px;
-        font-size: calc(var(--base-unit));
       }
 
       ha-label-badge {
@@ -271,13 +269,11 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
       paper-input {
         margin: 0 auto 8px;
         max-width: 150px;
-        font-size: calc(var(--base-unit));
         text-align: center;
       }
 
       .state {
         margin-left: 16px;
-        font-size: calc(var(--base-unit) * 0.9);
         position: relative;
         bottom: 16px;
         color: var(--alarm-state-color);
@@ -289,14 +285,14 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
         justify-content: center;
         flex-wrap: wrap;
         margin: auto;
-        width: 300px;
+        width: 100%;
+        max-width: 300px;
       }
 
       #keypad mwc-button {
-        margin-bottom: 5%;
+        text-size: 20px;
+        padding: 8px;
         width: 30%;
-        padding: calc(var(--base-unit));
-        font-size: calc(var(--base-unit) * 1.1);
         box-sizing: border-box;
       }
 
@@ -306,11 +302,9 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
         display: flex;
         flex-wrap: wrap;
         justify-content: center;
-        font-size: calc(var(--base-unit) * 1);
       }
 
       .actions mwc-button {
-        min-width: calc(var(--base-unit) * 9);
         margin: 0 4px 4px;
       }
 

From 49d69f65adcfb062bc39d01b272ec82083ada2a0 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Tue, 15 Oct 2019 02:49:03 -0500
Subject: [PATCH 08/70] add show_state option for picture-glance entities
 (#3937)

* add states option below picture-glance entities

* address review comments
---
 src/panels/lovelace/cards/hui-glance-card.ts  |  2 +-
 .../lovelace/cards/hui-picture-glance-card.ts | 89 +++++++++++++------
 src/panels/lovelace/cards/types.ts            |  8 +-
 3 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 067aa6df86..d86281c300 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -206,7 +206,7 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
               ></state-badge>
             `
           : ""}
-        ${this._config!.show_state !== false
+        ${this._config!.show_state !== false && entityConf.show_state !== false
           ? html`
               <div>
                 ${entityConf.show_last_changed
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index abc489358c..a3f2f240ef 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -10,15 +10,14 @@ import {
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import { computeDomain } from "../../../common/entity/compute_domain";
-import { stateIcon } from "../../../common/entity/state_icon";
-
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
 import "../components/hui-image";
 import "../components/hui-warning-element";
 
+import { computeStateName } from "../../../common/entity/compute_state_name";
+import { computeDomain } from "../../../common/entity/compute_domain";
+import { stateIcon } from "../../../common/entity/state_icon";
 import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import { DOMAINS_TOGGLE } from "../../../common/const";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
@@ -26,7 +25,7 @@ import { HomeAssistant } from "../../../types";
 import { longPress } from "../common/directives/long-press-directive";
 import { processConfigEntities } from "../common/process-config-entities";
 import { handleClick } from "../common/handle-click";
-import { PictureGlanceCardConfig, ConfigEntity } from "./types";
+import { PictureGlanceCardConfig, PictureGlanceEntityConfig } from "./types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 
 const STATES_OFF = new Set(["closed", "locked", "not_home", "off"]);
@@ -49,9 +48,9 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
 
   @property() private _config?: PictureGlanceCardConfig;
 
-  private _entitiesDialog?: ConfigEntity[];
+  private _entitiesDialog?: PictureGlanceEntityConfig[];
 
-  private _entitiesToggle?: ConfigEntity[];
+  private _entitiesToggle?: PictureGlanceEntityConfig[];
 
   public getCardSize(): number {
     return 3;
@@ -150,12 +149,12 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
                 <div class="title">${this._config.title}</div>
               `
             : ""}
-          <div>
+          <div class="row">
             ${this._entitiesDialog!.map((entityConf) =>
               this.renderEntity(entityConf, true)
             )}
           </div>
-          <div>
+          <div class="row">
             ${this._entitiesToggle!.map((entityConf) =>
               this.renderEntity(entityConf, false)
             )}
@@ -166,7 +165,7 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
   }
 
   private renderEntity(
-    entityConf: ConfigEntity,
+    entityConf: PictureGlanceEntityConfig,
     dialog: boolean
   ): TemplateResult {
     const stateObj = this.hass!.states[entityConf.entity];
@@ -189,23 +188,38 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
     }
 
     return html`
-      <ha-icon
-        @ha-click=${this._handleTap}
-        @ha-hold=${this._handleHold}
-        .longPress=${longPress()}
-        .config=${entityConf}
-        class="${classMap({
-          "state-on": !STATES_OFF.has(stateObj.state),
-        })}"
-        .icon="${entityConf.icon || stateIcon(stateObj)}"
-        title="${`
+      <div class="wrapper">
+        <ha-icon
+          @ha-click=${this._handleTap}
+          @ha-hold=${this._handleHold}
+          .longPress=${longPress()}
+          .config=${entityConf}
+          class="${classMap({
+            "state-on": !STATES_OFF.has(stateObj.state),
+          })}"
+          .icon="${entityConf.icon || stateIcon(stateObj)}"
+          title="${`
             ${computeStateName(stateObj)} : ${computeStateDisplay(
-          this.hass!.localize,
-          stateObj,
-          this.hass!.language
-        )}
+            this.hass!.localize,
+            stateObj,
+            this.hass!.language
+          )}
           `}"
-      ></ha-icon>
+        ></ha-icon>
+        ${this._config!.show_state !== true && entityConf.show_state !== true
+          ? html`
+              <div class="state"></div>
+            `
+          : html`
+              <div class="state">
+                ${computeStateDisplay(
+                  this.hass!.localize,
+                  stateObj,
+                  this.hass!.language
+                )}
+              </div>
+            `}
+      </div>
     `;
   }
 
@@ -249,6 +263,7 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
         color: white;
         display: flex;
         justify-content: space-between;
+        flex-direction: row;
       }
 
       .box .title {
@@ -265,6 +280,30 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
       ha-icon.state-on {
         color: white;
       }
+      ha-icon.show-state {
+        width: 20px;
+        height: 20px;
+        padding-bottom: 4px;
+        padding-top: 4px;
+      }
+      .state {
+        display: block;
+        font-size: 12px;
+        text-align: center;
+        line-height: 12px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      .row {
+        display: flex;
+        flex-direction: row;
+      }
+      .wrapper {
+        display: flex;
+        flex-direction: column;
+        width: 40px;
+      }
     `;
   }
 }
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index fd02a0710e..fba27bf829 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -82,9 +82,14 @@ export interface ConfigEntity extends EntityConfig {
   hold_action?: ActionConfig;
 }
 
+export interface PictureGlanceEntityConfig extends ConfigEntity {
+  show_state?: boolean;
+}
+
 export interface GlanceConfigEntity extends ConfigEntity {
   show_last_changed?: boolean;
   image?: string;
+  show_state?: boolean;
 }
 
 export interface GlanceCardConfig extends LovelaceCardConfig {
@@ -166,7 +171,7 @@ export interface PictureEntityCardConfig extends LovelaceCardConfig {
 }
 
 export interface PictureGlanceCardConfig extends LovelaceCardConfig {
-  entities: EntityConfig[];
+  entities: PictureGlanceEntityConfig[];
   title?: string;
   image?: string;
   camera_image?: string;
@@ -177,6 +182,7 @@ export interface PictureGlanceCardConfig extends LovelaceCardConfig {
   entity?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  show_state?: boolean;
 }
 
 export interface PlantAttributeTarget extends EventTarget {

From a39e47cced3d6372d56cff10b8324aecda5cdd04 Mon Sep 17 00:00:00 2001
From: Josh McCarty <josh@joshmccarty.com>
Date: Tue, 15 Oct 2019 12:04:29 -0700
Subject: [PATCH 09/70] Updates alarm more-info dialog button styles to match
 lovelace card (#3955)

* Updates alarm more-info dialog button styles to match lovelace card

* Use flex for controlling button size

* Limit max-width of alarm buttons

This matches the width of the code input field
---
 .../controls/more-info-alarm_control_panel.js         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
index 1a96927064..64ab1d8ba5 100644
--- a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
+++ b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
@@ -29,8 +29,9 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(PolymerElement) {
           width: 80px;
         }
         .actions mwc-button {
-          min-width: 160px;
-          margin-bottom: 16px;
+          flex: 1 0 50%;
+          margin: 0 4px 16px;
+          max-width: 200px;
         }
         mwc-button.disarm {
           color: var(--google-red-500);
@@ -137,7 +138,7 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(PolymerElement) {
       <div class="layout horizontal center-justified actions">
         <template is="dom-if" if="[[_disarmVisible]]">
           <mwc-button
-            raised
+            outlined
             class="disarm"
             on-click="_callService"
             data-service="alarm_disarm"
@@ -148,7 +149,7 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(PolymerElement) {
         </template>
         <template is="dom-if" if="[[_armVisible]]">
           <mwc-button
-            raised
+            outlined
             on-click="_callService"
             data-service="alarm_arm_home"
             disabled="[[!_codeValid]]"
@@ -156,7 +157,7 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(PolymerElement) {
             [[localize('ui.card.alarm_control_panel.arm_home')]]
           </mwc-button>
           <mwc-button
-            raised
+            outlined
             on-click="_callService"
             data-service="alarm_arm_away"
             disabled="[[!_codeValid]]"

From ea5ee6189de3d6542b2f17d4ed97919ba2093c9b Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Tue, 15 Oct 2019 19:19:46 -0500
Subject: [PATCH 10/70] filter system users from Person editor (#3958)

* filter system users from Person editor

* address review comments

* address comments

* address comments
---
 src/components/user/ha-user-picker.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/user/ha-user-picker.ts b/src/components/user/ha-user-picker.ts
index d162842cfb..817f1fa4c9 100644
--- a/src/components/user/ha-user-picker.ts
+++ b/src/components/user/ha-user-picker.ts
@@ -18,19 +18,20 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { User, fetchUsers } from "../../data/user";
 import { compare } from "../../common/string/compare";
 
-class HaEntityPicker extends LitElement {
+class HaUserPicker extends LitElement {
   public hass?: HomeAssistant;
   @property() public label?: string;
   @property() public value?: string;
   @property() public users?: User[];
 
   private _sortedUsers = memoizeOne((users?: User[]) => {
-    if (!users || users.length === 1) {
-      return users || [];
+    if (!users) {
+      return [];
     }
-    const sorted = [...users];
-    sorted.sort((a, b) => compare(a.name, b.name));
-    return sorted;
+
+    return users
+      .filter((user) => !user.system_generated)
+      .sort((a, b) => compare(a.name, b.name));
   });
 
   protected render(): TemplateResult | void {
@@ -101,4 +102,4 @@ class HaEntityPicker extends LitElement {
   }
 }
 
-customElements.define("ha-user-picker", HaEntityPicker);
+customElements.define("ha-user-picker", HaUserPicker);

From fb589337f823d15423a5b4b02652932a7fcf9120 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 16 Oct 2019 02:22:57 -0500
Subject: [PATCH 11/70] display card errors with yaml config (#4018)

---
 src/panels/lovelace/cards/hui-error-card.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts
index 4e74586146..bacf546e0e 100644
--- a/src/panels/lovelace/cards/hui-error-card.ts
+++ b/src/panels/lovelace/cards/hui-error-card.ts
@@ -7,9 +7,9 @@ import {
   css,
   CSSResult,
 } from "lit-element";
+import yaml from "js-yaml";
 
 import { LovelaceCard } from "../types";
-import { LovelaceCardConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { ErrorCardConfig } from "./types";
 
@@ -46,7 +46,7 @@ export class HuiErrorCard extends LitElement implements LovelaceCard {
 
     return html`
       ${this._config.error}
-      <pre>${this._toStr(this._config.origConfig)}</pre>
+      <pre>${yaml.safeDump(this._config.origConfig)}</pre>
     `;
   }
 
@@ -63,10 +63,6 @@ export class HuiErrorCard extends LitElement implements LovelaceCard {
       }
     `;
   }
-
-  private _toStr(config: LovelaceCardConfig): string {
-    return JSON.stringify(config, null, 2);
-  }
 }
 
 declare global {

From df29a5becb41f3521f7774a45af14a0096800040 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 16 Oct 2019 08:57:05 -0500
Subject: [PATCH 12/70] Add double tap action (#3879)

* add dbltap_action

* apply to picture-glance

* types and boolean

* fix typo

* simplify double tap logic

* extract hasDoubleClick functionality

* address comments

* address comments

* double_tap_action
---
 gallery/src/demos/demo-util-long-press.ts     |  4 +--
 src/data/lovelace.ts                          |  4 +++
 .../lovelace/cards/hui-entity-button-card.ts  | 21 +++++++++----
 src/panels/lovelace/cards/hui-glance-card.ts  | 21 +++++++++----
 src/panels/lovelace/cards/hui-light-card.ts   |  6 ++--
 src/panels/lovelace/cards/hui-picture-card.ts | 20 +++++++++----
 .../lovelace/cards/hui-picture-entity-card.ts | 18 +++++++----
 .../lovelace/cards/hui-picture-glance-card.ts | 26 +++++++++++-----
 src/panels/lovelace/cards/types.ts            |  5 ++++
 src/panels/lovelace/common/compute-tooltip.ts |  1 +
 .../common/directives/long-press-directive.ts | 30 ++++++++++++++-----
 src/panels/lovelace/common/handle-click.ts    |  8 +++--
 .../lovelace/common/has-double-click.ts       |  6 ++++
 .../lovelace/elements/hui-icon-element.ts     | 20 +++++++++----
 .../lovelace/elements/hui-image-element.ts    | 20 +++++++++----
 .../elements/hui-state-icon-element.ts        | 18 +++++++----
 .../elements/hui-state-label-element.ts       | 20 +++++++++----
 src/panels/lovelace/elements/types.ts         |  4 +++
 18 files changed, 185 insertions(+), 67 deletions(-)
 create mode 100644 src/panels/lovelace/common/has-double-click.ts

diff --git a/gallery/src/demos/demo-util-long-press.ts b/gallery/src/demos/demo-util-long-press.ts
index 5f09e3598f..86d245fe50 100644
--- a/gallery/src/demos/demo-util-long-press.ts
+++ b/gallery/src/demos/demo-util-long-press.ts
@@ -12,7 +12,7 @@ export class DemoUtilLongPress extends LitElement {
         () => html`
           <ha-card>
             <mwc-button
-              @ha-click="${this._handleTap}"
+              @ha-click="${this._handleClick}"
               @ha-hold="${this._handleHold}"
               .longPress="${longPress()}"
             >
@@ -28,7 +28,7 @@ export class DemoUtilLongPress extends LitElement {
     `;
   }
 
-  private _handleTap(ev: Event) {
+  private _handleClick(ev: Event) {
     this._addValue(ev, "tap");
   }
 
diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index 5f32b70b4b..ac8b8ba5a9 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -108,3 +108,7 @@ export const getLovelaceCollection = (conn: Connection) =>
 export interface WindowWithLovelaceProm extends Window {
   llConfProm?: Promise<LovelaceConfig>;
 }
+
+export interface LongPressOptions {
+  hasDoubleClick?: boolean;
+}
diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
index 3d91d68816..ee79f1e80b 100644
--- a/src/panels/lovelace/cards/hui-entity-button-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -28,6 +28,7 @@ import { longPress } from "../common/directives/long-press-directive";
 import { handleClick } from "../common/handle-click";
 import { DOMAINS_TOGGLE } from "../../../common/const";
 import { EntityButtonCardConfig } from "./types";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-entity-button-card")
 class HuiEntityButtonCard extends LitElement implements LovelaceCard {
@@ -61,6 +62,7 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard {
     this._config = {
       theme: "default",
       hold_action: { action: "more-info" },
+      double_tap_action: { action: "none" },
       show_icon: true,
       show_name: true,
       ...config,
@@ -118,9 +120,12 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard {
 
     return html`
       <ha-card
-        @ha-click="${this._handleTap}"
-        @ha-hold="${this._handleHold}"
-        .longPress="${longPress()}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
       >
         ${this._config.show_icon
           ? html`
@@ -212,12 +217,16 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard {
     return `hsl(${hue}, 100%, ${100 - sat / 2}%)`;
   }
 
-  private _handleTap() {
-    handleClick(this, this.hass!, this._config!, false);
+  private _handleClick() {
+    handleClick(this, this.hass!, this._config!, false, false);
   }
 
   private _handleHold() {
-    handleClick(this, this.hass!, this._config!, true);
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index d86281c300..9494200795 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -26,6 +26,7 @@ import { longPress } from "../common/directives/long-press-directive";
 import { processConfigEntities } from "../common/process-config-entities";
 import { handleClick } from "../common/handle-click";
 import { GlanceCardConfig, GlanceConfigEntity } from "./types";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-glance-card")
 export class HuiGlanceCard extends LitElement implements LovelaceCard {
@@ -183,9 +184,12 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
       <div
         class="entity"
         .entityConf="${entityConf}"
-        @ha-click="${this._handleTap}"
-        @ha-hold="${this._handleHold}"
-        .longPress="${longPress()}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(entityConf.double_tap_action),
+        })}
       >
         ${this._config!.show_name !== false
           ? html`
@@ -226,14 +230,19 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  private _handleTap(ev: MouseEvent): void {
+  private _handleClick(ev: MouseEvent): void {
     const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
-    handleClick(this, this.hass!, config, false);
+    handleClick(this, this.hass!, config, false, false);
   }
 
   private _handleHold(ev: MouseEvent): void {
     const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
-    handleClick(this, this.hass!, config, true);
+    handleClick(this, this.hass!, config, true, false);
+  }
+
+  private _handleDblClick(ev: MouseEvent): void {
+    const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
+    handleClick(this, this.hass!, config, false, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index babb4f6004..701c046e95 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -112,12 +112,12 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
               filter: this._computeBrightness(stateObj),
               color: this._computeColor(stateObj),
             })}"
-            @click="${this._handleTap}"
+            @click="${this._handleClick}"
           ></ha-icon>
         </div>
 
         <div id="tooltip">
-          <div class="brightness" @ha-click="${this._handleTap}">
+          <div class="brightness" @ha-click="${this._handleClick}">
             ${brightness} %
           </div>
           <div class="name">
@@ -297,7 +297,7 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
     return `hsl(${hue}, 100%, ${100 - sat / 2}%)`;
   }
 
-  private _handleTap() {
+  private _handleClick() {
     toggleEntity(this.hass!, this._config!.entity!);
   }
 
diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index df98aba342..36dffad8ab 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -16,6 +16,7 @@ import { classMap } from "lit-html/directives/class-map";
 import { handleClick } from "../common/handle-click";
 import { longPress } from "../common/directives/long-press-directive";
 import { PictureCardConfig } from "./types";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-picture-card")
 export class HuiPictureCard extends LitElement implements LovelaceCard {
@@ -55,9 +56,12 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
 
     return html`
       <ha-card
-        @ha-click="${this._handleTap}"
-        @ha-hold="${this._handleHold}"
-        .longPress="${longPress()}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
         class="${classMap({
           clickable: Boolean(
             this._config.tap_action || this._config.hold_action
@@ -86,12 +90,16 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  private _handleTap() {
-    handleClick(this, this.hass!, this._config!, false);
+  private _handleClick() {
+    handleClick(this, this.hass!, this._config!, false, false);
   }
 
   private _handleHold() {
-    handleClick(this, this.hass!, this._config!, true);
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index 69ebefe75c..22bef5170c 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -25,6 +25,7 @@ import { handleClick } from "../common/handle-click";
 import { UNAVAILABLE } from "../../../data/entity";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { PictureEntityCardConfig } from "./types";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-picture-entity-card")
 class HuiPictureEntityCard extends LitElement implements LovelaceCard {
@@ -124,9 +125,12 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard {
           .cameraView=${this._config.camera_view}
           .entity=${this._config.entity}
           .aspectRatio=${this._config.aspect_ratio}
-          @ha-click=${this._handleTap}
+          @ha-click=${this._handleClick}
           @ha-hold=${this._handleHold}
-          .longPress=${longPress()}
+          @ha-dblclick=${this._handleDblClick}
+          .longPress=${longPress({
+            hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+          })}
           class=${classMap({
             clickable: stateObj.state !== UNAVAILABLE,
           })}
@@ -177,12 +181,16 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  private _handleTap() {
-    handleClick(this, this.hass!, this._config!, false);
+  private _handleClick() {
+    handleClick(this, this.hass!, this._config!, false, false);
   }
 
   private _handleHold() {
-    handleClick(this, this.hass!, this._config!, true);
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index a3f2f240ef..98982f3b4f 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -25,6 +25,7 @@ import { HomeAssistant } from "../../../types";
 import { longPress } from "../common/directives/long-press-directive";
 import { processConfigEntities } from "../common/process-config-entities";
 import { handleClick } from "../common/handle-click";
+import { hasDoubleClick } from "../common/has-double-click";
 import { PictureGlanceCardConfig, PictureGlanceEntityConfig } from "./types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 
@@ -130,9 +131,12 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
                 this._config.camera_image
             ),
           })}
-          @ha-click=${this._handleTap}
+          @ha-click=${this._handleClick}
           @ha-hold=${this._handleHold}
-          .longPress=${longPress()}
+          @ha-dblclick=${this._handleDblClick}
+          .longPress=${longPress({
+            hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+          })}
           .config=${this._config}
           .hass=${this.hass}
           .image=${this._config.image}
@@ -190,9 +194,12 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
     return html`
       <div class="wrapper">
         <ha-icon
-          @ha-click=${this._handleTap}
+          @ha-click=${this._handleClick}
           @ha-hold=${this._handleHold}
-          .longPress=${longPress()}
+          @ha-dblclick=${this._handleDblClick}
+          .longPress=${longPress({
+            hasDoubleClick: hasDoubleClick(entityConf.double_tap_action),
+          })}
           .config=${entityConf}
           class="${classMap({
             "state-on": !STATES_OFF.has(stateObj.state),
@@ -223,14 +230,19 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  private _handleTap(ev: MouseEvent): void {
+  private _handleClick(ev: MouseEvent): void {
     const config = (ev.currentTarget as any).config as any;
-    handleClick(this, this.hass!, config, false);
+    handleClick(this, this.hass!, config, false, false);
   }
 
   private _handleHold(ev: MouseEvent): void {
     const config = (ev.currentTarget as any).config as any;
-    handleClick(this, this.hass!, config, true);
+    handleClick(this, this.hass!, config, true, false);
+  }
+
+  private _handleDblClick(ev: MouseEvent): void {
+    const config = (ev.currentTarget as any).entityConf as any;
+    handleClick(this, this.hass!, config, false, true);
   }
 
   static get styles(): CSSResult {
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index fba27bf829..6ec2085d82 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -46,6 +46,7 @@ export interface EntityButtonCardConfig extends LovelaceCardConfig {
   theme?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }
 
 export interface EntityFilterCardConfig extends LovelaceCardConfig {
@@ -80,6 +81,7 @@ export interface GaugeCardConfig extends LovelaceCardConfig {
 export interface ConfigEntity extends EntityConfig {
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }
 
 export interface PictureGlanceEntityConfig extends ConfigEntity {
@@ -141,6 +143,7 @@ export interface PictureCardConfig extends LovelaceCardConfig {
   image?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }
 
 export interface PictureElementsCardConfig extends LovelaceCardConfig {
@@ -166,6 +169,7 @@ export interface PictureEntityCardConfig extends LovelaceCardConfig {
   aspect_ratio?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
   show_name?: boolean;
   show_state?: boolean;
 }
@@ -182,6 +186,7 @@ export interface PictureGlanceCardConfig extends LovelaceCardConfig {
   entity?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
   show_state?: boolean;
 }
 
diff --git a/src/panels/lovelace/common/compute-tooltip.ts b/src/panels/lovelace/common/compute-tooltip.ts
index 6093fa2b79..0b972a7e8e 100644
--- a/src/panels/lovelace/common/compute-tooltip.ts
+++ b/src/panels/lovelace/common/compute-tooltip.ts
@@ -8,6 +8,7 @@ interface Config extends LovelaceElementConfig {
   title?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }
 
 export const computeTooltip = (hass: HomeAssistant, config: Config): string => {
diff --git a/src/panels/lovelace/common/directives/long-press-directive.ts b/src/panels/lovelace/common/directives/long-press-directive.ts
index d89099d628..b4402add08 100644
--- a/src/panels/lovelace/common/directives/long-press-directive.ts
+++ b/src/panels/lovelace/common/directives/long-press-directive.ts
@@ -1,5 +1,6 @@
 import { directive, PropertyPart } from "lit-html";
 import "@material/mwc-ripple";
+import { LongPressOptions } from "../../../../data/lovelace";
 
 const isTouch =
   "ontouchstart" in window ||
@@ -8,7 +9,7 @@ const isTouch =
 
 interface LongPress extends HTMLElement {
   holdTime: number;
-  bind(element: Element): void;
+  bind(element: Element, options): void;
 }
 interface LongPressElement extends Element {
   longPress?: boolean;
@@ -21,6 +22,7 @@ class LongPress extends HTMLElement implements LongPress {
   protected held: boolean;
   protected cooldownStart: boolean;
   protected cooldownEnd: boolean;
+  private dblClickTimeout: number | undefined;
 
   constructor() {
     super();
@@ -65,7 +67,7 @@ class LongPress extends HTMLElement implements LongPress {
     });
   }
 
-  public bind(element: LongPressElement) {
+  public bind(element: LongPressElement, options) {
     if (element.longPress) {
       return;
     }
@@ -120,6 +122,15 @@ class LongPress extends HTMLElement implements LongPress {
       this.timer = undefined;
       if (this.held) {
         element.dispatchEvent(new Event("ha-hold"));
+      } else if (options.hasDoubleClick) {
+        if ((ev as MouseEvent).detail === 1) {
+          this.dblClickTimeout = window.setTimeout(() => {
+            element.dispatchEvent(new Event("ha-click"));
+          }, 250);
+        } else {
+          clearTimeout(this.dblClickTimeout);
+          element.dispatchEvent(new Event("ha-dblclick"));
+        }
       } else {
         element.dispatchEvent(new Event("ha-click"));
       }
@@ -174,14 +185,19 @@ const getLongPress = (): LongPress => {
   return longpress as LongPress;
 };
 
-export const longPressBind = (element: LongPressElement) => {
+export const longPressBind = (
+  element: LongPressElement,
+  options: LongPressOptions
+) => {
   const longpress: LongPress = getLongPress();
   if (!longpress) {
     return;
   }
-  longpress.bind(element);
+  longpress.bind(element, options);
 };
 
-export const longPress = directive(() => (part: PropertyPart) => {
-  longPressBind(part.committer.element);
-});
+export const longPress = directive(
+  (options: LongPressOptions = {}) => (part: PropertyPart) => {
+    longPressBind(part.committer.element, options);
+  }
+);
diff --git a/src/panels/lovelace/common/handle-click.ts b/src/panels/lovelace/common/handle-click.ts
index d4ee03899a..30052d557a 100644
--- a/src/panels/lovelace/common/handle-click.ts
+++ b/src/panels/lovelace/common/handle-click.ts
@@ -13,12 +13,16 @@ export const handleClick = (
     camera_image?: string;
     hold_action?: ActionConfig;
     tap_action?: ActionConfig;
+    double_tap_action?: ActionConfig;
   },
-  hold: boolean
+  hold: boolean,
+  dblClick: boolean
 ): void => {
   let actionConfig: ActionConfig | undefined;
 
-  if (hold && config.hold_action) {
+  if (dblClick && config.double_tap_action) {
+    actionConfig = config.double_tap_action;
+  } else if (hold && config.hold_action) {
     actionConfig = config.hold_action;
   } else if (!hold && config.tap_action) {
     actionConfig = config.tap_action;
diff --git a/src/panels/lovelace/common/has-double-click.ts b/src/panels/lovelace/common/has-double-click.ts
new file mode 100644
index 0000000000..04e1529fbe
--- /dev/null
+++ b/src/panels/lovelace/common/has-double-click.ts
@@ -0,0 +1,6 @@
+import { ActionConfig } from "../../../data/lovelace";
+
+// Check if config or Entity changed
+export function hasDoubleClick(config?: ActionConfig): boolean {
+  return config !== undefined && config.action !== "none";
+}
diff --git a/src/panels/lovelace/elements/hui-icon-element.ts b/src/panels/lovelace/elements/hui-icon-element.ts
index f0da18717d..cc57f993dc 100644
--- a/src/panels/lovelace/elements/hui-icon-element.ts
+++ b/src/panels/lovelace/elements/hui-icon-element.ts
@@ -15,6 +15,7 @@ import { handleClick } from "../common/handle-click";
 import { longPress } from "../common/directives/long-press-directive";
 import { LovelaceElement, IconElementConfig } from "./types";
 import { HomeAssistant } from "../../../types";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-icon-element")
 export class HuiIconElement extends LitElement implements LovelaceElement {
@@ -38,19 +39,26 @@ export class HuiIconElement extends LitElement implements LovelaceElement {
       <ha-icon
         .icon="${this._config.icon}"
         .title="${computeTooltip(this.hass, this._config)}"
-        @ha-click="${this._handleTap}"
-        @ha-hold="${this._handleHold}"
-        .longPress="${longPress()}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
       ></ha-icon>
     `;
   }
 
-  private _handleTap(): void {
-    handleClick(this, this.hass!, this._config!, false);
+  private _handleClick(): void {
+    handleClick(this, this.hass!, this._config!, false, false);
   }
 
   private _handleHold(): void {
-    handleClick(this, this.hass!, this._config!, true);
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
   }
 
   static get styles(): CSSResult {
diff --git a/src/panels/lovelace/elements/hui-image-element.ts b/src/panels/lovelace/elements/hui-image-element.ts
index e6d98e2163..c2f7645c5f 100644
--- a/src/panels/lovelace/elements/hui-image-element.ts
+++ b/src/panels/lovelace/elements/hui-image-element.ts
@@ -15,6 +15,7 @@ import { handleClick } from "../common/handle-click";
 import { longPress } from "../common/directives/long-press-directive";
 import { LovelaceElement, ImageElementConfig } from "./types";
 import { HomeAssistant } from "../../../types";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-image-element")
 export class HuiImageElement extends LitElement implements LovelaceElement {
@@ -49,9 +50,12 @@ export class HuiImageElement extends LitElement implements LovelaceElement {
         .stateFilter="${this._config.state_filter}"
         .title="${computeTooltip(this.hass, this._config)}"
         .aspectRatio="${this._config.aspect_ratio}"
-        @ha-click="${this._handleTap}"
-        @ha-hold="${this._handleHold}"
-        .longPress="${longPress()}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
       ></hui-image>
     `;
   }
@@ -69,12 +73,16 @@ export class HuiImageElement extends LitElement implements LovelaceElement {
     `;
   }
 
-  private _handleTap(): void {
-    handleClick(this, this.hass!, this._config!, false);
+  private _handleClick(): void {
+    handleClick(this, this.hass!, this._config!, false, false);
   }
 
   private _handleHold(): void {
-    handleClick(this, this.hass!, this._config!, true);
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
   }
 }
 
diff --git a/src/panels/lovelace/elements/hui-state-icon-element.ts b/src/panels/lovelace/elements/hui-state-icon-element.ts
index 7f2c39057a..09a2023912 100644
--- a/src/panels/lovelace/elements/hui-state-icon-element.ts
+++ b/src/panels/lovelace/elements/hui-state-icon-element.ts
@@ -18,6 +18,7 @@ import { longPress } from "../common/directives/long-press-directive";
 import { LovelaceElement, StateIconElementConfig } from "./types";
 import { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-state-icon-element")
 export class HuiStateIconElement extends LitElement implements LovelaceElement {
@@ -59,9 +60,12 @@ export class HuiStateIconElement extends LitElement implements LovelaceElement {
       <state-badge
         .stateObj="${stateObj}"
         .title="${computeTooltip(this.hass, this._config)}"
-        @ha-click="${this._handleClick}"
-        @ha-hold="${this._handleHold}"
-        .longPress="${longPress()}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
         .overrideIcon=${this._config.icon}
       ></state-badge>
     `;
@@ -76,11 +80,15 @@ export class HuiStateIconElement extends LitElement implements LovelaceElement {
   }
 
   private _handleClick(): void {
-    handleClick(this, this.hass!, this._config!, false);
+    handleClick(this, this.hass!, this._config!, false, false);
   }
 
   private _handleHold(): void {
-    handleClick(this, this.hass!, this._config!, true);
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
   }
 }
 
diff --git a/src/panels/lovelace/elements/hui-state-label-element.ts b/src/panels/lovelace/elements/hui-state-label-element.ts
index b6389cb842..37c629b455 100644
--- a/src/panels/lovelace/elements/hui-state-label-element.ts
+++ b/src/panels/lovelace/elements/hui-state-label-element.ts
@@ -19,6 +19,7 @@ import { longPress } from "../common/directives/long-press-directive";
 import { LovelaceElement, StateLabelElementConfig } from "./types";
 import { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
+import { hasDoubleClick } from "../common/has-double-click";
 
 @customElement("hui-state-label-element")
 class HuiStateLabelElement extends LitElement implements LovelaceElement {
@@ -59,9 +60,12 @@ class HuiStateLabelElement extends LitElement implements LovelaceElement {
     return html`
       <div
         .title="${computeTooltip(this.hass, this._config)}"
-        @ha-click="${this._handleTap}"
-        @ha-hold="${this._handleHold}"
-        .longPress="${longPress()}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
       >
         ${this._config.prefix}${stateObj
           ? computeStateDisplay(
@@ -74,12 +78,16 @@ class HuiStateLabelElement extends LitElement implements LovelaceElement {
     `;
   }
 
-  private _handleTap(): void {
-    handleClick(this, this.hass!, this._config!, false);
+  private _handleClick(): void {
+    handleClick(this, this.hass!, this._config!, false, false);
   }
 
   private _handleHold(): void {
-    handleClick(this, this.hass!, this._config!, true);
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
   }
 
   static get styles(): CSSResult {
diff --git a/src/panels/lovelace/elements/types.ts b/src/panels/lovelace/elements/types.ts
index b5457e2a04..2aec666e38 100644
--- a/src/panels/lovelace/elements/types.ts
+++ b/src/panels/lovelace/elements/types.ts
@@ -22,6 +22,7 @@ export interface IconElementConfig extends LovelaceElementConfig {
   name?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
   icon: string;
 }
 
@@ -29,6 +30,7 @@ export interface ImageElementConfig extends LovelaceElementConfig {
   entity?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
   image?: string;
   state_image?: string;
   camera_image?: string;
@@ -52,6 +54,7 @@ export interface StateIconElementConfig extends LovelaceElementConfig {
   entity: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
   icon?: string;
 }
 
@@ -61,4 +64,5 @@ export interface StateLabelElementConfig extends LovelaceElementConfig {
   suffix?: string;
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }

From c9242a507571f9f899c021fbad70154e5b82a24f Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 16 Oct 2019 09:09:13 -0500
Subject: [PATCH 13/70] Custom badges (#3867)

* custom badges

* incremental

* functional

* cleanup

* cleanup

* address review comments

* address more comments

* address review comments

* address review comments

* cleanup

* address review comments

* address comments

* address comments

* fix entity-filter

* set hass once

* hass
---
 src/data/lovelace.ts                          |   7 +-
 .../badges/hui-entity-filter-badge.ts         | 140 ++++++++++++++++++
 src/panels/lovelace/badges/hui-error-badge.ts |  65 ++++++++
 .../lovelace/badges/hui-state-label-badge.ts  |  53 +++++++
 src/panels/lovelace/badges/types.ts           |  19 +++
 .../lovelace/common/create-badge-element.ts   |  73 +++++++++
 .../common/generate-lovelace-config.ts        |   3 +-
 .../editor/view-editor/hui-edit-view.ts       |   8 +-
 src/panels/lovelace/types.ts                  |  12 +-
 src/panels/lovelace/views/hui-view.ts         |  53 ++++---
 10 files changed, 409 insertions(+), 24 deletions(-)
 create mode 100644 src/panels/lovelace/badges/hui-entity-filter-badge.ts
 create mode 100644 src/panels/lovelace/badges/hui-error-badge.ts
 create mode 100644 src/panels/lovelace/badges/hui-state-label-badge.ts
 create mode 100644 src/panels/lovelace/badges/types.ts
 create mode 100644 src/panels/lovelace/common/create-badge-element.ts

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index ac8b8ba5a9..c3c8222f3c 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -11,7 +11,7 @@ export interface LovelaceConfig {
 export interface LovelaceViewConfig {
   index?: number;
   title?: string;
-  badges?: string[];
+  badges?: Array<string | LovelaceBadgeConfig>;
   cards?: LovelaceCardConfig[];
   path?: string;
   icon?: string;
@@ -25,6 +25,11 @@ export interface ShowViewConfig {
   user?: string;
 }
 
+export interface LovelaceBadgeConfig {
+  type?: string;
+  [key: string]: any;
+}
+
 export interface LovelaceCardConfig {
   index?: number;
   view_index?: number;
diff --git a/src/panels/lovelace/badges/hui-entity-filter-badge.ts b/src/panels/lovelace/badges/hui-entity-filter-badge.ts
new file mode 100644
index 0000000000..eb569aafc9
--- /dev/null
+++ b/src/panels/lovelace/badges/hui-entity-filter-badge.ts
@@ -0,0 +1,140 @@
+import { createBadgeElement } from "../common/create-badge-element";
+import { processConfigEntities } from "../common/process-config-entities";
+import { LovelaceBadge } from "../types";
+import { EntityFilterEntityConfig } from "../entity-rows/types";
+import { HomeAssistant } from "../../../types";
+import { EntityFilterBadgeConfig } from "./types";
+import { evaluateFilter } from "../common/evaluate-filter";
+
+class EntityFilterBadge extends HTMLElement implements LovelaceBadge {
+  private _elements?: LovelaceBadge[];
+  private _config?: EntityFilterBadgeConfig;
+  private _configEntities?: EntityFilterEntityConfig[];
+  private _hass?: HomeAssistant;
+  private _oldEntities?: EntityFilterEntityConfig[];
+
+  public setConfig(config: EntityFilterBadgeConfig): void {
+    if (!config.entities || !Array.isArray(config.entities)) {
+      throw new Error("entities must be specified.");
+    }
+
+    if (
+      !(config.state_filter && Array.isArray(config.state_filter)) &&
+      !config.entities.every(
+        (entity) =>
+          typeof entity === "object" &&
+          entity.state_filter &&
+          Array.isArray(entity.state_filter)
+      )
+    ) {
+      throw new Error("Incorrect filter config.");
+    }
+
+    this._config = config;
+    this._configEntities = undefined;
+
+    if (this.lastChild) {
+      this.removeChild(this.lastChild);
+      this._elements = undefined;
+    }
+  }
+
+  set hass(hass: HomeAssistant) {
+    if (!hass || !this._config) {
+      return;
+    }
+
+    if (this._elements) {
+      for (const element of this._elements) {
+        element.hass = hass;
+      }
+    }
+
+    if (!this.haveEntitiesChanged(hass)) {
+      this._hass = hass;
+      return;
+    }
+
+    this._hass = hass;
+
+    if (!this._configEntities) {
+      this._configEntities = processConfigEntities(this._config.entities);
+    }
+
+    const entitiesList = this._configEntities.filter((entityConf) => {
+      const stateObj = hass.states[entityConf.entity];
+
+      if (!stateObj) {
+        return false;
+      }
+
+      if (entityConf.state_filter) {
+        for (const filter of entityConf.state_filter) {
+          if (evaluateFilter(stateObj, filter)) {
+            return true;
+          }
+        }
+      } else {
+        for (const filter of this._config!.state_filter) {
+          if (evaluateFilter(stateObj, filter)) {
+            return true;
+          }
+        }
+      }
+
+      return false;
+    });
+
+    if (entitiesList.length === 0) {
+      this.style.display = "none";
+      return;
+    }
+
+    const isSame =
+      this._oldEntities &&
+      entitiesList.length === this._oldEntities.length &&
+      entitiesList.every((entity, idx) => entity === this._oldEntities![idx]);
+
+    if (!isSame) {
+      this._elements = [];
+      for (const badgeConfig of entitiesList) {
+        const element = createBadgeElement(badgeConfig);
+        element.hass = hass;
+        this._elements.push(element);
+      }
+      this._oldEntities = entitiesList;
+    }
+
+    if (!this._elements) {
+      return;
+    }
+
+    // Attach element if it has never been attached.
+    if (!this.lastChild) {
+      for (const element of this._elements) {
+        this.appendChild(element);
+      }
+    }
+
+    this.style.display = "inline";
+  }
+
+  private haveEntitiesChanged(hass: HomeAssistant): boolean {
+    if (!this._hass) {
+      return true;
+    }
+
+    if (!this._configEntities || this._hass.localize !== hass.localize) {
+      return true;
+    }
+
+    for (const config of this._configEntities) {
+      if (this._hass.states[config.entity] !== hass.states[config.entity]) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+}
+customElements.define("hui-entity-filter-badge", EntityFilterBadge);
diff --git a/src/panels/lovelace/badges/hui-error-badge.ts b/src/panels/lovelace/badges/hui-error-badge.ts
new file mode 100644
index 0000000000..9c20ceff39
--- /dev/null
+++ b/src/panels/lovelace/badges/hui-error-badge.ts
@@ -0,0 +1,65 @@
+import {
+  html,
+  LitElement,
+  TemplateResult,
+  customElement,
+  property,
+  css,
+  CSSResult,
+} from "lit-element";
+
+import { LovelaceBadge } from "../types";
+import { HomeAssistant } from "../../../types";
+import { ErrorBadgeConfig } from "./types";
+
+import "../../../components/ha-label-badge";
+
+export const createErrorBadgeElement = (config) => {
+  const el = document.createElement("hui-error-badge");
+  el.setConfig(config);
+  return el;
+};
+
+export const createErrorBadgeConfig = (error) => ({
+  type: "error",
+  error,
+});
+
+@customElement("hui-error-badge")
+export class HuiErrorBadge extends LitElement implements LovelaceBadge {
+  public hass?: HomeAssistant;
+
+  @property() private _config?: ErrorBadgeConfig;
+
+  public setConfig(config: ErrorBadgeConfig): void {
+    this._config = config;
+  }
+
+  protected render(): TemplateResult | void {
+    if (!this._config) {
+      return html``;
+    }
+
+    return html`
+      <ha-label-badge
+        label="Error"
+        icon="hass:alert"
+        description=${this._config.error}
+      ></ha-label-badge>
+    `;
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      :host {
+        --ha-label-badge-color: var(--label-badge-red, #fce588);
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-error-badge": HuiErrorBadge;
+  }
+}
diff --git a/src/panels/lovelace/badges/hui-state-label-badge.ts b/src/panels/lovelace/badges/hui-state-label-badge.ts
new file mode 100644
index 0000000000..acef603a0a
--- /dev/null
+++ b/src/panels/lovelace/badges/hui-state-label-badge.ts
@@ -0,0 +1,53 @@
+import {
+  html,
+  LitElement,
+  TemplateResult,
+  customElement,
+  property,
+} from "lit-element";
+
+import "../../../components/entity/ha-state-label-badge";
+import "../components/hui-warning-element";
+
+import { LovelaceBadge } from "../types";
+import { HomeAssistant } from "../../../types";
+import { computeStateName } from "../../../common/entity/compute_state_name";
+import { StateLabelBadgeConfig } from "./types";
+
+@customElement("hui-state-label-badge")
+export class HuiStateLabelBadge extends LitElement implements LovelaceBadge {
+  @property() public hass?: HomeAssistant;
+  @property() protected _config?: StateLabelBadgeConfig;
+
+  public setConfig(config: StateLabelBadgeConfig): void {
+    this._config = config;
+  }
+
+  protected render(): TemplateResult | void {
+    if (!this._config || !this.hass) {
+      return html``;
+    }
+
+    const stateObj = this.hass.states[this._config.entity!];
+
+    return html`
+      <ha-state-label-badge
+        .hass=${this.hass}
+        .state=${stateObj}
+        .title=${this._config.name
+          ? this._config.name
+          : stateObj
+          ? computeStateName(stateObj)
+          : ""}
+        .icon=${this._config.icon}
+        .image=${this._config.image}
+      ></ha-state-label-badge>
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-state-label-badge": HuiStateLabelBadge;
+  }
+}
diff --git a/src/panels/lovelace/badges/types.ts b/src/panels/lovelace/badges/types.ts
new file mode 100644
index 0000000000..e462a0a4ee
--- /dev/null
+++ b/src/panels/lovelace/badges/types.ts
@@ -0,0 +1,19 @@
+import { LovelaceBadgeConfig } from "../../../data/lovelace";
+import { EntityFilterEntityConfig } from "../entity-rows/types";
+
+export interface EntityFilterBadgeConfig extends LovelaceBadgeConfig {
+  type: "entity-filter";
+  entities: Array<EntityFilterEntityConfig | string>;
+  state_filter: Array<{ key: string } | string>;
+}
+
+export interface ErrorBadgeConfig extends LovelaceBadgeConfig {
+  error: string;
+}
+
+export interface StateLabelBadgeConfig extends LovelaceBadgeConfig {
+  entity: string;
+  name?: string;
+  icon?: string;
+  image?: string;
+}
diff --git a/src/panels/lovelace/common/create-badge-element.ts b/src/panels/lovelace/common/create-badge-element.ts
new file mode 100644
index 0000000000..9a046cd0a5
--- /dev/null
+++ b/src/panels/lovelace/common/create-badge-element.ts
@@ -0,0 +1,73 @@
+import "../badges/hui-entity-filter-badge";
+import "../badges/hui-state-label-badge";
+
+import {
+  createErrorBadgeElement,
+  createErrorBadgeConfig,
+  HuiErrorBadge,
+} from "../badges/hui-error-badge";
+import { LovelaceBadge } from "../types";
+import { LovelaceBadgeConfig } from "../../../data/lovelace";
+import { fireEvent } from "../../../common/dom/fire_event";
+
+const BADGE_TYPES = new Set(["entity-filter", "error", "state-label"]);
+const CUSTOM_TYPE_PREFIX = "custom:";
+const TIMEOUT = 2000;
+
+const _createElement = (
+  tag: string,
+  config: LovelaceBadgeConfig
+): LovelaceBadge => {
+  const element = document.createElement(tag) as LovelaceBadge;
+  try {
+    element.setConfig(config);
+  } catch (err) {
+    // tslint:disable-next-line
+    console.error(tag, err);
+    return _createErrorElement(err.message);
+  }
+  return element;
+};
+
+const _createErrorElement = (error: string): HuiErrorBadge =>
+  createErrorBadgeElement(createErrorBadgeConfig(error));
+
+export const createBadgeElement = (
+  config: LovelaceBadgeConfig
+): LovelaceBadge => {
+  if (!config || typeof config !== "object") {
+    return _createErrorElement("No config");
+  }
+
+  let type = config.type;
+
+  if (!type) {
+    type = "state-label";
+  }
+
+  if (type.startsWith(CUSTOM_TYPE_PREFIX)) {
+    const tag = type.substr(CUSTOM_TYPE_PREFIX.length);
+
+    if (customElements.get(tag)) {
+      return _createElement(tag, config);
+    }
+    const element = _createErrorElement(`Type doesn't exist: ${tag}`);
+    element.style.display = "None";
+    const timer = window.setTimeout(() => {
+      element.style.display = "";
+    }, TIMEOUT);
+
+    customElements.whenDefined(tag).then(() => {
+      clearTimeout(timer);
+      fireEvent(element, "ll-badge-rebuild");
+    });
+
+    return element;
+  }
+
+  if (!BADGE_TYPES.has(type)) {
+    return _createErrorElement(`Unknown type: ${type}`);
+  }
+
+  return _createElement(`hui-${type}-badge`, config);
+};
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index de86979f83..3f1a3da723 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -34,6 +34,7 @@ import {
   subscribeEntityRegistry,
   EntityRegistryEntry,
 } from "../../../data/entity_registry";
+import { processEditorEntities } from "../editor/process-editor-entities";
 
 const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
 const DOMAINS_BADGES = [
@@ -315,7 +316,7 @@ const generateViewConfig = (
   const view: LovelaceViewConfig = {
     path,
     title,
-    badges,
+    badges: processEditorEntities(badges),
     cards,
   };
 
diff --git a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
index ab7a051eb8..9d05bef13d 100644
--- a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
@@ -26,11 +26,11 @@ import { HomeAssistant } from "../../../../types";
 import {
   LovelaceViewConfig,
   LovelaceCardConfig,
+  LovelaceBadgeConfig,
 } from "../../../../data/lovelace";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { EntitiesEditorEvent, ViewEditEvent } from "../types";
 import { processEditorEntities } from "../process-editor-entities";
-import { EntityConfig } from "../../entity-rows/types";
 import { navigate } from "../../../../common/navigate";
 import { Lovelace } from "../../types";
 import { deleteView, addView, replaceView } from "../config-util";
@@ -45,7 +45,7 @@ export class HuiEditView extends LitElement {
 
   @property() private _config?: LovelaceViewConfig;
 
-  @property() private _badges?: EntityConfig[];
+  @property() private _badges?: LovelaceBadgeConfig[];
 
   @property() private _cards?: LovelaceCardConfig[];
 
@@ -216,7 +216,7 @@ export class HuiEditView extends LitElement {
 
     const viewConf: LovelaceViewConfig = {
       ...this._config,
-      badges: this._badges!.map((entityConf) => entityConf.entity),
+      badges: this._badges,
       cards: this._cards,
     };
 
@@ -246,7 +246,7 @@ export class HuiEditView extends LitElement {
     if (!this._badges || !this.hass || !ev.detail || !ev.detail.entities) {
       return;
     }
-    this._badges = ev.detail.entities;
+    this._badges = processEditorEntities(ev.detail.entities);
   }
 
   private _isConfigChanged(): boolean {
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index 85f36b1c33..4557561412 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -1,10 +1,15 @@
 import { HomeAssistant } from "../../types";
-import { LovelaceCardConfig, LovelaceConfig } from "../../data/lovelace";
+import {
+  LovelaceCardConfig,
+  LovelaceConfig,
+  LovelaceBadgeConfig,
+} from "../../data/lovelace";
 
 declare global {
   // tslint:disable-next-line
   interface HASSDomEvents {
     "ll-rebuild": {};
+    "ll-badge-rebuild": {};
   }
 }
 
@@ -18,6 +23,11 @@ export interface Lovelace {
   saveConfig: (newConfig: LovelaceConfig) => Promise<void>;
 }
 
+export interface LovelaceBadge extends HTMLElement {
+  hass?: HomeAssistant;
+  setConfig(config: LovelaceBadgeConfig): void;
+}
+
 export interface LovelaceCard extends HTMLElement {
   hass?: HomeAssistant;
   isPanel?: boolean;
diff --git a/src/panels/lovelace/views/hui-view.ts b/src/panels/lovelace/views/hui-view.ts
index 2bae8370be..08775f8809 100644
--- a/src/panels/lovelace/views/hui-view.ts
+++ b/src/panels/lovelace/views/hui-view.ts
@@ -8,21 +8,23 @@ import {
 
 import "../../../components/entity/ha-state-label-badge";
 // This one is for types
-// tslint:disable-next-line
-import { HaStateLabelBadge } from "../../../components/entity/ha-state-label-badge";
 
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 
-import { LovelaceViewConfig, LovelaceCardConfig } from "../../../data/lovelace";
+import {
+  LovelaceViewConfig,
+  LovelaceCardConfig,
+  LovelaceBadgeConfig,
+} from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { classMap } from "lit-html/directives/class-map";
-import { Lovelace, LovelaceCard } from "../types";
+import { Lovelace, LovelaceCard, LovelaceBadge } from "../types";
 import { createCardElement } from "../common/create-card-element";
 import { computeCardSize } from "../common/compute-card-size";
 import { showEditCardDialog } from "../editor/card-editor/show-edit-card-dialog";
 import { HuiErrorCard } from "../cards/hui-error-card";
-
 import { computeRTL } from "../../../common/util/compute_rtl";
+import { createBadgeElement } from "../common/create-badge-element";
 import { processConfigEntities } from "../common/process-config-entities";
 
 let editCodeLoaded = false;
@@ -51,7 +53,7 @@ export class HUIView extends LitElement {
   public columns?: number;
   public index?: number;
   private _cards: Array<LovelaceCard | HuiErrorCard>;
-  private _badges: Array<{ element: HaStateLabelBadge; entityId: string }>;
+  private _badges: LovelaceBadge[];
 
   static get properties(): PropertyDeclarations {
     return {
@@ -88,6 +90,19 @@ export class HUIView extends LitElement {
     return element;
   }
 
+  public createBadgeElement(badgeConfig: LovelaceBadgeConfig) {
+    const element = createBadgeElement(badgeConfig) as LovelaceBadge;
+    element.hass = this.hass;
+    element.addEventListener(
+      "ll-badge-rebuild",
+      () => {
+        this._rebuildBadge(element, badgeConfig);
+      },
+      { once: true }
+    );
+    return element;
+  }
+
   protected render(): TemplateResult | void {
     return html`
       ${this.renderStyles()}
@@ -208,9 +223,7 @@ export class HUIView extends LitElement {
       this._createBadges(lovelace.config.views[this.index!]);
     } else if (hassChanged) {
       this._badges.forEach((badge) => {
-        const { element, entityId } = badge;
-        element.hass = hass;
-        element.state = hass.states[entityId];
+        badge.hass = hass;
       });
     }
 
@@ -261,16 +274,11 @@ export class HUIView extends LitElement {
     }
 
     const elements: HUIView["_badges"] = [];
-    const badges = processConfigEntities(config.badges);
+    const badges = processConfigEntities(config.badges as any);
     for (const badge of badges) {
-      const element = document.createElement("ha-state-label-badge");
-      const entityId = badge.entity;
+      const element = createBadgeElement(badge);
       element.hass = this.hass;
-      element.state = this.hass!.states[entityId];
-      element.name = badge.name;
-      element.icon = badge.icon;
-      element.image = badge.image;
-      elements.push({ element, entityId });
+      elements.push(element);
       root.appendChild(element);
     }
     this._badges = elements;
@@ -346,6 +354,17 @@ export class HUIView extends LitElement {
       curCardEl === cardElToReplace ? newCardEl : curCardEl
     );
   }
+
+  private _rebuildBadge(
+    badgeElToReplace: LovelaceBadge,
+    config: LovelaceBadgeConfig
+  ): void {
+    const newBadgeEl = this.createBadgeElement(config);
+    badgeElToReplace.parentElement!.replaceChild(newBadgeEl, badgeElToReplace);
+    this._badges = this._cards!.map((curBadgeEl) =>
+      curBadgeEl === badgeElToReplace ? newBadgeEl : curBadgeEl
+    );
+  }
 }
 
 declare global {

From 8eca956cd1bc68567efef1539e9db0281f1a85d5 Mon Sep 17 00:00:00 2001
From: Josh McCarty <josh@joshmccarty.com>
Date: Wed, 16 Oct 2019 07:53:25 -0700
Subject: [PATCH 14/70] Uses information-outline icon for entity more info link
 (#4016)

---
 .../config/devices/device-detail/ha-device-entities-card.ts     | 2 +-
 src/panels/developer-tools/state/developer-tools-state.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index 17f260064b..686d840e49 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -81,7 +81,7 @@ export class HaDeviceEntitiesCard extends LitElement {
                       ? html`
                           <paper-icon-button
                             @click=${this._openMoreInfo}
-                            icon="hass:open-in-new"
+                            icon="hass:information-outline"
                           ></paper-icon-button>
                         `
                       : ""}
diff --git a/src/panels/developer-tools/state/developer-tools-state.js b/src/panels/developer-tools/state/developer-tools-state.js
index d1b67e70b7..b4f42b53ef 100644
--- a/src/panels/developer-tools/state/developer-tools-state.js
+++ b/src/panels/developer-tools/state/developer-tools-state.js
@@ -144,7 +144,7 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
             <td>
               <paper-icon-button
                 on-click="entityMoreInfo"
-                icon="hass:open-in-new"
+                icon="hass:information-outline"
                 alt="More Info"
                 title="More Info"
               >

From 4ea483e3de3887b2608848e428de809bbeef8107 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 16 Oct 2019 10:08:28 -0500
Subject: [PATCH 15/70] Switch theme (#4017)

* introduce ha-switch theming

* fix typo

* remove comment
---
 demo/src/configs/jimpower/theme.ts      |  9 +++------
 demo/src/configs/kernehed/theme.ts      |  9 +++------
 demo/src/configs/teachingbirds/theme.ts |  5 ++---
 src/components/ha-switch.ts             | 13 ++++++++-----
 src/resources/ha-style.ts               | 14 +++++---------
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/demo/src/configs/jimpower/theme.ts b/demo/src/configs/jimpower/theme.ts
index 8f9e28fe60..655c6da45d 100644
--- a/demo/src/configs/jimpower/theme.ts
+++ b/demo/src/configs/jimpower/theme.ts
@@ -23,27 +23,24 @@ export const demoThemeJimpower = () => ({
   "paper-listbox-background-color": "#2E333A",
   "table-row-background-color": "#353840",
   "paper-grey-50": "var(--primary-text-color)",
-  "paper-toggle-button-checked-button-color": "var(--accent-color)",
+  "switch-checked-color": "var(--accent-color)",
   "paper-dialog-background-color": "#434954",
   "secondary-text-color": "#5294E2",
   "google-red-500": "#E45E65",
   "divider-color": "rgba(0, 0, 0, .12)",
-  "paper-toggle-button-unchecked-ink-color": "var(--disabled-text-color)",
   "google-green-500": "#39E949",
-  "paper-toggle-button-unchecked-button-color": "var(--disabled-text-color)",
+  "switch-unchecked-button-color": "var(--disabled-text-color)",
   "label-badge-border-color": "green",
   "paper-listbox-color": "var(--primary-color)",
   "paper-slider-disabled-secondary-color": "var(--disabled-text-color)",
-  "paper-toggle-button-checked-ink-color": "var(--accent-color)",
   "paper-card-background-color": "#434954",
   "label-badge-text-color": "var(--primary-text-color)",
   "paper-slider-knob-start-color": "var(--accent-color)",
-  "paper-toggle-button-unchecked-bar-color": "var(--disabled-text-color)",
+  "switch-unchecked-track-color": "var(--disabled-text-color)",
   "dark-primary-color": "var(--accent-color)",
   "paper-slider-secondary-color": "var(--secondary-background-color)",
   "paper-slider-pin-color": "var(--accent-color)",
   "paper-item-icon-active-color": "#F9C536",
   "accent-color": "#E45E65",
-  "paper-toggle-button-checked-bar-color": "var(--accent-color)",
   "table-row-alternative-background-color": "#3E424B",
 });
diff --git a/demo/src/configs/kernehed/theme.ts b/demo/src/configs/kernehed/theme.ts
index a4efa29f40..078dc5ac93 100644
--- a/demo/src/configs/kernehed/theme.ts
+++ b/demo/src/configs/kernehed/theme.ts
@@ -24,27 +24,24 @@ export const demoThemeKernehed = () => ({
   "paper-listbox-background-color": "#141414",
   "table-row-background-color": "#292929",
   "paper-grey-50": "var(--primary-text-color)",
-  "paper-toggle-button-checked-button-color": "var(--accent-color)",
+  "switch-checked-color": "var(--accent-color)",
   "paper-dialog-background-color": "#292929",
   "secondary-text-color": "#b58e31",
   "google-red-500": "#b58e31",
   "divider-color": "rgba(0, 0, 0, .12)",
-  "paper-toggle-button-unchecked-ink-color": "var(--disabled-text-color)",
   "google-green-500": "#2980b9",
-  "paper-toggle-button-unchecked-button-color": "var(--disabled-text-color)",
+  "switch-unchecked-button-color": "var(--disabled-text-color)",
   "label-badge-border-color": "green",
   "paper-listbox-color": "#777777",
   "paper-slider-disabled-secondary-color": "var(--disabled-text-color)",
-  "paper-toggle-button-checked-ink-color": "var(--accent-color)",
   "paper-card-background-color": "#292929",
   "label-badge-text-color": "var(--primary-text-color)",
   "paper-slider-knob-start-color": "var(--accent-color)",
-  "paper-toggle-button-unchecked-bar-color": "var(--disabled-text-color)",
+  "switch-unchecked-track-color": "var(--disabled-text-color)",
   "dark-primary-color": "var(--accent-color)",
   "paper-slider-secondary-color": "var(--secondary-background-color)",
   "paper-slider-pin-color": "var(--accent-color)",
   "paper-item-icon-active-color": "#b58e31",
   "accent-color": "#2980b9",
-  "paper-toggle-button-checked-bar-color": "var(--accent-color)",
   "table-row-alternative-background-color": "#292929",
 });
diff --git a/demo/src/configs/teachingbirds/theme.ts b/demo/src/configs/teachingbirds/theme.ts
index 890100d90e..8861bd0663 100644
--- a/demo/src/configs/teachingbirds/theme.ts
+++ b/demo/src/configs/teachingbirds/theme.ts
@@ -12,8 +12,7 @@ export const demoThemeTeachingbirds = () => ({
   "paper-slider-knob-color": "var(--primary-color)",
   "paper-listbox-color": "#FFFFFF",
   "paper-toggle-button-checked-bar-color": "var(--light-primary-color)",
-  "paper-toggle-button-checked-ink-color": "var(--dark-primary-color)",
-  "paper-toggle-button-unchecked-bar-color": "var(--primary-text-color)",
+  "switch-unchecked-track-color": "var(--primary-text-color)",
   "paper-card-background-color": "#4e4e4e",
   "label-badge-text-color": "var(--text-primary-color)",
   "primary-background-color": "#303030",
@@ -22,7 +21,7 @@ export const demoThemeTeachingbirds = () => ({
   "secondary-background-color": "#2b2b2b",
   "paper-slider-knob-start-color": "var(--primary-color)",
   "paper-item-icon-active-color": "#d8bf50",
-  "paper-toggle-button-checked-button-color": "var(--primary-color)",
+  "switch-checked-color": "var(--primary-color)",
   "secondary-text-color": "#389638",
   "disabled-text-color": "#545454",
   "paper-item-icon_-_color": "var(--primary-text-color)",
diff --git a/src/components/ha-switch.ts b/src/components/ha-switch.ts
index 4e6a57ac65..53b8cf1229 100644
--- a/src/components/ha-switch.ts
+++ b/src/components/ha-switch.ts
@@ -12,7 +12,10 @@ export class HaSwitch extends MwcSwitch {
 
   protected firstUpdated() {
     super.firstUpdated();
-    this.style.setProperty("--mdc-theme-secondary", "var(--primary-color)");
+    this.style.setProperty(
+      "--mdc-theme-secondary",
+      "var(--switch-checked-color)"
+    );
     this.classList.toggle(
       "slotted",
       Boolean(this._slot.assignedNodes().length)
@@ -29,12 +32,12 @@ export class HaSwitch extends MwcSwitch {
           align-items: center;
         }
         .mdc-switch:not(.mdc-switch--checked) .mdc-switch__thumb {
-          background-color: var(--paper-toggle-button-unchecked-button-color);
-          border-color: var(--paper-toggle-button-unchecked-button-color);
+          background-color: var(--switch-unchecked-button-color);
+          border-color: var(--switch-unchecked-button-color);
         }
         .mdc-switch:not(.mdc-switch--checked) .mdc-switch__track {
-          background-color: var(--paper-toggle-button-unchecked-bar-color);
-          border-color: var(--paper-toggle-button-unchecked-bar-color);
+          background-color: var(--switch-unchecked-track-color);
+          border-color: var(--switch-unchecked-track-color);
         }
         :host(.slotted) .mdc-switch {
           margin-right: 24px;
diff --git a/src/resources/ha-style.ts b/src/resources/ha-style.ts
index 577a79d5da..c35ab84f64 100644
--- a/src/resources/ha-style.ts
+++ b/src/resources/ha-style.ts
@@ -53,8 +53,10 @@ documentContainer.innerHTML = `<custom-style>
       --sidebar-selected-icon-color: var(--primary-color);
 
       /* controls */
-      --toggle-button-color: var(--primary-color);
-      /* --toggle-button-unchecked-color: var(--accent-color); */
+      --switch-checked-color: var(--primary-color);
+      /* --switch-unchecked-color: var(--accent-color); */
+      --switch-unchecked-button-color: var(--switch-unchecked-color, var(--paper-grey-50));
+      --switch-unchecked-track-color: var(--switch-unchecked-color, #000000);
       --slider-color: var(--primary-color);
       --slider-secondary-color: var(--light-primary-color);
       --slider-bar-color: var(--disabled-text-color);
@@ -69,7 +71,7 @@ documentContainer.innerHTML = `<custom-style>
       --label-badge-grey: var(--paper-grey-500);
 
       /*
-        Paper-styles color.html depency is stripped on build.
+        Paper-styles color.html dependency is stripped on build.
         When a default paper-style color is used, it needs to be copied
         from paper-styles/color.html to here.
       */
@@ -110,12 +112,6 @@ documentContainer.innerHTML = `<custom-style>
       --table-row-background-color: var(--primary-background-color);
       --table-row-alternative-background-color: var(--secondary-background-color);
 
-      /* set our toggle style */
-      --paper-toggle-button-checked-ink-color: var(--toggle-button-color);
-      --paper-toggle-button-checked-button-color: var(--toggle-button-color);
-      --paper-toggle-button-checked-bar-color: var(--toggle-button-color);
-      --paper-toggle-button-unchecked-button-color: var(--toggle-button-unchecked-color, var(--paper-grey-50));
-      --paper-toggle-button-unchecked-bar-color: var(--toggle-button-unchecked-color, #000000);
       /* set our slider style */
       --paper-slider-knob-color: var(--slider-color);
       --paper-slider-knob-start-color: var(--slider-color);

From 141c3f1ea463205bcc69678cf81eb3c5975cc1d3 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 16 Oct 2019 11:03:36 -0500
Subject: [PATCH 16/70] add confirmation option to actions (#4006)

* add confirmation option to actions

* address comments
---
 src/data/lovelace.ts                       | 25 ++++++++++++++++------
 src/panels/lovelace/common/handle-click.ts | 17 +++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index c3c8222f3c..d5ba052dea 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -37,11 +37,11 @@ export interface LovelaceCardConfig {
   [key: string]: any;
 }
 
-export interface ToggleActionConfig {
+export interface ToggleActionConfig extends BaseActionConfig {
   action: "toggle";
 }
 
-export interface CallServiceActionConfig {
+export interface CallServiceActionConfig extends BaseActionConfig {
   action: "call-service";
   service: string;
   service_data?: {
@@ -50,24 +50,37 @@ export interface CallServiceActionConfig {
   };
 }
 
-export interface NavigateActionConfig {
+export interface NavigateActionConfig extends BaseActionConfig {
   action: "navigate";
   navigation_path: string;
 }
 
-export interface UrlActionConfig {
+export interface UrlActionConfig extends BaseActionConfig {
   action: "url";
   url_path: string;
 }
 
-export interface MoreInfoActionConfig {
+export interface MoreInfoActionConfig extends BaseActionConfig {
   action: "more-info";
 }
 
-export interface NoActionConfig {
+export interface NoActionConfig extends BaseActionConfig {
   action: "none";
 }
 
+export interface BaseActionConfig {
+  confirmation?: ConfirmationRestrictionConfig;
+}
+
+export interface ConfirmationRestrictionConfig {
+  text?: string;
+  exemptions?: RestrictionConfig[];
+}
+
+export interface RestrictionConfig {
+  user: string;
+}
+
 export type ActionConfig =
   | ToggleActionConfig
   | CallServiceActionConfig
diff --git a/src/panels/lovelace/common/handle-click.ts b/src/panels/lovelace/common/handle-click.ts
index 30052d557a..27b6d28c14 100644
--- a/src/panels/lovelace/common/handle-click.ts
+++ b/src/panels/lovelace/common/handle-click.ts
@@ -34,6 +34,23 @@ export const handleClick = (
     };
   }
 
+  if (
+    actionConfig.confirmation &&
+    (!actionConfig.confirmation.exemptions ||
+      !actionConfig.confirmation.exemptions.some(
+        (e) => e.user === hass!.user!.id
+      ))
+  ) {
+    if (
+      !confirm(
+        actionConfig.confirmation.text ||
+          `Are you sure you want to ${actionConfig.action}?`
+      )
+    ) {
+      return;
+    }
+  }
+
   switch (actionConfig.action) {
     case "more-info":
       if (config.entity || config.camera_image) {

From f5e3a9ad403a5199ae27247df978000e82bbd58a Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Thu, 17 Oct 2019 14:00:39 -0500
Subject: [PATCH 17/70] Convert thermostat to round-slider (#3734)

* Convert to round-slider

Closes https://github.com/home-assistant/home-assistant-polymer/issues/3622
Closes https://github.com/home-assistant/home-assistant-polymer/issues/2756

* scaling

* address review comments

* css tweaks

* remove jquery

* address comments

* simplify set-temperature

* handle long name

* remove increased handleSize

* address comments

* address comments

* address comments

* address comment

* need coffee
---
 package.json                                  |   2 -
 .../lovelace/cards/hui-thermostat-card.ts     | 700 ++++++++----------
 src/resources/jquery.roundslider.js           |  14 -
 src/resources/jquery.roundslider.ondemand.ts  |  15 -
 src/resources/jquery.ts                       |   5 -
 yarn.lock                                     |  12 -
 6 files changed, 327 insertions(+), 421 deletions(-)
 delete mode 100644 src/resources/jquery.roundslider.js
 delete mode 100644 src/resources/jquery.roundslider.ondemand.ts
 delete mode 100644 src/resources/jquery.ts

diff --git a/package.json b/package.json
index 00ead71952..64bc94cb62 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,6 @@
     "hls.js": "^0.12.4",
     "home-assistant-js-websocket": "^4.4.0",
     "intl-messageformat": "^2.2.0",
-    "jquery": "^3.4.0",
     "js-yaml": "^3.13.1",
     "leaflet": "^1.4.0",
     "lit-element": "^2.2.1",
@@ -98,7 +97,6 @@
     "react-big-calendar": "^0.20.4",
     "regenerator-runtime": "^0.13.2",
     "roboto-fontface": "^0.10.0",
-    "round-slider": "^1.3.3",
     "superstruct": "^0.6.1",
     "tslib": "^1.10.0",
     "unfetch": "^4.1.0",
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index e593b93ee1..d4ca705b41 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -5,9 +5,12 @@ import {
   TemplateResult,
   customElement,
   property,
+  css,
+  CSSResult,
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 import "@polymer/paper-icon-button/paper-icon-button";
+import "@thomasloven/round-slider";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
@@ -19,7 +22,6 @@ import { computeStateName } from "../../../common/entity/compute_state_name";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
-import { loadRoundslider } from "../../../resources/jquery.roundslider.ondemand";
 import { UNIT_F } from "../../../common/const";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { ThermostatCardConfig } from "./types";
@@ -29,17 +31,7 @@ import {
   compareClimateHvacModes,
   CLIMATE_PRESET_NONE,
 } from "../../../data/climate";
-
-const thermostatConfig = {
-  radius: 150,
-  circleShape: "pie",
-  startAngle: 315,
-  width: 5,
-  lineCap: "round",
-  handleSize: "+10",
-  showTooltip: false,
-  animation: false,
-};
+import { HassEntity } from "home-assistant-js-websocket";
 
 const modeIcons: { [mode in HvacMode]: string } = {
   auto: "hass:calendar-repeat",
@@ -63,18 +55,15 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
   }
 
   @property() public hass?: HomeAssistant;
-
   @property() private _config?: ThermostatCardConfig;
-
-  @property() private _roundSliderStyle?: TemplateResult;
-
-  @property() private _jQuery?: any;
-
-  private _broadCard?: boolean;
-
-  private _loaded?: boolean;
+  @property() private _loaded?: boolean;
+  @property() private _setTemp?: number | number[];
 
   private _updated?: boolean;
+  private _large?: boolean;
+  private _medium?: boolean;
+  private _small?: boolean;
+  private _radius?: number;
 
   public getCardSize(): number {
     return 4;
@@ -114,26 +103,69 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
     }
 
     const mode = stateObj.state in modeIcons ? stateObj.state : "unknown-mode";
+    const name =
+      this._config!.name ||
+      computeStateName(this.hass!.states[this._config!.entity]);
+
+    if (!this._radius || this._radius === 0) {
+      this._radius = 100;
+    }
+
     return html`
-      ${this.renderStyle()}
       <ha-card
-        class="${classMap({
+        class=${classMap({
           [mode]: true,
-          large: this._broadCard!,
-          small: !this._broadCard,
-        })}"
+          large: this._large!,
+          medium: this._medium!,
+          small: this._small!,
+          longName: name.length > 10,
+        })}
       >
         <div id="root">
           <paper-icon-button
             icon="hass:dots-vertical"
             class="more-info"
-            @click="${this._handleMoreInfo}"
+            @click=${this._handleMoreInfo}
           ></paper-icon-button>
-          <div id="thermostat"></div>
+          <div id="thermostat">
+            ${stateObj.state === "unavailable"
+              ? html`
+                  <round-slider
+                    .radius=${this._radius}
+                    disabled="true"
+                  ></round-slider>
+                `
+              : stateObj.attributes.target_temp_low &&
+                stateObj.attributes.target_temp_high
+              ? html`
+                  <round-slider
+                    .radius=${this._radius}
+                    .low=${stateObj.attributes.target_temp_low}
+                    .high=${stateObj.attributes.target_temp_high}
+                    .min=${stateObj.attributes.min_temp}
+                    .max=${stateObj.attributes.max_temp}
+                    .step=${this._stepSize}
+                    @value-changing=${this._dragEvent}
+                    @value-changed=${this._setTemperature}
+                  ></round-slider>
+                `
+              : html`
+                  <round-slider
+                    .radius=${this._radius}
+                    .value=${stateObj.attributes.temperature !== null &&
+                    Number.isFinite(Number(stateObj.attributes.temperature))
+                      ? stateObj.attributes.temperature
+                      : stateObj.attributes.min_temp}
+                    .step=${this._stepSize}
+                    .min=${stateObj.attributes.min_temp}
+                    .max=${stateObj.attributes.max_temp}
+                    @value-changing=${this._dragEvent}
+                    @value-changed=${this._setTemperature}
+                  ></round-slider>
+                `}
+          </div>
           <div id="tooltip">
-            <div class="title">
-              ${this._config.name || computeStateName(stateObj)}
-            </div>
+            <div class="title">${name}</div>
             <div class="current-temperature">
               <span class="current-temperature-text">
                 ${stateObj.attributes.current_temperature}
@@ -147,7 +179,18 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
               </span>
             </div>
             <div class="climate-info">
-              <div id="set-temperature"></div>
+              <div id="set-temperature">
+                ${!this._setTemp
+                  ? ""
+                  : Array.isArray(this._setTemp)
+                  ? html`
+                      ${this._setTemp[0].toFixed(1)} -
+                      ${this._setTemp[1].toFixed(1)}
+                    `
+                  : html`
+                      ${this._setTemp.toFixed(1)}
+                    `}
+              </div>
               <div class="current-mode">
                 ${stateObj.attributes.hvac_action
                   ? this.hass!.localize(
@@ -185,13 +228,6 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
     return hasConfigOrEntityChanged(this, changedProps);
   }
 
-  protected firstUpdated(): void {
-    this._updated = true;
-    if (this.isConnected && !this._loaded) {
-      this._initialLoad();
-    }
-  }
-
   protected updated(changedProps: PropertyValues): void {
     super.updated(changedProps);
     if (!this._config || !this.hass || !changedProps.has("hass")) {
@@ -204,29 +240,29 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
       applyThemesOnElement(this, this.hass.themes, this._config.theme);
     }
 
-    const stateObj = this.hass.states[this._config.entity] as ClimateEntity;
+    this._setTemp = this._getSetTemp(this.hass!.states[this._config!.entity]);
+  }
 
-    if (!stateObj) {
-      return;
+  protected firstUpdated(): void {
+    this._updated = true;
+    if (this.isConnected && !this._loaded) {
+      this._initialLoad();
+    }
+  }
+
+  private async _initialLoad(): Promise<void> {
+    this._large = this._medium = this._small = false;
+    this._radius = this.clientWidth / 3.9;
+
+    if (this.clientWidth > 450) {
+      this._large = true;
+    } else if (this.clientWidth < 350) {
+      this._small = true;
+    } else {
+      this._medium = true;
     }
 
-    if (
-      this._jQuery &&
-      // If jQuery changed, we just rendered in firstUpdated
-      !changedProps.has("_jQuery") &&
-      (!oldHass || oldHass.states[this._config.entity] !== stateObj)
-    ) {
-      const [sliderValue, uiValue, sliderType] = this._genSliderValue(stateObj);
-
-      this._jQuery("#thermostat", this.shadowRoot).roundSlider({
-        sliderType,
-        value: sliderValue,
-        disabled: sliderValue === null,
-        min: stateObj.attributes.min_temp,
-        max: stateObj.attributes.max_temp,
-      });
-      this._updateSetTemp(uiValue);
-    }
+    this._loaded = true;
   }
 
   private get _stepSize(): number {
@@ -238,119 +274,55 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
     return this.hass!.config.unit_system.temperature === UNIT_F ? 1 : 0.5;
   }
 
-  private async _initialLoad(): Promise<void> {
-    const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity;
-
-    if (!stateObj) {
-      // Card will require refresh to work again
-      return;
-    }
-
-    this._loaded = true;
-
-    await this.updateComplete;
-
-    let radius = this.clientWidth / 3.2;
-    this._broadCard = this.clientWidth > 390;
-
-    if (radius === 0) {
-      radius = 100;
-    }
-
-    (this.shadowRoot!.querySelector(
-      "#thermostat"
-    ) as HTMLElement)!.style.height = radius * 2 + "px";
-
-    const loaded = await loadRoundslider();
-
-    this._roundSliderStyle = loaded.roundSliderStyle;
-    this._jQuery = loaded.jQuery;
-
-    const [sliderValue, uiValue, sliderType] = this._genSliderValue(stateObj);
-
-    this._jQuery("#thermostat", this.shadowRoot).roundSlider({
-      ...thermostatConfig,
-      radius,
-      min: stateObj.attributes.min_temp,
-      max: stateObj.attributes.max_temp,
-      sliderType,
-      change: (value) => this._setTemperature(value),
-      drag: (value) => this._dragEvent(value),
-      value: sliderValue,
-      disabled: sliderValue === null,
-      step: this._stepSize,
-    });
-    this._updateSetTemp(uiValue);
-  }
-
-  private _genSliderValue(
-    stateObj: ClimateEntity
-  ): [string | number | null, string, string] {
-    let sliderType: string;
-    let sliderValue: string | number | null;
-    let uiValue: string;
-
+  private _getSetTemp(stateObj: HassEntity) {
     if (stateObj.state === "unavailable") {
-      sliderType = "min-range";
-      sliderValue = null;
-      uiValue = this.hass!.localize("state.default.unavailable");
-    } else if (
-      stateObj.attributes.target_temp_low &&
-      stateObj.attributes.target_temp_high
-    ) {
-      sliderType = "range";
-      sliderValue = `${stateObj.attributes.target_temp_low}, ${
-        stateObj.attributes.target_temp_high
-      }`;
-      uiValue = this.formatTemp(
-        [
-          String(stateObj.attributes.target_temp_low),
-          String(stateObj.attributes.target_temp_high),
-        ],
-        false
-      );
-    } else {
-      sliderType = "min-range";
-      sliderValue = Number.isFinite(Number(stateObj.attributes.temperature))
-        ? stateObj.attributes.temperature
-        : null;
-      uiValue = sliderValue !== null ? String(sliderValue) : "";
+      return this.hass!.localize("state.default.unavailable");
     }
 
-    return [sliderValue, uiValue, sliderType];
-  }
-
-  private _updateSetTemp(value: string): void {
-    this.shadowRoot!.querySelector("#set-temperature")!.innerHTML = value;
-  }
-
-  private _dragEvent(e): void {
-    this._updateSetTemp(this.formatTemp(String(e.value).split(","), true));
-  }
-
-  private _setTemperature(e): void {
-    const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity;
     if (
       stateObj.attributes.target_temp_low &&
       stateObj.attributes.target_temp_high
     ) {
-      if (e.handle.index === 1) {
-        this.hass!.callService("climate", "set_temperature", {
-          entity_id: this._config!.entity,
-          target_temp_low: e.handle.value,
-          target_temp_high: stateObj.attributes.target_temp_high,
-        });
-      } else {
-        this.hass!.callService("climate", "set_temperature", {
-          entity_id: this._config!.entity,
-          target_temp_low: stateObj.attributes.target_temp_low,
-          target_temp_high: e.handle.value,
-        });
-      }
+      return [
+        stateObj.attributes.target_temp_low,
+        stateObj.attributes.target_temp_high,
+      ];
+    }
+
+    return stateObj.attributes.temperature;
+  }
+
+  private _dragEvent(e): void {
+    const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity;
+
+    if (e.detail.low) {
+      this._setTemp = [e.detail.low, stateObj.attributes.target_temp_high];
+    } else if (e.detail.high) {
+      this._setTemp = [stateObj.attributes.target_temp_low, e.detail.high];
+    } else {
+      this._setTemp = e.detail.value;
+    }
+  }
+
+  private _setTemperature(e): void {
+    const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity;
+
+    if (e.detail.low) {
+      this.hass!.callService("climate", "set_temperature", {
+        entity_id: this._config!.entity,
+        target_temp_low: e.detail.low,
+        target_temp_high: stateObj.attributes.target_temp_high,
+      });
+    } else if (e.detail.high) {
+      this.hass!.callService("climate", "set_temperature", {
+        entity_id: this._config!.entity,
+        target_temp_low: stateObj.attributes.target_temp_low,
+        target_temp_high: e.detail.high,
+      });
     } else {
       this.hass!.callService("climate", "set_temperature", {
         entity_id: this._config!.entity,
-        temperature: e.value,
+        temperature: e.detail.value,
       });
     }
   }
@@ -382,217 +354,199 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
     });
   }
 
-  private formatTemp(temps: string[], spaceStepSize: boolean): string {
-    temps = temps.filter(Boolean);
-
-    // If we are sliding the slider, append 0 to the temperatures if we're
-    // having a 0.5 step size, so that the text doesn't jump while sliding
-    if (spaceStepSize) {
-      const stepSize = this._stepSize;
-      temps = temps.map((val) =>
-        val.includes(".") || stepSize === 1 ? val : `${val}.0`
-      );
-    }
-
-    return temps.join("-");
-  }
-
-  private renderStyle(): TemplateResult {
-    return html`
-      ${this._roundSliderStyle}
-      <style>
-        :host {
-          display: block;
-        }
-        ha-card {
-          overflow: hidden;
-          --rail-border-color: transparent;
-          --auto-color: green;
-          --eco-color: springgreen;
-          --cool-color: #2b9af9;
-          --heat-color: #ff8100;
-          --manual-color: #44739e;
-          --off-color: #8a8a8a;
-          --fan_only-color: #8a8a8a;
-          --dry-color: #efbd07;
-          --idle-color: #8a8a8a;
-          --unknown-color: #bac;
-        }
-        #root {
-          position: relative;
-          overflow: hidden;
-        }
-        .auto,
-        .heat_cool {
-          --mode-color: var(--auto-color);
-        }
-        .cool {
-          --mode-color: var(--cool-color);
-        }
-        .heat {
-          --mode-color: var(--heat-color);
-        }
-        .manual {
-          --mode-color: var(--manual-color);
-        }
-        .off {
-          --mode-color: var(--off-color);
-        }
-        .fan_only {
-          --mode-color: var(--fan_only-color);
-        }
-        .eco {
-          --mode-color: var(--eco-color);
-        }
-        .dry {
-          --mode-color: var(--dry-color);
-        }
-        .idle {
-          --mode-color: var(--idle-color);
-        }
-        .unknown-mode {
-          --mode-color: var(--unknown-color);
-        }
-        .no-title {
-          --title-position-top: 33% !important;
-        }
-        .large {
-          --thermostat-padding-top: 25px;
-          --thermostat-margin-bottom: 25px;
-          --title-font-size: 28px;
-          --title-position-top: 27%;
-          --climate-info-position-top: 81%;
-          --set-temperature-font-size: 25px;
-          --current-temperature-font-size: 71px;
-          --current-temperature-position-top: 10%;
-          --current-temperature-text-padding-left: 15px;
-          --uom-font-size: 20px;
-          --uom-margin-left: -18px;
-          --current-mode-font-size: 18px;
-          --set-temperature-margin-bottom: -5px;
-        }
-        .small {
-          --thermostat-padding-top: 15px;
-          --thermostat-margin-bottom: 15px;
-          --title-font-size: 18px;
-          --title-position-top: 28%;
-          --climate-info-position-top: 79%;
-          --set-temperature-font-size: 16px;
-          --current-temperature-font-size: 25px;
-          --current-temperature-position-top: 5%;
-          --current-temperature-text-padding-left: 7px;
-          --uom-font-size: 12px;
-          --uom-margin-left: -5px;
-          --current-mode-font-size: 14px;
-          --set-temperature-margin-bottom: 0px;
-        }
-        #thermostat {
-          margin: 0 auto var(--thermostat-margin-bottom);
-          padding-top: var(--thermostat-padding-top);
-        }
-        #thermostat .rs-range-color {
-          background-color: var(--mode-color, var(--disabled-text-color));
-        }
-        #thermostat .rs-path-color {
-          background-color: var(--disabled-text-color);
-        }
-        #thermostat .rs-handle {
-          background-color: var(--paper-card-background-color, white);
-          padding: 10px;
-          margin: -10px 0 0 -8px !important;
-          border: 2px solid var(--disabled-text-color);
-        }
-        #thermostat .rs-handle.rs-focus {
-          border-color: var(--mode-color, var(--disabled-text-color));
-        }
-        #thermostat .rs-handle:after {
-          border-color: var(--mode-color, var(--disabled-text-color));
-          background-color: var(--mode-color, var(--disabled-text-color));
-        }
-        #thermostat .rs-border {
-          border-color: var(--rail-border-color);
-        }
-        #thermostat .rs-bar.rs-transition.rs-first,
-        .rs-bar.rs-transition.rs-second {
-          z-index: 20 !important;
-        }
-        #thermostat .rs-readonly {
-          z-index: 10;
-          top: auto;
-        }
-        #thermostat .rs-inner.rs-bg-color.rs-border,
-        #thermostat .rs-overlay.rs-transition.rs-bg-color {
-          background-color: var(--paper-card-background-color, white);
-        }
-        #tooltip {
-          position: absolute;
-          top: 0;
-          left: 0;
-          right: 0;
-          height: 100%;
-          text-align: center;
-          z-index: 15;
-          color: var(--primary-text-color);
-        }
-        #set-temperature {
-          font-size: var(--set-temperature-font-size);
-          margin-bottom: var(--set-temperature-margin-bottom);
-          min-height: 1.2em;
-        }
-        .title {
-          font-size: var(--title-font-size);
-          position: absolute;
-          top: var(--title-position-top);
-          left: 50%;
-          transform: translate(-50%, -50%);
-        }
-        .climate-info {
-          position: absolute;
-          top: var(--climate-info-position-top);
-          left: 50%;
-          transform: translate(-50%, -50%);
-          width: 100%;
-        }
-        .current-mode {
-          font-size: var(--current-mode-font-size);
-          color: var(--secondary-text-color);
-        }
-        .modes {
-          margin-top: 16px;
-        }
-        .modes ha-icon {
-          color: var(--disabled-text-color);
-          cursor: pointer;
-          display: inline-block;
-          margin: 0 10px;
-        }
-        .modes ha-icon.selected-icon {
-          color: var(--mode-color);
-        }
-        .current-temperature {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          transform: translate(-50%, -50%);
-          font-size: var(--current-temperature-font-size);
-        }
-        .current-temperature-text {
-          padding-left: var(--current-temperature-text-padding-left);
-        }
-        .uom {
-          font-size: var(--uom-font-size);
-          vertical-align: top;
-          margin-left: var(--uom-margin-left);
-        }
-        .more-info {
-          position: absolute;
-          cursor: pointer;
-          top: 0;
-          right: 0;
-          z-index: 25;
-          color: var(--secondary-text-color);
-        }
-      </style>
+  static get styles(): CSSResult {
+    return css`
+      :host {
+        display: block;
+      }
+      ha-card {
+        overflow: hidden;
+        --rail-border-color: transparent;
+        --auto-color: green;
+        --eco-color: springgreen;
+        --cool-color: #2b9af9;
+        --heat-color: #ff8100;
+        --manual-color: #44739e;
+        --off-color: #8a8a8a;
+        --fan_only-color: #8a8a8a;
+        --dry-color: #efbd07;
+        --idle-color: #8a8a8a;
+        --unknown-color: #bac;
+      }
+      #root {
+        position: relative;
+        overflow: hidden;
+      }
+      .auto,
+      .heat_cool {
+        --mode-color: var(--auto-color);
+      }
+      .cool {
+        --mode-color: var(--cool-color);
+      }
+      .heat {
+        --mode-color: var(--heat-color);
+      }
+      .manual {
+        --mode-color: var(--manual-color);
+      }
+      .off {
+        --mode-color: var(--off-color);
+      }
+      .fan_only {
+        --mode-color: var(--fan_only-color);
+      }
+      .eco {
+        --mode-color: var(--eco-color);
+      }
+      .dry {
+        --mode-color: var(--dry-color);
+      }
+      .idle {
+        --mode-color: var(--idle-color);
+      }
+      .unknown-mode {
+        --mode-color: var(--unknown-color);
+      }
+      .no-title {
+        --title-position-top: 33% !important;
+      }
+      .large {
+        --thermostat-padding-top: 32px;
+        --thermostat-margin-bottom: 32px;
+        --title-font-size: 28px;
+        --title-position-top: 25%;
+        --climate-info-position-top: 80%;
+        --set-temperature-font-size: 25px;
+        --current-temperature-font-size: 71px;
+        --current-temperature-position-top: 10%;
+        --current-temperature-text-padding-left: 15px;
+        --uom-font-size: 20px;
+        --uom-margin-left: -18px;
+        --current-mode-font-size: 18px;
+        --current-mod-margin-top: 6px;
+        --current-mod-margin-bottom: 12px;
+        --set-temperature-margin-bottom: -5px;
+      }
+      .medium {
+        --thermostat-padding-top: 20px;
+        --thermostat-margin-bottom: 20px;
+        --title-font-size: 23px;
+        --title-position-top: 27%;
+        --climate-info-position-top: 84%;
+        --set-temperature-font-size: 20px;
+        --current-temperature-font-size: 65px;
+        --current-temperature-position-top: 10%;
+        --current-temperature-text-padding-left: 15px;
+        --uom-font-size: 18px;
+        --uom-margin-left: -16px;
+        --current-mode-font-size: 16px;
+        --current-mod-margin-top: 4px;
+        --current-mod-margin-bottom: 4px;
+        --set-temperature-margin-bottom: -5px;
+      }
+      .small {
+        --thermostat-padding-top: 15px;
+        --thermostat-margin-bottom: 15px;
+        --title-font-size: 18px;
+        --title-position-top: 28%;
+        --climate-info-position-top: 78%;
+        --set-temperature-font-size: 16px;
+        --current-temperature-font-size: 55px;
+        --current-temperature-position-top: 5%;
+        --current-temperature-text-padding-left: 16px;
+        --uom-font-size: 16px;
+        --uom-margin-left: -14px;
+        --current-mode-font-size: 14px;
+        --current-mod-margin-top: 2px;
+        --current-mod-margin-bottom: 4px;
+        --set-temperature-margin-bottom: 0px;
+      }
+      .longName {
+        --title-font-size: 18px;
+      }
+      #thermostat {
+        margin: 0 auto var(--thermostat-margin-bottom);
+        padding-top: var(--thermostat-padding-top);
+        padding-bottom: 32px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      #thermostat round-slider {
+        margin: 0 auto;
+        display: inline-block;
+        --round-slider-path-color: var(--disabled-text-color);
+        --round-slider-bar-color: var(--mode-color);
+        z-index: 20;
+      }
+      #tooltip {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        height: 100%;
+        text-align: center;
+        z-index: 15;
+        color: var(--primary-text-color);
+      }
+      #set-temperature {
+        font-size: var(--set-temperature-font-size);
+        margin-bottom: var(--set-temperature-margin-bottom);
+        min-height: 1.2em;
+      }
+      .title {
+        font-size: var(--title-font-size);
+        position: absolute;
+        top: var(--title-position-top);
+        left: 50%;
+        transform: translate(-50%, -50%);
+      }
+      .climate-info {
+        position: absolute;
+        top: var(--climate-info-position-top);
+        left: 50%;
+        transform: translate(-50%, -50%);
+        width: 100%;
+      }
+      .current-mode {
+        font-size: var(--current-mode-font-size);
+        color: var(--secondary-text-color);
+        margin-top: var(--current-mod-margin-top);
+        margin-bottom: var(--current-mod-margin-bottom);
+      }
+      .modes ha-icon {
+        color: var(--disabled-text-color);
+        cursor: pointer;
+        display: inline-block;
+        margin: 0 10px;
+      }
+      .modes ha-icon.selected-icon {
+        color: var(--mode-color);
+      }
+      .current-temperature {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        font-size: var(--current-temperature-font-size);
+      }
+      .current-temperature-text {
+        padding-left: var(--current-temperature-text-padding-left);
+      }
+      .uom {
+        font-size: var(--uom-font-size);
+        vertical-align: top;
+        margin-left: var(--uom-margin-left);
+      }
+      .more-info {
+        position: absolute;
+        cursor: pointer;
+        top: 0;
+        right: 0;
+        z-index: 25;
+        color: var(--secondary-text-color);
+      }
     `;
   }
 }
diff --git a/src/resources/jquery.roundslider.js b/src/resources/jquery.roundslider.js
deleted file mode 100644
index 920cff0fb9..0000000000
--- a/src/resources/jquery.roundslider.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { html } from "lit-element";
-// jQuery import should come before plugin import
-import { jQuery as jQuery_ } from "./jquery";
-import "round-slider";
-// eslint-disable-next-line
-import roundSliderCSS from "round-slider/dist/roundslider.min.css";
-
-export const jQuery = jQuery_;
-
-export const roundSliderStyle = html`
-  <style>
-    ${roundSliderCSS}
-  </style>
-`;
diff --git a/src/resources/jquery.roundslider.ondemand.ts b/src/resources/jquery.roundslider.ondemand.ts
deleted file mode 100644
index 487b367f8b..0000000000
--- a/src/resources/jquery.roundslider.ondemand.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TemplateResult } from "lit-element";
-
-interface LoadedRoundSlider {
-  roundSliderStyle: TemplateResult;
-  jQuery: any;
-}
-
-let loaded: Promise<LoadedRoundSlider>;
-
-export const loadRoundslider = async (): Promise<LoadedRoundSlider> => {
-  if (!loaded) {
-    loaded = import(/* webpackChunkName: "jquery-roundslider" */ "./jquery.roundslider");
-  }
-  return loaded;
-};
diff --git a/src/resources/jquery.ts b/src/resources/jquery.ts
deleted file mode 100644
index 650365b431..0000000000
--- a/src/resources/jquery.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import jQuery_ from "jquery";
-
-(window as any).jQuery = jQuery_;
-
-export const jQuery = jQuery_;
diff --git a/yarn.lock b/yarn.lock
index 6e51ae9efa..87f4d1b083 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7686,11 +7686,6 @@ joi@^14.3.1:
     isemail "3.x.x"
     topo "3.x.x"
 
-"jquery@>= 1.4.1", jquery@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
-  integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==
-
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -11050,13 +11045,6 @@ rollup@^1.3.0:
     "@types/node" "^11.11.6"
     acorn "^6.1.1"
 
-round-slider@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/round-slider/-/round-slider-1.3.3.tgz#0ec82261317b0aba35ac86a48fbd024baa50b261"
-  integrity sha512-Mo6HYiN5l6O0UNI/ytjr8ERgtZcXGRZ6A6+V6f2S/hKkbSaQnKCW+lpLPfoxWuW1xiPbAJs3qrXeps1xC+sjVg==
-  dependencies:
-    jquery ">= 1.4.1"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"

From 982966c8d9f0823593903690d51de7599747c9f6 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Thu, 17 Oct 2019 23:17:39 +0200
Subject: [PATCH 18/70] Translated developer tools events page (#4033)

* Translated developer tools events page

* Implemented translations (alert on empty event type, notification on firing an event), Removed unnecessary translation key-value pairs

* Added falsely removed key-value pairs
---
 .../event/developer-tools-event.js            | 37 ++++++++++++++-----
 .../event/event-subscribe-card.ts             | 28 +++++++++++---
 .../developer-tools/event/events-list.js      | 11 ++++--
 src/translations/en.json                      | 17 ++++++++-
 4 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/src/panels/developer-tools/event/developer-tools-event.js b/src/panels/developer-tools/event/developer-tools-event.js
index c1b50bd068..ed754093b2 100644
--- a/src/panels/developer-tools/event/developer-tools-event.js
+++ b/src/panels/developer-tools/event/developer-tools-event.js
@@ -11,12 +11,14 @@ import "../../../resources/ha-style";
 import "./events-list";
 import "./event-subscribe-card";
 import { EventsMixin } from "../../../mixins/events-mixin";
+import LocalizeMixin from "../../../mixins/localize-mixin";
 
 const ERROR_SENTINEL = {};
 /*
  * @appliesMixin EventsMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPanelDevEvent extends EventsMixin(PolymerElement) {
+class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
   static get template() {
     return html`
       <style include="ha-style iron-flex iron-positioning"></style>
@@ -54,21 +56,26 @@ class HaPanelDevEvent extends EventsMixin(PolymerElement) {
       <div class$="[[computeFormClasses(narrow)]]">
         <div class="flex">
           <p>
-            Fire an event on the event bus.
+            [[localize( 'ui.panel.developer-tools.tabs.events.description' )]]
             <a
               href="https://www.home-assistant.io/docs/configuration/events/"
               target="_blank"
-              >Events Documentation.</a
+              >[[localize( 'ui.panel.developer-tools.tabs.events.documentation'
+              )]]</a
             >
           </p>
           <div class="ha-form">
             <paper-input
-              label="Event Type"
+              label="[[localize(
+                'ui.panel.developer-tools.tabs.events.type'
+              )]]"
               autofocus
               required
               value="{{eventType}}"
             ></paper-input>
-            <p>Event Data (YAML, optional)</p>
+            <p>
+              [[localize( 'ui.panel.developer-tools.tabs.events.data' )]]
+            </p>
             <ha-code-editor
               mode="yaml"
               value="[[eventData]]"
@@ -76,13 +83,17 @@ class HaPanelDevEvent extends EventsMixin(PolymerElement) {
               on-value-changed="_yamlChanged"
             ></ha-code-editor>
             <mwc-button on-click="fireEvent" raised disabled="[[!validJSON]]"
-              >Fire Event</mwc-button
+              >[[localize( 'ui.panel.developer-tools.tabs.events.fire_event'
+              )]]</mwc-button
             >
           </div>
         </div>
 
         <div>
-          <div class="header">Available Events</div>
+          <div class="header">
+            [[localize( 'ui.panel.developer-tools.tabs.events.available_events'
+            )]]
+          </div>
           <events-list
             on-event-selected="eventSelected"
             hass="[[hass]]"
@@ -143,13 +154,21 @@ class HaPanelDevEvent extends EventsMixin(PolymerElement) {
 
   fireEvent() {
     if (!this.eventType) {
-      alert("Event type is a mandatory field");
+      alert(
+        this.hass.localize(
+          "ui.panel.developer-tools.tabs.events.alert_event_type"
+        )
+      );
       return;
     }
     this.hass.callApi("POST", "events/" + this.eventType, this.parsedJSON).then(
       function() {
         this.fire("hass-notification", {
-          message: "Event " + this.eventType + " successful fired!",
+          message: this.hass.localize(
+            "ui.panel.developer-tools.tabs.events.notification_event_fired",
+            "type",
+            this.eventType
+          ),
         });
       }.bind(this)
     );
diff --git a/src/panels/developer-tools/event/event-subscribe-card.ts b/src/panels/developer-tools/event/event-subscribe-card.ts
index d1973b9ffe..7b89c464f4 100644
--- a/src/panels/developer-tools/event/event-subscribe-card.ts
+++ b/src/panels/developer-tools/event/event-subscribe-card.ts
@@ -37,12 +37,20 @@ class EventSubscribeCard extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-card header="Listen to events">
+      <ha-card
+        header=${this.hass!.localize(
+          "ui.panel.developer-tools.tabs.events.listen_to_events"
+        )}
+      >
         <form>
           <paper-input
             .label=${this._subscribed
-              ? "Listening to"
-              : "Event to subscribe to"}
+              ? this.hass!.localize(
+                  "ui.panel.developer-tools.tabs.events.listening_to"
+                )
+              : this.hass!.localize(
+                  "ui.panel.developer-tools.tabs.events.subscribe_to"
+                )}
             .disabled=${this._subscribed !== undefined}
             .value=${this._eventType}
             @value-changed=${this._valueChanged}
@@ -52,14 +60,24 @@ class EventSubscribeCard extends LitElement {
             @click=${this._handleSubmit}
             type="submit"
           >
-            ${this._subscribed ? "Stop listening" : "Start listening"}
+            ${this._subscribed
+              ? this.hass!.localize(
+                  "ui.panel.developer-tools.tabs.events.stop_listening"
+                )
+              : this.hass!.localize(
+                  "ui.panel.developer-tools.tabs.events.start_listening"
+                )}
           </mwc-button>
         </form>
         <div class="events">
           ${this._events.map(
             (ev) => html`
               <div class="event">
-                Event ${ev.id} fired
+                ${this.hass!.localize(
+                  "ui.panel.developer-tools.tabs.events.event_fired",
+                  "name",
+                  ev.id
+                )}
                 ${format_time(
                   new Date(ev.event.time_fired),
                   this.hass!.language
diff --git a/src/panels/developer-tools/event/events-list.js b/src/panels/developer-tools/event/events-list.js
index 3ffba2e5f5..e2435c0dab 100644
--- a/src/panels/developer-tools/event/events-list.js
+++ b/src/panels/developer-tools/event/events-list.js
@@ -2,11 +2,13 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import { EventsMixin } from "../../../mixins/events-mixin";
+import LocalizeMixin from "../../../mixins/localize-mixin";
 
 /*
  * @appliesMixin EventsMixin
+ * @appliesMixin LocalizeMixin
  */
-class EventsList extends EventsMixin(PolymerElement) {
+class EventsList extends EventsMixin(LocalizeMixin(PolymerElement)) {
   static get template() {
     return html`
       <style>
@@ -29,8 +31,11 @@ class EventsList extends EventsMixin(PolymerElement) {
         <template is="dom-repeat" items="[[events]]" as="event">
           <li>
             <a href="#" on-click="eventSelected">{{event.event}}</a>
-            <span> (</span><span>{{event.listener_count}}</span
-            ><span> listeners)</span>
+            <span>
+              [[localize(
+              "ui.panel.developer-tools.tabs.events.count_listeners", "count",
+              event.listener_count )]]</span
+            >
           </li>
         </template>
       </ul>
diff --git a/src/translations/en.json b/src/translations/en.json
index aecc059a9f..c1554d388f 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1779,7 +1779,22 @@
             "title": "Logs"
           },
           "events": {
-            "title": "Events"
+            "title": "Events",
+            "description": "Fire an event on the event bus.",
+            "documentation": "Events Documentation.",
+            "type": "Event Type",
+            "data": "Event Data (YAML, optional)",
+            "fire_event": "Fire Event",
+            "event_fired": "Event {name} fired",
+            "available_events": "Available Events",
+            "count_listeners": " ({count}  listeners)",
+            "listen_to_events": "Listen to events",
+            "listening_to": "Listening to",
+            "subscribe_to": "Event to subscribe to",
+            "start_listening": "Start listening",
+            "stop_listening": "Stop listening",
+            "alert_event_type": "Event type is a mandatory field",
+            "notification_event_fired": "Event {type} successful fired!"
           },
           "mqtt": {
             "title": "MQTT"

From 035057b1851695e7b974d4197a164b56170f551e Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Thu, 17 Oct 2019 23:28:12 +0200
Subject: [PATCH 19/70] Made thermostat history graph localizable (#4004)

* Made thermostat history graph localizable

* Changed string concatenation with white spaces from .join() to template literal

* Used variables in translations instead of template literals

* Update src/translations/en.json

Removed unnecessary space in heating value

Co-Authored-By: Bram Kragten <mail@bramkragten.nl>
---
 src/components/state-history-chart-line.js | 52 +++++++++++++++++++---
 src/translations/en.json                   |  7 +++
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/components/state-history-chart-line.js b/src/components/state-history-chart-line.js
index f94507c2df..6100e4022c 100644
--- a/src/components/state-history-chart-line.js
+++ b/src/components/state-history-chart-line.js
@@ -181,23 +181,63 @@ class StateHistoryChartLine extends LocalizeMixin(PolymerElement) {
               state.attributes.target_temp_low
         );
 
-        addColumn(name + " current temperature", true);
+        addColumn(
+          `${this.hass.localize(
+            "ui.card.climate.current_temperature",
+            "name",
+            name
+          )}`,
+          true
+        );
         if (hasHeat) {
-          addColumn(name + " heating", true, true);
+          addColumn(
+            `${this.hass.localize("ui.card.climate.heating", "name", name)}`,
+            true,
+            true
+          );
           // The "heating" series uses steppedArea to shade the area below the current
           // temperature when the thermostat is calling for heat.
         }
         if (hasCool) {
-          addColumn(name + " cooling", true, true);
+          addColumn(
+            `${this.hass.localize("ui.card.climate.cooling", "name", name)}`,
+            true,
+            true
+          );
           // The "cooling" series uses steppedArea to shade the area below the current
           // temperature when the thermostat is calling for heat.
         }
 
         if (hasTargetRange) {
-          addColumn(name + " target temperature high", true);
-          addColumn(name + " target temperature low", true);
+          addColumn(
+            `${this.hass.localize(
+              "ui.card.climate.target_temperature_mode",
+              "name",
+              name,
+              "mode",
+              this.hass.localize("ui.card.climate.high")
+            )}`,
+            true
+          );
+          addColumn(
+            `${this.hass.localize(
+              "ui.card.climate.target_temperature_mode",
+              "name",
+              name,
+              "mode",
+              this.hass.localize("ui.card.climate.low")
+            )}`,
+            true
+          );
         } else {
-          addColumn(name + " target temperature", true);
+          addColumn(
+            `${this.hass.localize(
+              "ui.card.climate.target_temperature_entity",
+              "name",
+              name
+            )}`,
+            true
+          );
         }
 
         states.states.forEach((state) => {
diff --git a/src/translations/en.json b/src/translations/en.json
index c1554d388f..a302af1917 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -402,6 +402,13 @@
         "currently": "Currently",
         "on_off": "On / off",
         "target_temperature": "Target temperature",
+        "target_temperature_entity": "{name} target temperature",
+        "target_temperature_mode": "{name} target temperature {mode}",
+        "current_temperature": "{name} current temperature",
+        "heating": "{name} heating",
+        "cooling": "{name} cooling",
+        "high": "high",
+        "low": "low",
         "target_humidity": "Target humidity",
         "operation": "Operation",
         "fan_mode": "Fan mode",

From 00f2d36cb5b8c2e2446fd0682b7fef51534159d5 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Fri, 18 Oct 2019 16:08:34 +0200
Subject: [PATCH 20/70] Migrate ha-form to lit (#4000)

* Migrate ha-form to lit

* Fix import path

* Update

* add default, change suffix, fix import

* Fix select
---
 src/auth/ha-auth-flow.ts                      |   2 +-
 src/components/ha-form.js                     | 265 ------------------
 src/components/ha-form/ha-form-boolean.ts     |  70 +++++
 src/components/ha-form/ha-form-float.ts       |  65 +++++
 src/components/ha-form/ha-form-integer.ts     |  85 ++++++
 src/components/ha-form/ha-form-select.ts      |  78 ++++++
 src/components/ha-form/ha-form-string.ts      |  93 ++++++
 src/components/ha-form/ha-form.ts             | 225 +++++++++++++++
 .../config-flow/dialog-data-entry-flow.ts     |   2 +-
 src/dialogs/config-flow/step-flow-form.ts     |   9 +-
 src/panels/config/js/condition/device.tsx     |  12 +-
 src/panels/config/js/script/device.tsx        |  10 +-
 src/panels/config/js/trigger/device.tsx       |  12 +-
 .../profile/ha-mfa-module-setup-flow.js       |   2 +-
 src/resources/ha-style.ts                     |   4 +-
 15 files changed, 634 insertions(+), 300 deletions(-)
 delete mode 100644 src/components/ha-form.js
 create mode 100644 src/components/ha-form/ha-form-boolean.ts
 create mode 100644 src/components/ha-form/ha-form-float.ts
 create mode 100644 src/components/ha-form/ha-form-integer.ts
 create mode 100644 src/components/ha-form/ha-form-select.ts
 create mode 100644 src/components/ha-form/ha-form-string.ts
 create mode 100644 src/components/ha-form/ha-form.ts

diff --git a/src/auth/ha-auth-flow.ts b/src/auth/ha-auth-flow.ts
index 4799fbc155..5075c3963f 100644
--- a/src/auth/ha-auth-flow.ts
+++ b/src/auth/ha-auth-flow.ts
@@ -7,7 +7,7 @@ import {
   css,
 } from "lit-element";
 import "@material/mwc-button";
-import "../components/ha-form";
+import "../components/ha-form/ha-form";
 import "../components/ha-markdown";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import { AuthProvider } from "../data/auth";
diff --git a/src/components/ha-form.js b/src/components/ha-form.js
deleted file mode 100644
index f6dfe613ee..0000000000
--- a/src/components/ha-form.js
+++ /dev/null
@@ -1,265 +0,0 @@
-import "@polymer/paper-checkbox/paper-checkbox";
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-icon-button/paper-icon-button";
-import "@polymer/paper-input/paper-input";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "./ha-paper-slider";
-import { EventsMixin } from "../mixins/events-mixin";
-
-/*
- * @appliesMixin EventsMixin
- */
-class HaForm extends EventsMixin(PolymerElement) {
-  static get template() {
-    return html`
-      <style>
-        .error {
-          color: red;
-        }
-        paper-checkbox {
-          display: inline-block;
-          padding: 22px 0;
-        }
-      </style>
-      <template is="dom-if" if="[[_isArray(schema)]]" restamp="">
-        <template is="dom-if" if="[[error.base]]">
-          <div class="error">[[computeError(error.base, schema)]]</div>
-        </template>
-
-        <template is="dom-repeat" items="[[schema]]">
-          <ha-form
-            data="[[_getValue(data, item)]]"
-            schema="[[item]]"
-            error="[[_getValue(error, item)]]"
-            on-data-changed="_valueChanged"
-            compute-error="[[computeError]]"
-            compute-label="[[computeLabel]]"
-            compute-suffix="[[computeSuffix]]"
-          ></ha-form>
-        </template>
-      </template>
-      <template is="dom-if" if="[[!_isArray(schema)]]" restamp="">
-        <template is="dom-if" if="[[error]]">
-          <div class="error">[[computeError(error, schema)]]</div>
-        </template>
-
-        <template
-          is="dom-if"
-          if='[[_equals(schema.type, "string")]]'
-          restamp=""
-        >
-          <template
-            is="dom-if"
-            if='[[_includes(schema.name, "password")]]'
-            restamp=""
-          >
-            <paper-input
-              type="[[_passwordFieldType(unmaskedPassword)]]"
-              label="[[computeLabel(schema)]]"
-              value="{{data}}"
-              required="[[schema.required]]"
-              auto-validate="[[schema.required]]"
-              error-message="Required"
-            >
-              <paper-icon-button
-                toggles
-                active="{{unmaskedPassword}}"
-                slot="suffix"
-                icon="[[_passwordFieldIcon(unmaskedPassword)]]"
-                id="iconButton"
-                title="Click to toggle between masked and clear password"
-              >
-              </paper-icon-button>
-            </paper-input>
-          </template>
-          <template
-            is="dom-if"
-            if='[[!_includes(schema.name, "password")]]'
-            restamp=""
-          >
-            <paper-input
-              label="[[computeLabel(schema)]]"
-              value="{{data}}"
-              required="[[schema.required]]"
-              auto-validate="[[schema.required]]"
-              error-message="Required"
-            ></paper-input>
-          </template>
-        </template>
-
-        <template
-          is="dom-if"
-          if='[[_equals(schema.type, "integer")]]'
-          restamp=""
-        >
-          <template is="dom-if" if="[[_isRange(schema)]]" restamp="">
-            <div>
-              [[computeLabel(schema)]]
-              <ha-paper-slider
-                pin=""
-                value="{{data}}"
-                min="[[schema.valueMin]]"
-                max="[[schema.valueMax]]"
-              ></ha-paper-slider>
-            </div>
-          </template>
-          <template is="dom-if" if="[[!_isRange(schema)]]" restamp="">
-            <paper-input
-              label="[[computeLabel(schema)]]"
-              value="{{data}}"
-              type="number"
-              required="[[schema.required]]"
-              auto-validate="[[schema.required]]"
-              error-message="Required"
-            ></paper-input>
-          </template>
-        </template>
-
-        <template is="dom-if" if='[[_equals(schema.type, "float")]]' restamp="">
-          <!-- TODO -->
-          <paper-input
-            label="[[computeLabel(schema)]]"
-            value="{{data}}"
-            required="[[schema.required]]"
-            auto-validate="[[schema.required]]"
-            error-message="Required"
-          >
-            <span suffix="" slot="suffix">[[computeSuffix(schema)]]</span>
-          </paper-input>
-        </template>
-
-        <template
-          is="dom-if"
-          if='[[_equals(schema.type, "boolean")]]'
-          restamp=""
-        >
-          <div>
-            <paper-checkbox checked="{{data}}"
-              >[[computeLabel(schema)]]</paper-checkbox
-            >
-          </div>
-        </template>
-
-        <template
-          is="dom-if"
-          if='[[_equals(schema.type, "select")]]'
-          restamp=""
-        >
-          <paper-dropdown-menu label="[[computeLabel(schema)]]">
-            <paper-listbox
-              slot="dropdown-content"
-              attr-for-selected="item-name"
-              selected="{{data}}"
-            >
-              <template is="dom-repeat" items="[[schema.options]]">
-                <paper-item item-name$="[[_optionValue(item)]]"
-                  >[[_optionLabel(item)]]</paper-item
-                >
-              </template>
-            </paper-listbox>
-          </paper-dropdown-menu>
-        </template>
-      </template>
-    `;
-  }
-
-  static get properties() {
-    return {
-      data: {
-        type: Object,
-        notify: true,
-      },
-      schema: Object,
-      error: Object,
-
-      // A function that computes the label to be displayed for a given
-      // schema object.
-      computeLabel: {
-        type: Function,
-        value: () => (schema) => schema && schema.name,
-      },
-
-      // A function that computes the suffix to be displayed for a given
-      // schema object.
-      computeSuffix: {
-        type: Function,
-        value: () => (schema) =>
-          schema &&
-          schema.description &&
-          schema.description.unit_of_measurement,
-      },
-
-      // A function that computes an error message to be displayed for a
-      // given error ID, and relevant schema object
-      computeError: {
-        type: Function,
-        value: () => (error, schema) => error, // eslint-disable-line no-unused-vars
-      },
-    };
-  }
-
-  focus() {
-    const input = this.shadowRoot.querySelector(
-      "ha-form, paper-input, ha-paper-slider, paper-checkbox, paper-dropdown-menu"
-    );
-
-    if (!input) {
-      return;
-    }
-
-    input.focus();
-  }
-
-  _isArray(val) {
-    return Array.isArray(val);
-  }
-
-  _isRange(schema) {
-    return "valueMin" in schema && "valueMax" in schema;
-  }
-
-  _equals(a, b) {
-    return a === b;
-  }
-
-  _includes(a, b) {
-    return a.indexOf(b) >= 0;
-  }
-
-  _getValue(obj, item) {
-    if (obj) {
-      return obj[item.name];
-    }
-    return null;
-  }
-
-  _valueChanged(ev) {
-    let value = ev.detail.value;
-    if (ev.model.item.type === "integer") {
-      value = Number(ev.detail.value);
-    }
-    this.set(["data", ev.model.item.name], value);
-  }
-
-  _passwordFieldType(unmaskedPassword) {
-    return unmaskedPassword ? "text" : "password";
-  }
-
-  _passwordFieldIcon(unmaskedPassword) {
-    return unmaskedPassword ? "hass:eye-off" : "hass:eye";
-  }
-
-  _optionValue(item) {
-    return Array.isArray(item) ? item[0] : item;
-  }
-
-  _optionLabel(item) {
-    return Array.isArray(item) ? item[1] : item;
-  }
-}
-
-customElements.define("ha-form", HaForm);
diff --git a/src/components/ha-form/ha-form-boolean.ts b/src/components/ha-form/ha-form-boolean.ts
new file mode 100644
index 0000000000..5921cd3e43
--- /dev/null
+++ b/src/components/ha-form/ha-form-boolean.ts
@@ -0,0 +1,70 @@
+import {
+  customElement,
+  LitElement,
+  html,
+  property,
+  TemplateResult,
+  CSSResult,
+  css,
+  query,
+} from "lit-element";
+import {
+  HaFormElement,
+  HaFormBooleanData,
+  HaFormBooleanSchema,
+} from "./ha-form";
+import { fireEvent } from "../../common/dom/fire_event";
+
+import "@polymer/paper-checkbox/paper-checkbox";
+// Not duplicate, is for typing
+// tslint:disable-next-line
+import { PaperCheckboxElement } from "@polymer/paper-checkbox/paper-checkbox";
+
+@customElement("ha-form-boolean")
+export class HaFormBoolean extends LitElement implements HaFormElement {
+  @property() public schema!: HaFormBooleanSchema;
+  @property() public data!: HaFormBooleanData;
+  @property() public label!: string;
+  @property() public suffix!: string;
+  @query("paper-checkbox") private _input?: HTMLElement;
+
+  public focus() {
+    if (this._input) {
+      this._input.focus();
+    }
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <paper-checkbox .checked=${this.data} @change=${this._valueChanged}>
+        ${this.label}
+      </paper-checkbox>
+    `;
+  }
+
+  private _valueChanged(ev: Event) {
+    fireEvent(
+      this,
+      "value-changed",
+      {
+        value: (ev.target as PaperCheckboxElement).checked,
+      },
+      { bubbles: false }
+    );
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      paper-checkbox {
+        display: inline-block;
+        padding: 22px 0;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-form-boolean": HaFormBoolean;
+  }
+}
diff --git a/src/components/ha-form/ha-form-float.ts b/src/components/ha-form/ha-form-float.ts
new file mode 100644
index 0000000000..0d2279ea72
--- /dev/null
+++ b/src/components/ha-form/ha-form-float.ts
@@ -0,0 +1,65 @@
+import {
+  customElement,
+  LitElement,
+  html,
+  property,
+  TemplateResult,
+  query,
+} from "lit-element";
+import { HaFormElement, HaFormFloatData, HaFormFloatSchema } from "./ha-form";
+import { fireEvent } from "../../common/dom/fire_event";
+
+import "@polymer/paper-input/paper-input";
+// Not duplicate, is for typing
+// tslint:disable-next-line
+import { PaperInputElement } from "@polymer/paper-input/paper-input";
+
+@customElement("ha-form-float")
+export class HaFormFloat extends LitElement implements HaFormElement {
+  @property() public schema!: HaFormFloatSchema;
+  @property() public data!: HaFormFloatData;
+  @property() public label!: string;
+  @property() public suffix!: string;
+  @query("paper-input") private _input?: HTMLElement;
+
+  public focus() {
+    if (this._input) {
+      this._input.focus();
+    }
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <paper-input
+        .label=${this.label}
+        .value=${this.data}
+        .required=${this.schema.required}
+        .autoValidate=${this.schema.required}
+        @value-changed=${this._valueChanged}
+      >
+        <span suffix="" slot="suffix">${this.suffix}</span>
+      </paper-input>
+    `;
+  }
+
+  private _valueChanged(ev: Event) {
+    const value = Number((ev.target as PaperInputElement).value);
+    if (this.data === value) {
+      return;
+    }
+    fireEvent(
+      this,
+      "value-changed",
+      {
+        value,
+      },
+      { bubbles: false }
+    );
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-form-float": HaFormFloat;
+  }
+}
diff --git a/src/components/ha-form/ha-form-integer.ts b/src/components/ha-form/ha-form-integer.ts
new file mode 100644
index 0000000000..4b38678e52
--- /dev/null
+++ b/src/components/ha-form/ha-form-integer.ts
@@ -0,0 +1,85 @@
+import {
+  customElement,
+  LitElement,
+  html,
+  property,
+  TemplateResult,
+  query,
+} from "lit-element";
+import {
+  HaFormElement,
+  HaFormIntegerData,
+  HaFormIntegerSchema,
+} from "./ha-form";
+import { fireEvent } from "../../common/dom/fire_event";
+
+import "../ha-paper-slider";
+import "@polymer/paper-input/paper-input";
+// Not duplicate, is for typing
+// tslint:disable-next-line
+import { PaperInputElement } from "@polymer/paper-input/paper-input";
+import { PaperSliderElement } from "@polymer/paper-slider/paper-slider";
+
+@customElement("ha-form-integer")
+export class HaFormInteger extends LitElement implements HaFormElement {
+  @property() public schema!: HaFormIntegerSchema;
+  @property() public data!: HaFormIntegerData;
+  @property() public label!: string;
+  @property() public suffix!: string;
+  @query("paper-input ha-paper-slider") private _input?: HTMLElement;
+
+  public focus() {
+    if (this._input) {
+      this._input.focus();
+    }
+  }
+
+  protected render(): TemplateResult {
+    return "valueMin" in this.schema && "valueMax" in this.schema
+      ? html`
+          <div>
+            ${this.label}
+            <ha-paper-slider
+              pin=""
+              .value=${this.data}
+              .min=${this.schema.valueMin}
+              .max=${this.schema.valueMax}
+              @value-changed=${this._valueChanged}
+            ></ha-paper-slider>
+          </div>
+        `
+      : html`
+          <paper-input
+            type="number"
+            .label=${this.label}
+            .value=${this.data}
+            .required=${this.schema.required}
+            .autoValidate=${this.schema.required}
+            @value-changed=${this._valueChanged}
+          ></paper-input>
+        `;
+  }
+
+  private _valueChanged(ev: Event) {
+    const value = Number(
+      (ev.target as PaperInputElement | PaperSliderElement).value
+    );
+    if (this.data === value) {
+      return;
+    }
+    fireEvent(
+      this,
+      "value-changed",
+      {
+        value,
+      },
+      { bubbles: false }
+    );
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-form-integer": HaFormInteger;
+  }
+}
diff --git a/src/components/ha-form/ha-form-select.ts b/src/components/ha-form/ha-form-select.ts
new file mode 100644
index 0000000000..25a13abd23
--- /dev/null
+++ b/src/components/ha-form/ha-form-select.ts
@@ -0,0 +1,78 @@
+import {
+  customElement,
+  LitElement,
+  html,
+  property,
+  TemplateResult,
+  query,
+} from "lit-element";
+import { HaFormElement, HaFormSelectData, HaFormSelectSchema } from "./ha-form";
+import { fireEvent } from "../../common/dom/fire_event";
+
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
+import "@polymer/paper-listbox/paper-listbox";
+import "@polymer/paper-item/paper-item";
+
+@customElement("ha-form-select")
+export class HaFormSelect extends LitElement implements HaFormElement {
+  @property() public schema!: HaFormSelectSchema;
+  @property() public data!: HaFormSelectData;
+  @property() public label!: string;
+  @property() public suffix!: string;
+  @query("paper-dropdown-menu") private _input?: HTMLElement;
+
+  public focus() {
+    if (this._input) {
+      this._input.focus();
+    }
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <paper-dropdown-menu .label=${this.label}>
+        <paper-listbox
+          slot="dropdown-content"
+          attr-for-selected="item-value"
+          .selected=${this.data}
+          @selected-item-changed=${this._valueChanged}
+        >
+          ${this.schema.options!.map(
+            (item) => html`
+              <paper-item .itemValue=${this._optionValue(item)}>
+                ${this._optionLabel(item)}
+              </paper-item>
+            `
+          )}
+        </paper-listbox>
+      </paper-dropdown-menu>
+    `;
+  }
+
+  private _optionValue(item) {
+    return Array.isArray(item) ? item[0] : item;
+  }
+
+  private _optionLabel(item) {
+    return Array.isArray(item) ? item[1] : item;
+  }
+
+  private _valueChanged(ev: CustomEvent) {
+    if (!ev.detail.value) {
+      return;
+    }
+    fireEvent(
+      this,
+      "value-changed",
+      {
+        value: ev.detail.value.itemValue,
+      },
+      { bubbles: false }
+    );
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-form-select": HaFormSelect;
+  }
+}
diff --git a/src/components/ha-form/ha-form-string.ts b/src/components/ha-form/ha-form-string.ts
new file mode 100644
index 0000000000..82a3db8131
--- /dev/null
+++ b/src/components/ha-form/ha-form-string.ts
@@ -0,0 +1,93 @@
+import {
+  customElement,
+  LitElement,
+  html,
+  property,
+  TemplateResult,
+  query,
+} from "lit-element";
+
+import { HaFormElement, HaFormStringData, HaFormStringSchema } from "./ha-form";
+import { fireEvent } from "../../common/dom/fire_event";
+
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-icon-button/paper-icon-button";
+// Not duplicate, is for typing
+// tslint:disable-next-line
+import { PaperInputElement } from "@polymer/paper-input/paper-input";
+
+@customElement("ha-form-string")
+export class HaFormString extends LitElement implements HaFormElement {
+  @property() public schema!: HaFormStringSchema;
+  @property() public data!: HaFormStringData;
+  @property() public label!: string;
+  @property() public suffix!: string;
+  @property() private _unmaskedPassword = false;
+  @query("paper-input") private _input?: HTMLElement;
+
+  public focus() {
+    if (this._input) {
+      this._input.focus();
+    }
+  }
+
+  protected render(): TemplateResult {
+    return this.schema.name.includes("password")
+      ? html`
+          <paper-input
+            .type=${this._unmaskedPassword ? "text" : "password"}
+            .label=${this.label}
+            .value=${this.data}
+            .required=${this.schema.required}
+            .autoValidate=${this.schema.required}
+            @value-changed=${this._valueChanged}
+          >
+            <paper-icon-button
+              toggles
+              .active=${this._unmaskedPassword}
+              slot="suffix"
+              .icon=${this._unmaskedPassword ? "hass:eye-off" : "hass:eye"}
+              id="iconButton"
+              title="Click to toggle between masked and clear password"
+              @click=${this._toggleUnmaskedPassword}
+            >
+            </paper-icon-button>
+          </paper-input>
+        `
+      : html`
+          <paper-input
+            .label=${this.label}
+            .value=${this.data}
+            .required=${this.schema.required}
+            .autoValidate=${this.schema.required}
+            error-message="Required"
+            @value-changed=${this._valueChanged}
+          ></paper-input>
+        `;
+  }
+
+  private _toggleUnmaskedPassword(ev: Event) {
+    this._unmaskedPassword = (ev.target as any).active;
+  }
+
+  private _valueChanged(ev: Event) {
+    const value = (ev.target as PaperInputElement).value;
+    if (this.data === value) {
+      return;
+    }
+    fireEvent(
+      this,
+      "value-changed",
+      {
+        value,
+      },
+      { bubbles: false }
+    );
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-form-string": HaFormString;
+  }
+}
diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts
new file mode 100644
index 0000000000..a8fe7d813d
--- /dev/null
+++ b/src/components/ha-form/ha-form.ts
@@ -0,0 +1,225 @@
+import {
+  customElement,
+  LitElement,
+  html,
+  property,
+  query,
+  CSSResult,
+  css,
+  PropertyValues,
+} from "lit-element";
+
+import "./ha-form-string";
+import "./ha-form-integer";
+import "./ha-form-float";
+import "./ha-form-boolean";
+import "./ha-form-select";
+import { fireEvent } from "../../common/dom/fire_event";
+
+export type HaFormSchema =
+  | HaFormStringSchema
+  | HaFormIntegerSchema
+  | HaFormFloatSchema
+  | HaFormBooleanSchema
+  | HaFormSelectSchema;
+
+export interface HaFormBaseSchema {
+  name: string;
+  default?: HaFormData;
+  required?: boolean;
+  optional?: boolean;
+  description?: { suffix?: string };
+}
+
+export interface HaFormIntegerSchema extends HaFormBaseSchema {
+  type: "integer";
+  default?: HaFormIntegerData;
+  valueMin?: number;
+  valueMax?: number;
+}
+
+export interface HaFormSelectSchema extends HaFormBaseSchema {
+  type: "select";
+  options?: string[];
+}
+
+export interface HaFormFloatSchema extends HaFormBaseSchema {
+  type: "float";
+}
+
+export interface HaFormStringSchema extends HaFormBaseSchema {
+  type: "string";
+}
+
+export interface HaFormBooleanSchema extends HaFormBaseSchema {
+  type: "boolean";
+}
+
+export interface HaFormDataContainer {
+  [key: string]: HaFormData;
+}
+
+export type HaFormData =
+  | HaFormStringData
+  | HaFormIntegerData
+  | HaFormFloatData
+  | HaFormBooleanData
+  | HaFormSelectData;
+
+export type HaFormStringData = string;
+export type HaFormIntegerData = number;
+export type HaFormFloatData = number;
+export type HaFormBooleanData = boolean;
+export type HaFormSelectData = string;
+
+export interface HaFormElement extends LitElement {
+  schema: HaFormSchema;
+  data: HaFormDataContainer | HaFormData;
+  label?: string;
+  suffix?: string;
+}
+
+@customElement("ha-form")
+export class HaForm extends LitElement implements HaFormElement {
+  @property() public data!: HaFormDataContainer | HaFormData;
+  @property() public schema!: HaFormSchema;
+  @property() public error;
+  @property() public computeError?: (schema: HaFormSchema, error) => string;
+  @property() public computeLabel?: (schema: HaFormSchema) => string;
+  @property() public computeSuffix?: (schema: HaFormSchema) => string;
+  @query("ha-form") private _childForm?: HaForm;
+  @query("#element") private _elementContainer?: HTMLDivElement;
+
+  public focus() {
+    const input = this._childForm
+      ? this._childForm
+      : this._elementContainer
+      ? this._elementContainer.lastChild
+      : undefined;
+
+    if (!input) {
+      return;
+    }
+
+    (input as HTMLElement).focus();
+  }
+
+  protected render() {
+    if (Array.isArray(this.schema)) {
+      return html`
+        ${this.error && this.error.base
+          ? html`
+              <div class="error">
+                ${this._computeError(this.error.base, this.schema)}
+              </div>
+            `
+          : ""}
+        ${this.schema.map(
+          (item) => html`
+            <ha-form
+              .data=${this._getValue(this.data, item)}
+              .schema=${item}
+              .error=${this._getValue(this.error, item)}
+              @value-changed=${this._valueChanged}
+              .computeError=${this.computeError}
+              .computeLabel=${this.computeLabel}
+              .computeSuffix=${this.computeSuffix}
+            ></ha-form>
+          `
+        )}
+      `;
+    }
+
+    return html`
+      ${this.error
+        ? html`
+            <div class="error">
+              ${this._computeError(this.error, this.schema)}
+            </div>
+          `
+        : ""}
+      <div id="element" @value-changed=${this._valueChanged}></div>
+    `;
+  }
+
+  protected updated(changedProperties: PropertyValues) {
+    const schemaChanged = changedProperties.has("schema");
+    const oldSchema = schemaChanged
+      ? changedProperties.get("schema")
+      : undefined;
+    if (
+      !Array.isArray(this.schema) &&
+      schemaChanged &&
+      (!oldSchema || (oldSchema as HaFormSchema).type !== this.schema.type)
+    ) {
+      const element = document.createElement(
+        `ha-form-${this.schema.type}`
+      ) as HaFormElement;
+      element.schema = this.schema;
+      element.data = this.data;
+      element.label = this._computeLabel(this.schema);
+      element.suffix = this._computeSuffix(this.schema);
+      if (this._elementContainer!.lastChild) {
+        this._elementContainer!.removeChild(this._elementContainer!.lastChild);
+      }
+      this._elementContainer!.append(element);
+    } else if (this._elementContainer && this._elementContainer.lastChild) {
+      const element = this._elementContainer!.lastChild as HaFormElement;
+      element.schema = this.schema;
+      element.data = this.data;
+      element.label = this._computeLabel(this.schema);
+      element.suffix = this._computeSuffix(this.schema);
+    }
+  }
+
+  private _computeLabel(schema: HaFormSchema) {
+    return this.computeLabel
+      ? this.computeLabel(schema)
+      : schema
+      ? schema.name
+      : "";
+  }
+
+  private _computeSuffix(schema: HaFormSchema) {
+    return this.computeSuffix
+      ? this.computeSuffix(schema)
+      : schema && schema.description
+      ? schema.description.suffix
+      : "";
+  }
+
+  private _computeError(error, schema: HaFormSchema) {
+    return this.computeError ? this.computeError(error, schema) : error;
+  }
+
+  private _getValue(obj, item) {
+    if (obj) {
+      return obj[item.name];
+    }
+    return null;
+  }
+
+  private _valueChanged(ev: CustomEvent) {
+    ev.stopPropagation();
+    const schema = (ev.target as HaFormElement).schema;
+    const data = this.data as HaFormDataContainer;
+    data[schema.name] = ev.detail.value;
+    fireEvent(this, "value-changed", {
+      value: { ...data },
+    });
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      .error {
+        color: var(--error-color);
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-form": HaForm;
+  }
+}
diff --git a/src/dialogs/config-flow/dialog-data-entry-flow.ts b/src/dialogs/config-flow/dialog-data-entry-flow.ts
index c10900e340..a85f3b11bd 100644
--- a/src/dialogs/config-flow/dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts
@@ -14,7 +14,7 @@ import "@polymer/paper-tooltip/paper-tooltip";
 import "@polymer/paper-spinner/paper-spinner";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 
-import "../../components/ha-form";
+import "../../components/ha-form/ha-form";
 import "../../components/ha-markdown";
 import "../../resources/ha-style";
 import "../../components/dialog/ha-paper-dialog";
diff --git a/src/dialogs/config-flow/step-flow-form.ts b/src/dialogs/config-flow/step-flow-form.ts
index 4eb73f5c02..3b3d2fbad3 100644
--- a/src/dialogs/config-flow/step-flow-form.ts
+++ b/src/dialogs/config-flow/step-flow-form.ts
@@ -12,10 +12,9 @@ import "@material/mwc-button";
 import "@polymer/paper-tooltip/paper-tooltip";
 import "@polymer/paper-spinner/paper-spinner";
 
-import "../../components/ha-form";
+import "../../components/ha-form/ha-form";
 import "../../components/ha-markdown";
 import "../../resources/ha-style";
-import { PolymerChangedEvent, applyPolymerEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import { fireEvent } from "../../common/dom/fire_event";
 import { configFlowContentStyles } from "./styles";
@@ -69,7 +68,7 @@ class StepFlowForm extends LitElement {
         ${this.flowConfig.renderShowFormStepDescription(this.hass, this.step)}
         <ha-form
           .data=${stepData}
-          @data-changed=${this._stepDataChanged}
+          @value-changed=${this._stepDataChanged}
           .schema=${step.data_schema}
           .error=${step.errors}
           .computeLabel=${this._labelCallback}
@@ -169,8 +168,8 @@ class StepFlowForm extends LitElement {
     }
   }
 
-  private _stepDataChanged(ev: PolymerChangedEvent<any>): void {
-    this._stepData = applyPolymerEvent(ev, this._stepData);
+  private _stepDataChanged(ev: CustomEvent): void {
+    this._stepData = ev.detail.value;
   }
 
   private _labelCallback = (field: FieldSchema): string =>
diff --git a/src/panels/config/js/condition/device.tsx b/src/panels/config/js/condition/device.tsx
index 1fd9a8385e..17032c479d 100644
--- a/src/panels/config/js/condition/device.tsx
+++ b/src/panels/config/js/condition/device.tsx
@@ -2,7 +2,7 @@ import { h, Component } from "preact";
 
 import "../../../../components/device/ha-device-picker";
 import "../../../../components/device/ha-device-condition-picker";
-import "../../../../components/ha-form";
+import "../../../../components/ha-form/ha-form";
 
 import {
   fetchDeviceConditionCapabilities,
@@ -64,9 +64,9 @@ export default class DeviceCondition extends Component<any, any> {
         {extraFieldsData && (
           <ha-form
             data={Object.assign({}, ...extraFieldsData)}
-            onData-changed={this._extraFieldsChanged}
             schema={this.state.capabilities.extra_fields}
             computeLabel={this._extraFieldsComputeLabelCallback(hass.localize)}
+            onvalue-changed={this._extraFieldsChanged}
           />
         )}
       </div>
@@ -98,15 +98,9 @@ export default class DeviceCondition extends Component<any, any> {
   }
 
   private _extraFieldsChanged(ev) {
-    if (!ev.detail.path) {
-      return;
-    }
-    const item = ev.detail.path.replace("data.", "");
-    const value = ev.detail.value || undefined;
-
     this.props.onChange(this.props.index, {
       ...this.props.condition,
-      [item]: value,
+      ...ev.detail.value,
     });
   }
 
diff --git a/src/panels/config/js/script/device.tsx b/src/panels/config/js/script/device.tsx
index 344ff96253..3ae41ba5a8 100644
--- a/src/panels/config/js/script/device.tsx
+++ b/src/panels/config/js/script/device.tsx
@@ -2,7 +2,7 @@ import { h, Component } from "preact";
 
 import "../../../../components/device/ha-device-picker";
 import "../../../../components/device/ha-device-action-picker";
-import "../../../../components/ha-form";
+import "../../../../components/ha-form/ha-form";
 
 import {
   fetchDeviceActionCapabilities,
@@ -117,15 +117,9 @@ export default class DeviceActionEditor extends Component<
   }
 
   private _extraFieldsChanged(ev) {
-    if (!ev.detail.path) {
-      return;
-    }
-    const item = ev.detail.path.replace("data.", "");
-    const value = ev.detail.value || undefined;
-
     this.props.onChange(this.props.index, {
       ...this.props.action,
-      [item]: value,
+      ...ev.detail.value,
     });
   }
 
diff --git a/src/panels/config/js/trigger/device.tsx b/src/panels/config/js/trigger/device.tsx
index a9dd929ac1..91d6a8259f 100644
--- a/src/panels/config/js/trigger/device.tsx
+++ b/src/panels/config/js/trigger/device.tsx
@@ -2,7 +2,7 @@ import { h, Component } from "preact";
 
 import "../../../../components/device/ha-device-picker";
 import "../../../../components/device/ha-device-trigger-picker";
-import "../../../../components/ha-form";
+import "../../../../components/ha-form/ha-form";
 
 import {
   fetchDeviceTriggerCapabilities,
@@ -65,9 +65,9 @@ export default class DeviceTrigger extends Component<any, any> {
         {extraFieldsData && (
           <ha-form
             data={Object.assign({}, ...extraFieldsData)}
-            onData-changed={this._extraFieldsChanged}
             schema={this.state.capabilities.extra_fields}
             computeLabel={this._extraFieldsComputeLabelCallback(hass.localize)}
+            onvalue-changed={this._extraFieldsChanged}
           />
         )}
       </div>
@@ -99,15 +99,9 @@ export default class DeviceTrigger extends Component<any, any> {
   }
 
   private _extraFieldsChanged(ev) {
-    if (!ev.detail.path) {
-      return;
-    }
-    const item = ev.detail.path.replace("data.", "");
-    const value = ev.detail.value || undefined;
-
     this.props.onChange(this.props.index, {
       ...this.props.trigger,
-      [item]: value,
+      ...ev.detail.value,
     });
   }
 
diff --git a/src/panels/profile/ha-mfa-module-setup-flow.js b/src/panels/profile/ha-mfa-module-setup-flow.js
index df25be0133..79394d8196 100644
--- a/src/panels/profile/ha-mfa-module-setup-flow.js
+++ b/src/panels/profile/ha-mfa-module-setup-flow.js
@@ -5,7 +5,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../../components/dialog/ha-paper-dialog";
-import "../../components/ha-form";
+import "../../components/ha-form/ha-form";
 import "../../components/ha-markdown";
 import "../../resources/ha-style";
 
diff --git a/src/resources/ha-style.ts b/src/resources/ha-style.ts
index c35ab84f64..88b9552598 100644
--- a/src/resources/ha-style.ts
+++ b/src/resources/ha-style.ts
@@ -33,7 +33,9 @@ documentContainer.innerHTML = `<custom-style>
 
       --scrollbar-thumb-color: rgb(194, 194, 194);
 
-      --error-state-color: #db4437;
+
+      --error-color: #db4437;
+      --error-state-color: var(--error-color);
 
       /* states and badges */
       --state-icon-color: #44739e;

From 67d8d48855c502617bd7a9daa9a922f778eb3525 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Fri, 18 Oct 2019 09:28:31 -0500
Subject: [PATCH 21/70] translate view editor and explain panel mode (#4043)

---
 .../editor/view-editor/hui-view-editor.ts     | 37 +++++++++++++++++--
 src/translations/en.json                      |  6 +++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/panels/lovelace/editor/view-editor/hui-view-editor.ts b/src/panels/lovelace/editor/view-editor/hui-view-editor.ts
index e2b7c330e9..71abdfe123 100644
--- a/src/panels/lovelace/editor/view-editor/hui-view-editor.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-view-editor.ts
@@ -4,6 +4,8 @@ import {
   TemplateResult,
   customElement,
   property,
+  CSSResult,
+  css,
 } from "lit-element";
 import "@polymer/paper-input/paper-input";
 
@@ -80,20 +82,32 @@ export class HuiViewEditor extends LitElement {
       ${configElementStyle}
       <div class="card-config">
         <paper-input
-          label="Title"
+          .label="${this.hass.localize(
+            "ui.panel.lovelace.editor.card.generic.title"
+          )}  (${this.hass.localize(
+            "ui.panel.lovelace.editor.card.config.optional"
+          )})"
           .value=${this._title}
           .configValue=${"title"}
           @value-changed=${this._valueChanged}
           @blur=${this._handleTitleBlur}
         ></paper-input>
         <paper-input
-          label="Icon"
+          .label="${this.hass.localize(
+            "ui.panel.lovelace.editor.card.generic.icon"
+          )}  (${this.hass.localize(
+            "ui.panel.lovelace.editor.card.config.optional"
+          )})"
           .value=${this._icon}
           .configValue=${"icon"}
           @value-changed=${this._valueChanged}
         ></paper-input>
         <paper-input
-          label="URL Path"
+          .label="${this.hass.localize(
+            "ui.panel.lovelace.editor.card.generic.url"
+          )}  (${this.hass.localize(
+            "ui.panel.lovelace.editor.card.config.optional"
+          )})"
           .value=${this._path}
           .configValue=${"path"}
           @value-changed=${this._valueChanged}
@@ -108,7 +122,14 @@ export class HuiViewEditor extends LitElement {
           ?checked=${this._panel !== false}
           .configValue=${"panel"}
           @change=${this._valueChanged}
-          >Panel Mode?</ha-switch
+          >${this.hass.localize(
+            "ui.panel.lovelace.editor.view.panel_mode.title"
+          )}</ha-switch
+        >
+        <span class="panel"
+          >${this.hass.localize(
+            "ui.panel.lovelace.editor.view.panel_mode.description"
+          )}</span
         >
       </div>
     `;
@@ -147,6 +168,14 @@ export class HuiViewEditor extends LitElement {
     const config = { ...this._config, path: slugify(ev.currentTarget.value) };
     fireEvent(this, "view-config-changed", { config });
   }
+
+  static get styles(): CSSResult {
+    return css`
+      .panel {
+        color: var(--secondary-text-color);
+      }
+    `;
+  }
 }
 
 declare global {
diff --git a/src/translations/en.json b/src/translations/en.json
index a302af1917..8889864451 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1532,6 +1532,12 @@
             "weather-forecast": {
               "name": "Weather Forecast"
             }
+          },
+          "view": {
+            "panel_mode": {
+              "title": "Panel Mode?",
+              "description": "This renders the first card at full width; other cards in this view will not be rendered."
+            }
           }
         },
         "warning": {

From e2ac8426906318d0f40f1189a382206a12112310 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Fri, 18 Oct 2019 16:33:11 +0200
Subject: [PATCH 22/70] Translated developer tools state page (#4039)

* Translated developer tools state page

* Fixed merge error by updating used icon in developer-tools-state.js
---
 .../state/developer-tools-state.js            | 46 ++++++++++++-------
 src/translations/en.json                      | 16 ++++++-
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/panels/developer-tools/state/developer-tools-state.js b/src/panels/developer-tools/state/developer-tools-state.js
index b4f42b53ef..8e9a0fbb4b 100644
--- a/src/panels/developer-tools/state/developer-tools-state.js
+++ b/src/panels/developer-tools/state/developer-tools-state.js
@@ -10,12 +10,14 @@ import "../../../components/entity/ha-entity-picker";
 import "../../../components/ha-code-editor";
 import "../../../resources/ha-style";
 import { EventsMixin } from "../../../mixins/events-mixin";
+import LocalizeMixin from "../../../mixins/localize-mixin";
 
 const ERROR_SENTINEL = {};
 /*
  * @appliesMixin EventsMixin
+ * @appliesMixin LocalizeMixin
  */
-class HaPanelDevState extends EventsMixin(PolymerElement) {
+class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
   static get template() {
     return html`
       <style include="ha-style">
@@ -70,8 +72,8 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
 
       <div class="inputs">
         <p>
-          Set the representation of a device within Home Assistant.<br />
-          This will not communicate with the actual device.
+          [[localize('ui.panel.developer-tools.tabs.states.description1')]]<br />
+          [[localize('ui.panel.developer-tools.tabs.states.description2')]]
         </p>
 
         <ha-entity-picker
@@ -82,7 +84,7 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
           allow-custom-entity
         ></ha-entity-picker>
         <paper-input
-          label="State"
+          label="[[localize('ui.panel.developer-tools.tabs.states.state')]]"
           required
           autocapitalize="none"
           autocomplete="off"
@@ -91,7 +93,9 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
           value="{{_state}}"
           class="state-input"
         ></paper-input>
-        <p>State attributes (YAML, optional)</p>
+        <p>
+          [[localize('ui.panel.developer-tools.tabs.states.state_attributes')]]
+        </p>
         <ha-code-editor
           mode="yaml"
           value="[[_stateAttributes]]"
@@ -99,45 +103,49 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
           on-value-changed="_yamlChanged"
         ></ha-code-editor>
         <mwc-button on-click="handleSetState" disabled="[[!validJSON]]" raised
-          >Set State</mwc-button
+          >[[localize('ui.panel.developer-tools.tabs.states.set_state')]]</mwc-button
         >
       </div>
 
-      <h1>Current entities</h1>
+      <h1>
+        [[localize('ui.panel.developer-tools.tabs.states.current_entities')]]
+      </h1>
       <table class="entities">
         <tr>
-          <th>Entity</th>
-          <th>State</th>
+          <th>[[localize('ui.panel.developer-tools.tabs.states.entity')]]</th>
+          <th>[[localize('ui.panel.developer-tools.tabs.states.state')]]</th>
           <th hidden$="[[narrow]]">
-            Attributes
+            [[localize('ui.panel.developer-tools.tabs.states.attributes')]]
             <paper-checkbox checked="{{_showAttributes}}"></paper-checkbox>
           </th>
         </tr>
         <tr>
           <th>
             <paper-input
-              label="Filter entities"
+              label="[[localize('ui.panel.developer-tools.tabs.states.filter_entities')]]"
               type="search"
               value="{{_entityFilter}}"
             ></paper-input>
           </th>
           <th>
             <paper-input
-              label="Filter states"
+              label="[[localize('ui.panel.developer-tools.tabs.states.filter_states')]]"
               type="search"
               value="{{_stateFilter}}"
             ></paper-input>
           </th>
           <th hidden$="[[!computeShowAttributes(narrow, _showAttributes)]]">
             <paper-input
-              label="Filter attributes"
+              label="[[localize('ui.panel.developer-tools.tabs.states.filter_attributes')]]"
               type="search"
               value="{{_attributeFilter}}"
             ></paper-input>
           </th>
         </tr>
         <tr hidden$="[[!computeShowEntitiesPlaceholder(_entities)]]">
-          <td colspan="3">No entities</td>
+          <td colspan="3">
+            [[localize('ui.panel.developer-tools.tabs.states.no_entities')]]
+          </td>
         </tr>
         <template is="dom-repeat" items="[[_entities]]" as="entity">
           <tr>
@@ -145,8 +153,8 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
               <paper-icon-button
                 on-click="entityMoreInfo"
                 icon="hass:information-outline"
-                alt="More Info"
-                title="More Info"
+                alt="[[localize('ui.panel.developer-tools.tabs.states.more_info')]]"
+                title="[[localize('ui.panel.developer-tools.tabs.states.more_info')]]"
               >
               </paper-icon-button>
               <a href="#" on-click="entitySelected">[[entity.entity_id]]</a>
@@ -244,7 +252,11 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
 
   handleSetState() {
     if (!this._entityId) {
-      alert("Entity is a mandatory field");
+      alert(
+        this.hass.localize(
+          "ui.panel.developer-tools.tabs.states.alert_entity_field"
+        )
+      );
       return;
     }
     this.hass.callApi("POST", "states/" + this._entityId, {
diff --git a/src/translations/en.json b/src/translations/en.json
index 8889864451..1c58d1a3bd 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1816,7 +1816,21 @@
             "title": "Services"
           },
           "states": {
-            "title": "States"
+            "title": "States",
+            "description1": "Set the representation of a device within Home Assistant.",
+            "description2": "This will not communicate with the actual device.",
+            "entity": "Entity",
+            "state": "State",
+            "attributes": "Attributes",
+            "state_attributes": "State attributes (YAML, optional)",
+            "set_state": "Set State",
+            "current_entities": "Current entities",
+            "filter_entities": "Filter entities",
+            "filter_states": "Filter states",
+            "filter_attributes": "Filter attributes",
+            "no_entities": "No entities",
+            "more_info": "More Info",
+            "alert_entity_field": "Entity is a mandatory field"
           },
           "templates": {
             "title": "Template"

From d012512a7960b6a42137eb444555dcd6372c53e0 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Fri, 18 Oct 2019 10:01:41 -0500
Subject: [PATCH 23/70] add feature request template (#4026)

---
 .../bug_report.md}                            | 19 ++++++++++++++++++-
 .github/ISSUE_TEMPLATE/feature_request.md     | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/bug_report.md} (84%)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 84%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 0aa8195d5a..2a6ed52bff 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: bug
+assignees: ""
+---
+
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
 - Provide as many details as possible. Do not delete any text from this template!
 -->
 
+**Checklist:**
+
+- [ ] I updated to the latest version available
+- [ ] I cleared the cache of my browser
+
 **Home Assistant release with the issue:**
+
 <!--
 - Frontend -> Developer tools -> Info
 - Or use this command: hass --version
@@ -13,22 +27,25 @@
 **Last working Home Assistant release (if known):**
 
 **UI (States or Lovelace UI?):**
+
 <!--
 - Frontend -> Developer tools -> Info
 -->
 
 **Browser and Operating System:**
+
 <!--
 Provide details about what browser (and version) you are seeing the issue in. And also which operating system this is on. If possible try to replicate the issue in other browsers and include your findings here.
 -->
 
 **Description of problem:**
+
 <!--
 Explain what the issue is, and how things should look/behave. If possible provide a screenshot with a description.
 -->
 
-
 **Javascript errors shown in the web inspector (if applicable):**
+
 ```
 
 ```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..51d1465c16
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ""
+labels: feature request
+assignees: ""
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From 880b382a1614acdd8717d90e32d660cf86b15008 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Fri, 18 Oct 2019 17:43:04 +0200
Subject: [PATCH 24/70] Translated developer tools logs page (#4046)

* Translated developer tools logs page

* Changed translation key from load_log to load_full_log
---
 .../logs/dialog-system-log-detail.ts          | 10 +++++-
 .../developer-tools/logs/error-log-card.ts    | 13 +++++---
 .../developer-tools/logs/system-log-card.ts   | 31 +++++++++++++------
 src/translations/en.json                      | 10 +++++-
 4 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/panels/developer-tools/logs/dialog-system-log-detail.ts b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
index eba62d72ac..4853d2e79b 100644
--- a/src/panels/developer-tools/logs/dialog-system-log-detail.ts
+++ b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
@@ -13,8 +13,10 @@ import "../../../components/dialog/ha-paper-dialog";
 import { SystemLogDetailDialogParams } from "./show-dialog-system-log-detail";
 import { PolymerChangedEvent } from "../../../polymer-types";
 import { haStyleDialog } from "../../../resources/styles";
+import { HomeAssistant } from "../../../types";
 
 class DialogSystemLogDetail extends LitElement {
+  public hass!: HomeAssistant;
   private _params?: SystemLogDetailDialogParams;
 
   static get properties(): PropertyDeclarations {
@@ -40,7 +42,13 @@ class DialogSystemLogDetail extends LitElement {
         opened
         @opened-changed="${this._openedChanged}"
       >
-        <h2>Log Details (${item.level})</h2>
+        <h2>
+          ${this.hass.localize(
+            "ui.panel.developer-tools.tabs.logs.details",
+            "level",
+            item.level
+          )}
+        </h2>
         <paper-dialog-scrollable>
           <p>${new Date(item.timestamp * 1000)}</p>
           ${item.message
diff --git a/src/panels/developer-tools/logs/error-log-card.ts b/src/panels/developer-tools/logs/error-log-card.ts
index 9f2bfbd094..131466dcc7 100644
--- a/src/panels/developer-tools/logs/error-log-card.ts
+++ b/src/panels/developer-tools/logs/error-log-card.ts
@@ -13,7 +13,7 @@ import { HomeAssistant } from "../../../types";
 import { fetchErrorLog } from "../../../data/error_log";
 
 class ErrorLogCard extends LitElement {
-  public hass?: HomeAssistant;
+  public hass!: HomeAssistant;
   private _errorLog?: string;
 
   static get properties(): PropertyDeclarations {
@@ -35,7 +35,9 @@ class ErrorLogCard extends LitElement {
             `
           : html`
               <mwc-button raised @click=${this._refreshErrorLog}>
-                Load Full Home Assistant Log
+                ${this.hass.localize(
+                  "ui.panel.developer-tools.tabs.logs.load_full_log"
+                )}
               </mwc-button>
             `}
       </p>
@@ -64,9 +66,12 @@ class ErrorLogCard extends LitElement {
   }
 
   private async _refreshErrorLog(): Promise<void> {
-    this._errorLog = "Loading error log…";
+    this._errorLog = this.hass.localize(
+      "ui.panel.developer-tools.tabs.logs.loading_log"
+    );
     const log = await fetchErrorLog(this.hass!);
-    this._errorLog = log || "No errors have been reported.";
+    this._errorLog =
+      log || this.hass.localize("ui.panel.developer-tools.tabs.logs.no_errors");
   }
 }
 
diff --git a/src/panels/developer-tools/logs/system-log-card.ts b/src/panels/developer-tools/logs/system-log-card.ts
index 1406e26f3b..dd7aa87fd4 100644
--- a/src/panels/developer-tools/logs/system-log-card.ts
+++ b/src/panels/developer-tools/logs/system-log-card.ts
@@ -32,7 +32,7 @@ const formatLogTime = (date, language: string) => {
 
 @customElement("system-log-card")
 export class SystemLogCard extends LitElement {
-  public hass?: HomeAssistant;
+  public hass!: HomeAssistant;
   public loaded = false;
   private _items?: LoggedError[];
 
@@ -61,7 +61,11 @@ export class SystemLogCard extends LitElement {
             : html`
                 ${this._items.length === 0
                   ? html`
-                      <div class="card-content">There are no new issues!</div>
+                      <div class="card-content">
+                        ${this.hass.localize(
+                          "ui.panel.developer-tools.tabs.logs.no_issues"
+                        )}
+                      </div>
                     `
                   : this._items.map(
                       (item) => html`
@@ -78,12 +82,17 @@ export class SystemLogCard extends LitElement {
                               ${item.source} (${item.level})
                               ${item.count > 1
                                 ? html`
-                                    - message first occured at
-                                    ${formatLogTime(
-                                      item.first_occured,
-                                      this.hass!.language
+                                    -
+                                    ${this.hass.localize(
+                                      "ui.panel.developer-tools.tabs.logs.multiple_messages",
+                                      "time",
+                                      formatLogTime(
+                                        item.first_occured,
+                                        this.hass!.language
+                                      ),
+                                      "counter",
+                                      item.count
                                     )}
-                                    and shows up ${item.count} times
                                   `
                                 : html``}
                             </div>
@@ -97,10 +106,14 @@ export class SystemLogCard extends LitElement {
                     .hass=${this.hass}
                     domain="system_log"
                     service="clear"
-                    >Clear</ha-call-service-button
+                    >${this.hass.localize(
+                      "ui.panel.developer-tools.tabs.logs.clear"
+                    )}</ha-call-service-button
                   >
                   <ha-progress-button @click=${this.fetchData}
-                    >Refresh</ha-progress-button
+                    >${this.hass.localize(
+                      "ui.panel.developer-tools.tabs.logs.refresh"
+                    )}</ha-progress-button
                   >
                 </div>
               `}
diff --git a/src/translations/en.json b/src/translations/en.json
index 1c58d1a3bd..8e1b7c7714 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1789,7 +1789,15 @@
             "title": "Info"
           },
           "logs": {
-            "title": "Logs"
+            "title": "Logs",
+            "details": "Log Details ({level})",
+            "load_full_log": "Load Full Home Assistant Log",
+            "loading_log": "Loading error log…",
+            "no_errors": "No errors have been reported.",
+            "no_issues": "There are no new issues!",
+            "clear": "Clear",
+            "refresh": "Refresh",
+            "multiple_messages": "message first occurred at {time} and shows up {counter} times"
           },
           "events": {
             "title": "Events",

From 0005c7509184d0c1f5a2d747fb85aaccc7d70f7c Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Fri, 18 Oct 2019 14:08:12 -0500
Subject: [PATCH 25/70] fix double tap on glance entity (#4051)

---
 src/panels/lovelace/cards/hui-glance-card.ts         | 8 ++++----
 src/panels/lovelace/cards/hui-picture-glance-card.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 9494200795..4e78f669dd 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -183,7 +183,7 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
     return html`
       <div
         class="entity"
-        .entityConf="${entityConf}"
+        .config="${entityConf}"
         @ha-click=${this._handleClick}
         @ha-hold=${this._handleHold}
         @ha-dblclick=${this._handleDblClick}
@@ -231,17 +231,17 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
   }
 
   private _handleClick(ev: MouseEvent): void {
-    const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
+    const config = (ev.currentTarget as any).config as GlanceConfigEntity;
     handleClick(this, this.hass!, config, false, false);
   }
 
   private _handleHold(ev: MouseEvent): void {
-    const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
+    const config = (ev.currentTarget as any).config as GlanceConfigEntity;
     handleClick(this, this.hass!, config, true, false);
   }
 
   private _handleDblClick(ev: MouseEvent): void {
-    const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
+    const config = (ev.currentTarget as any).config as GlanceConfigEntity;
     handleClick(this, this.hass!, config, false, true);
   }
 }
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index 98982f3b4f..cbad92508d 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -241,7 +241,7 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
   }
 
   private _handleDblClick(ev: MouseEvent): void {
-    const config = (ev.currentTarget as any).entityConf as any;
+    const config = (ev.currentTarget as any).config as any;
     handleClick(this, this.hass!, config, false, true);
   }
 

From be4d431dc3019c10a202f47fefc337e1445dbbbb Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Fri, 18 Oct 2019 14:55:53 -0500
Subject: [PATCH 26/70] more-info dialog for counter (#4038)

* more-info dialog for counter

* address comments
---
 src/common/const.ts                           |  1 +
 src/common/entity/domain_icon.ts              |  1 +
 .../more-info/controls/more-info-content.ts   |  1 +
 .../more-info/controls/more-info-counter.ts   | 70 +++++++++++++++++++
 src/translations/en.json                      |  7 ++
 5 files changed, 80 insertions(+)
 create mode 100644 src/dialogs/more-info/controls/more-info-counter.ts

diff --git a/src/common/const.ts b/src/common/const.ts
index c1f27c4e9d..3abe76e91b 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -35,6 +35,7 @@ export const DOMAINS_WITH_MORE_INFO = [
   "camera",
   "climate",
   "configurator",
+  "counter",
   "cover",
   "fan",
   "group",
diff --git a/src/common/entity/domain_icon.ts b/src/common/entity/domain_icon.ts
index 9942a6d963..0bb2535a77 100644
--- a/src/common/entity/domain_icon.ts
+++ b/src/common/entity/domain_icon.ts
@@ -14,6 +14,7 @@ const fixedIcons = {
   climate: "hass:thermostat",
   configurator: "hass:settings",
   conversation: "hass:text-to-speech",
+  counter: "hass:counter",
   device_tracker: "hass:account",
   fan: "hass:fan",
   google_assistant: "hass:google-assistant",
diff --git a/src/dialogs/more-info/controls/more-info-content.ts b/src/dialogs/more-info/controls/more-info-content.ts
index 1d76bb1cc5..e6fc6d2cfe 100644
--- a/src/dialogs/more-info/controls/more-info-content.ts
+++ b/src/dialogs/more-info/controls/more-info-content.ts
@@ -10,6 +10,7 @@ import "./more-info-automation";
 import "./more-info-camera";
 import "./more-info-climate";
 import "./more-info-configurator";
+import "./more-info-counter";
 import "./more-info-cover";
 import "./more-info-default";
 import "./more-info-fan";
diff --git a/src/dialogs/more-info/controls/more-info-counter.ts b/src/dialogs/more-info/controls/more-info-counter.ts
new file mode 100644
index 0000000000..3253dd272a
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-counter.ts
@@ -0,0 +1,70 @@
+import {
+  LitElement,
+  html,
+  TemplateResult,
+  CSSResult,
+  css,
+  property,
+  customElement,
+} from "lit-element";
+import "@material/mwc-button";
+import { HassEntity } from "home-assistant-js-websocket";
+
+import { HomeAssistant } from "../../../types";
+
+@customElement("more-info-counter")
+class MoreInfoCounter extends LitElement {
+  @property() public hass!: HomeAssistant;
+  @property() public stateObj?: HassEntity;
+
+  protected render(): TemplateResult | void {
+    if (!this.hass || !this.stateObj) {
+      return html``;
+    }
+
+    return html`
+      <div class="actions">
+        <mwc-button
+          .action="${"increment"}"
+          @click="${this._handleActionClick}"
+        >
+          ${this.hass!.localize("ui.card.counter.actions.increment")}
+        </mwc-button>
+        <mwc-button
+          .action="${"decrement"}"
+          @click="${this._handleActionClick}"
+        >
+          ${this.hass!.localize("ui.card.counter.actions.decrement")}
+        </mwc-button>
+        <mwc-button .action="${"reset"}" @click="${this._handleActionClick}">
+          ${this.hass!.localize("ui.card.counter.actions.reset")}
+        </mwc-button>
+      </div>
+    `;
+  }
+
+  private _handleActionClick(e: MouseEvent): void {
+    const action = (e.currentTarget as any).action;
+    this.hass.callService("counter", action, {
+      entity_id: this.stateObj!.entity_id,
+    });
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      .actions {
+        margin: 0 8px;
+        padding-top: 20px;
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "more-info-counter": MoreInfoCounter;
+  }
+}
diff --git a/src/translations/en.json b/src/translations/en.json
index 8e1b7c7714..98027077e5 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -417,6 +417,13 @@
         "away_mode": "Away mode",
         "aux_heat": "Aux heat"
       },
+      "counter": {
+        "actions": {
+          "increment": "increment",
+          "decrement": "decrement",
+          "reset": "reset"
+        }
+      },
       "cover": {
         "position": "Position",
         "tilt_position": "Tilt position"

From 5a957c3c9ed36a3ef07294c4f171b5e1f5b78836 Mon Sep 17 00:00:00 2001
From: shbatm <support@shbatm.com>
Date: Fri, 18 Oct 2019 15:58:25 -0500
Subject: [PATCH 27/70] Add width property to light card to fix #3964 (#3972)

* Add width property to light card to fix #3964

* Update Light Card Name CSS

* Update css per review
---
 src/panels/lovelace/cards/hui-light-card.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 701c046e95..b93274b2a2 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -212,10 +212,12 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
 
         .name {
           position: absolute;
-          top: 160px;
-          left: 50%;
-          transform: translate(-50%);
           font-size: var(--name-font-size);
+          bottom: 16px;
+          box-sizing: border-box;
+          text-align: center;
+          width: 100%;
+          padding: 0 16px;
         }
 
         .brightness {

From 60b3a960ae8cb724ca0fde711d90625b948c44a3 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Fri, 18 Oct 2019 23:04:26 +0200
Subject: [PATCH 28/70] Translated developer tools mqtt page (#4052)

---
 .../mqtt/developer-tools-mqtt.ts              | 24 ++++++++++---
 .../mqtt/mqtt-subscribe-card.ts               | 35 +++++++++++++++----
 src/translations/en.json                      | 12 ++++++-
 3 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/panels/developer-tools/mqtt/developer-tools-mqtt.ts b/src/panels/developer-tools/mqtt/developer-tools-mqtt.ts
index 93f0215ee9..aaef686ffc 100644
--- a/src/panels/developer-tools/mqtt/developer-tools-mqtt.ts
+++ b/src/panels/developer-tools/mqtt/developer-tools-mqtt.ts
@@ -19,7 +19,7 @@ import "./mqtt-subscribe-card";
 
 @customElement("developer-tools-mqtt")
 class HaPanelDevMqtt extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property() public hass!: HomeAssistant;
 
   @property() private topic = "";
 
@@ -40,15 +40,25 @@ class HaPanelDevMqtt extends LitElement {
   protected render(): TemplateResult {
     return html`
       <div class="content">
-        <ha-card header="Publish a packet">
+        <ha-card
+          header="${this.hass.localize(
+            "ui.panel.developer-tools.tabs.mqtt.description_publish"
+          )}"
+        >
           <div class="card-content">
             <paper-input
-              label="topic"
+              label="${this.hass.localize(
+                "ui.panel.developer-tools.tabs.mqtt.topic"
+              )}"
               .value=${this.topic}
               @value-changed=${this._handleTopic}
             ></paper-input>
 
-            <p>Payload (template allowed)</p>
+            <p>
+              ${this.hass.localize(
+                "ui.panel.developer-tools.tabs.mqtt.payload"
+              )}
+            </p>
             <ha-code-editor
               mode="jinja2"
               .value="${this.payload}"
@@ -56,7 +66,11 @@ class HaPanelDevMqtt extends LitElement {
             ></ha-code-editor>
           </div>
           <div class="card-actions">
-            <mwc-button @click=${this._publish}>Publish</mwc-button>
+            <mwc-button @click=${this._publish}
+              >${this.hass.localize(
+                "ui.panel.developer-tools.tabs.mqtt.publish"
+              )}</mwc-button
+            >
           </div>
         </ha-card>
 
diff --git a/src/panels/developer-tools/mqtt/mqtt-subscribe-card.ts b/src/panels/developer-tools/mqtt/mqtt-subscribe-card.ts
index 0795fcad30..24b40c1601 100644
--- a/src/panels/developer-tools/mqtt/mqtt-subscribe-card.ts
+++ b/src/panels/developer-tools/mqtt/mqtt-subscribe-card.ts
@@ -17,7 +17,7 @@ import { subscribeMQTTTopic, MQTTMessage } from "../../../data/mqtt";
 
 @customElement("mqtt-subscribe-card")
 class MqttSubscribeCard extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property() public hass!: HomeAssistant;
 
   @property() private _topic = "";
 
@@ -42,12 +42,20 @@ class MqttSubscribeCard extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-card header="Listen to a topic">
+      <ha-card
+        header="${this.hass.localize(
+          "ui.panel.developer-tools.tabs.mqtt.description_listen"
+        )}"
+      >
         <form>
           <paper-input
             .label=${this._subscribed
-              ? "Listening to"
-              : "Topic to subscribe to"}
+              ? this.hass.localize(
+                  "ui.panel.developer-tools.tabs.mqtt.listening_to"
+                )
+              : this.hass.localize(
+                  "ui.panel.developer-tools.tabs.mqtt.subscribe_to"
+                )}
             .disabled=${this._subscribed !== undefined}
             .value=${this._topic}
             @value-changed=${this._valueChanged}
@@ -57,15 +65,28 @@ class MqttSubscribeCard extends LitElement {
             @click=${this._handleSubmit}
             type="submit"
           >
-            ${this._subscribed ? "Stop listening" : "Start listening"}
+            ${this._subscribed
+              ? this.hass.localize(
+                  "ui.panel.developer-tools.tabs.mqtt.stop_listening"
+                )
+              : this.hass.localize(
+                  "ui.panel.developer-tools.tabs.mqtt.start_listening"
+                )}
           </mwc-button>
         </form>
         <div class="events">
           ${this._messages.map(
             (msg) => html`
               <div class="event">
-                Message ${msg.id} received on <b>${msg.message.topic}</b> at
-                ${format_time(msg.time, this.hass!.language)}:
+                ${this.hass.localize(
+                  "ui.panel.developer-tools.tabs.mqtt.message_received",
+                  "id",
+                  msg.id,
+                  "topic",
+                  msg.message.topic,
+                  "time",
+                  format_time(msg.time, this.hass!.language)
+                )}
                 <pre>${msg.payload}</pre>
                 <div class="bottom">
                   QoS: ${msg.message.qos} - Retain:
diff --git a/src/translations/en.json b/src/translations/en.json
index 98027077e5..dec4550cdb 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1825,7 +1825,17 @@
             "notification_event_fired": "Event {type} successful fired!"
           },
           "mqtt": {
-            "title": "MQTT"
+            "title": "MQTT",
+            "description_publish": "Publish a packet",
+            "topic": "topic",
+            "payload": "Payload (template allowed)",
+            "publish": "Publish",
+            "description_listen": "Listen to a topic",
+            "listening_to": "Listening to",
+            "subscribe_to": "Topic to subscribe to",
+            "start_listening": "Start listening",
+            "stop_listening": "Stop listening",
+            "message_received": "Message {id} received on {topic} at {time}:"
           },
           "services": {
             "title": "Services"

From cc12dbb6ee702a0be7080fbbb799043515867332 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Fri, 18 Oct 2019 23:04:43 +0200
Subject: [PATCH 29/70] Translated developer tools services page (#4049)

* Translated developer tools services page

* Changed translation parameter from error to data
---
 .../service/developer-tools-service.js        | 47 ++++++++++++++-----
 src/translations/en.json                      | 13 ++++-
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/panels/developer-tools/service/developer-tools-service.js b/src/panels/developer-tools/service/developer-tools-service.js
index de04bd4ed9..6c73be3733 100644
--- a/src/panels/developer-tools/service/developer-tools-service.js
+++ b/src/panels/developer-tools/service/developer-tools-service.js
@@ -10,9 +10,13 @@ import "../../../components/ha-code-editor";
 import "../../../components/ha-service-picker";
 import "../../../resources/ha-style";
 import "../../../util/app-localstorage-document";
+import LocalizeMixin from "../../../mixins/localize-mixin";
 
 const ERROR_SENTINEL = {};
-class HaPanelDevService extends PolymerElement {
+/*
+ * @appliesMixin LocalizeMixin
+ */
+class HaPanelDevService extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
       <style include="ha-style">
@@ -94,8 +98,7 @@ class HaPanelDevService extends PolymerElement {
 
       <div class="content">
         <p>
-          The service dev tool allows you to call any available service in Home
-          Assistant.
+          [[localize('ui.panel.developer-tools.tabs.services.description')]]
         </p>
 
         <div class="ha-form">
@@ -113,7 +116,7 @@ class HaPanelDevService extends PolymerElement {
               allow-custom-entity
             ></ha-entity-picker>
           </template>
-          <p>Service Data (YAML, optional)</p>
+          <p>[[localize('ui.panel.developer-tools.tabs.services.data')]]</p>
           <ha-code-editor
             mode="yaml"
             value="[[serviceData]]"
@@ -121,30 +124,42 @@ class HaPanelDevService extends PolymerElement {
             on-value-changed="_yamlChanged"
           ></ha-code-editor>
           <mwc-button on-click="_callService" raised disabled="[[!validJSON]]">
-            Call Service
+            [[localize('ui.panel.developer-tools.tabs.services.call_service')]]
           </mwc-button>
         </div>
 
         <template is="dom-if" if="[[!domainService]]">
-          <h1>Select a service to see the description</h1>
+          <h1>
+            [[localize('ui.panel.developer-tools.tabs.services.select_service')]]
+          </h1>
         </template>
 
         <template is="dom-if" if="[[domainService]]">
           <template is="dom-if" if="[[!_description]]">
-            <h1>No description is available</h1>
+            <h1>
+              [[localize('ui.panel.developer-tools.tabs.services.no_description')]]
+            </h1>
           </template>
           <template is="dom-if" if="[[_description]]">
             <h3>[[_description]]</h3>
 
             <table class="attributes">
               <tr>
-                <th>Parameter</th>
-                <th>Description</th>
-                <th>Example</th>
+                <th>
+                  [[localize('ui.panel.developer-tools.tabs.services.column_parameter')]]
+                </th>
+                <th>
+                  [[localize('ui.panel.developer-tools.tabs.services.column_description')]]
+                </th>
+                <th>
+                  [[localize('ui.panel.developer-tools.tabs.services.column_example')]]
+                </th>
               </tr>
               <template is="dom-if" if="[[!_attributes.length]]">
                 <tr>
-                  <td colspan="3">This service takes no parameters.</td>
+                  <td colspan="3">
+                    [[localize('ui.panel.developer-tools.tabs.services.no_parameters')]]
+                  </td>
                 </tr>
               </template>
               <template is="dom-repeat" items="[[_attributes]]" as="attribute">
@@ -158,7 +173,7 @@ class HaPanelDevService extends PolymerElement {
 
             <template is="dom-if" if="[[_attributes.length]]">
               <mwc-button on-click="_fillExampleData">
-                Fill Example Data
+                [[localize('ui.panel.developer-tools.tabs.services.fill_example_data')]]
               </mwc-button>
             </template>
           </template>
@@ -276,7 +291,13 @@ class HaPanelDevService extends PolymerElement {
   _callService() {
     if (this.parsedJSON === ERROR_SENTINEL) {
       // eslint-disable-next-line
-      alert(`Error parsing YAML: ${this.serviceData}`);
+      alert(
+        this.hass.localize(
+          "ui.panel.developer-tools.tabs.services.alert_parsing_yaml",
+          "data",
+          this.serviceData
+        )
+      );
       return;
     }
 
diff --git a/src/translations/en.json b/src/translations/en.json
index dec4550cdb..ae5e6f7c08 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1838,7 +1838,18 @@
             "message_received": "Message {id} received on {topic} at {time}:"
           },
           "services": {
-            "title": "Services"
+            "title": "Services",
+            "description": "The service dev tool allows you to call any available service in Home Assistant.",
+            "data": "Service Data (YAML, optional)",
+            "call_service": "Call Service",
+            "select_service": "Select a service to see the description",
+            "no_description": "No description is available",
+            "no_parameters": "This service takes no parameters.",
+            "column_parameter": "Parameter",
+            "column_description": "Description",
+            "column_example": "Example",
+            "fill_example_data": "Fill Example Data",
+            "alert_parsing_yaml": "Error parsing YAML: {data}"
           },
           "states": {
             "title": "States",

From 442171169b37e8e752ffcc31c29b0a77354aff19 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Fri, 18 Oct 2019 23:05:07 +0200
Subject: [PATCH 30/70] Translated developer tools template page (#4050)

---
 .../template/developer-tools-template.js         | 16 +++++++++-------
 src/translations/en.json                         |  7 ++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/panels/developer-tools/template/developer-tools-template.js b/src/panels/developer-tools/template/developer-tools-template.js
index 998b653b19..4bb9d537a8 100644
--- a/src/panels/developer-tools/template/developer-tools-template.js
+++ b/src/panels/developer-tools/template/developer-tools-template.js
@@ -3,11 +3,12 @@ import { timeOut } from "@polymer/polymer/lib/utils/async";
 import { Debouncer } from "@polymer/polymer/lib/utils/debounce";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
+import LocalizeMixin from "../../../mixins/localize-mixin";
 import "../../../components/ha-code-editor";
 
 import "../../../resources/ha-style";
 
-class HaPanelDevTemplate extends PolymerElement {
+class HaPanelDevTemplate extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
       <style include="ha-style iron-flex iron-positioning"></style>
@@ -60,26 +61,25 @@ class HaPanelDevTemplate extends PolymerElement {
       <div class$="[[computeFormClasses(narrow)]]">
         <div class="edit-pane">
           <p>
-            Templates are rendered using the Jinja2 template engine with some
-            Home Assistant specific extensions.
+            [[localize('ui.panel.developer-tools.tabs.templates.description')]]
           </p>
           <ul>
             <li>
               <a
                 href="http://jinja.pocoo.org/docs/dev/templates/"
                 target="_blank"
-                >Jinja2 template documentation</a
+                >[[localize('ui.panel.developer-tools.tabs.templates.jinja_documentation')]]</a
               >
             </li>
             <li>
               <a
                 href="https://home-assistant.io/docs/configuration/templating/"
                 target="_blank"
-                >Home Assistant template extensions</a
+                >[[localize('ui.panel.developer-tools.tabs.templates.template_extensions')]]</a
               >
             </li>
           </ul>
-          <p>Template editor</p>
+          <p>[[localize('ui.panel.developer-tools.tabs.templates.editor')]]</p>
           <ha-code-editor
             mode="jinja2"
             value="[[template]]"
@@ -188,7 +188,9 @@ For loop example:
       function(error) {
         this.processed =
           (error && error.body && error.body.message) ||
-          "Unknown error rendering template";
+          this.hass.localize(
+            "ui.panel.developer-tools.tabs.templates.unknown_error_template"
+          );
         this.error = true;
         this.rendering = false;
       }.bind(this)
diff --git a/src/translations/en.json b/src/translations/en.json
index ae5e6f7c08..3964da212a 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1869,7 +1869,12 @@
             "alert_entity_field": "Entity is a mandatory field"
           },
           "templates": {
-            "title": "Template"
+            "title": "Template",
+            "description": "Templates are rendered using the Jinja2 template engine with some Home Assistant specific extensions.",
+            "editor": "Template editor",
+            "jinja_documentation": "Jinja2 template documentation",
+            "template_extensions": "Home Assistant template extensions",
+            "unknown_error_template": "Unknown error rendering template"
           }
         }
       },

From c437cd386546a3dbeba8d766000016c31b838bb7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 18 Oct 2019 22:50:27 -0700
Subject: [PATCH 31/70] Use only decorators (#4058)

* Use only decorators

* Remove unused imports
---
 demo/src/custom-cards/ha-demo-card.ts         | 22 ++-------
 src/auth/ha-authorize.ts                      | 22 +++------
 src/components/ha-label-badge.ts              | 22 +++------
 .../more-info/controls/more-info-content.ts   | 17 ++-----
 .../dialog-area-registry-detail.ts            | 20 +++------
 .../config/automation/ha-automation-editor.ts | 28 ++++--------
 .../config/cloud/account/cloud-google-pref.ts | 13 ++----
 .../config/cloud/account/cloud-remote-pref.ts | 13 ++----
 .../config/cloud/account/cloud-webhooks.ts    | 27 +++--------
 .../dialog-manage-cloudhook.ts                | 16 +------
 src/panels/config/person/ha-config-person.ts  | 19 +++-----
 .../config/zha/zha-cluster-attributes.ts      | 45 +++++--------------
 src/panels/config/zha/zha-cluster-commands.ts | 41 +++++------------
 src/panels/config/zha/zha-clusters.ts         | 32 +++----------
 src/panels/config/zha/zha-network.ts          | 22 ++-------
 .../info/system-health-card.ts                | 13 ++----
 .../logs/dialog-system-log-detail.ts          | 12 ++---
 .../developer-tools/logs/error-log-card.ts    | 13 ++----
 .../developer-tools/logs/system-log-card.ts   | 13 ++----
 src/panels/lovelace/views/hui-view.ts         | 31 +++----------
 20 files changed, 103 insertions(+), 338 deletions(-)

diff --git a/demo/src/custom-cards/ha-demo-card.ts b/demo/src/custom-cards/ha-demo-card.ts
index c9b4f1d060..45c887db9d 100644
--- a/demo/src/custom-cards/ha-demo-card.ts
+++ b/demo/src/custom-cards/ha-demo-card.ts
@@ -1,10 +1,4 @@
-import {
-  LitElement,
-  html,
-  CSSResult,
-  css,
-  PropertyDeclarations,
-} from "lit-element";
+import { LitElement, html, CSSResult, css, property } from "lit-element";
 import { until } from "lit-html/directives/until";
 import "@material/mwc-button";
 import "@polymer/paper-spinner/paper-spinner-lite";
@@ -20,19 +14,11 @@ import {
 } from "../configs/demo-configs";
 
 export class HADemoCard extends LitElement implements LovelaceCard {
-  public lovelace?: Lovelace;
-  public hass!: MockHomeAssistant;
-  private _switching?: boolean;
+  @property() public lovelace?: Lovelace;
+  @property() public hass!: MockHomeAssistant;
+  @property() private _switching?: boolean;
   private _hidden = localStorage.hide_demo_card;
 
-  static get properties(): PropertyDeclarations {
-    return {
-      lovelace: {},
-      hass: {},
-      _switching: {},
-    };
-  }
-
   public getCardSize() {
     return this._hidden ? 0 : 2;
   }
diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts
index 0a7ce2a70a..d5ba17aa2d 100644
--- a/src/auth/ha-authorize.ts
+++ b/src/auth/ha-authorize.ts
@@ -2,10 +2,10 @@ import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import {
   LitElement,
   html,
-  PropertyDeclarations,
   PropertyValues,
   CSSResult,
   css,
+  property,
 } from "lit-element";
 import "./ha-auth-flow";
 import { AuthProvider, fetchAuthProviders } from "../data/auth";
@@ -20,11 +20,11 @@ interface QueryParams {
 }
 
 class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
-  public clientId?: string;
-  public redirectUri?: string;
-  public oauth2State?: string;
-  private _authProvider?: AuthProvider;
-  private _authProviders?: AuthProvider[];
+  @property() public clientId?: string;
+  @property() public redirectUri?: string;
+  @property() public oauth2State?: string;
+  @property() private _authProvider?: AuthProvider;
+  @property() private _authProviders?: AuthProvider[];
 
   constructor() {
     super();
@@ -48,16 +48,6 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
     }
   }
 
-  static get properties(): PropertyDeclarations {
-    return {
-      _authProvider: {},
-      _authProviders: {},
-      clientId: {},
-      redirectUri: {},
-      oauth2State: {},
-    };
-  }
-
   protected render() {
     if (!this._authProviders) {
       return html`
diff --git a/src/components/ha-label-badge.ts b/src/components/ha-label-badge.ts
index d1561cb160..736d04b8ef 100644
--- a/src/components/ha-label-badge.ts
+++ b/src/components/ha-label-badge.ts
@@ -1,31 +1,21 @@
 import {
   html,
   LitElement,
-  PropertyDeclarations,
   PropertyValues,
   TemplateResult,
   CSSResult,
   css,
+  property,
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 import "./ha-icon";
 
 class HaLabelBadge extends LitElement {
-  public value?: string;
-  public icon?: string;
-  public label?: string;
-  public description?: string;
-  public image?: string;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      value: {},
-      icon: {},
-      label: {},
-      description: {},
-      image: {},
-    };
-  }
+  @property() public value?: string;
+  @property() public icon?: string;
+  @property() public label?: string;
+  @property() public description?: string;
+  @property() public image?: string;
 
   protected render(): TemplateResult | void {
     return html`
diff --git a/src/dialogs/more-info/controls/more-info-content.ts b/src/dialogs/more-info/controls/more-info-content.ts
index e6fc6d2cfe..871a2eed0e 100644
--- a/src/dialogs/more-info/controls/more-info-content.ts
+++ b/src/dialogs/more-info/controls/more-info-content.ts
@@ -1,8 +1,4 @@
-import {
-  PropertyDeclarations,
-  PropertyValues,
-  UpdatingElement,
-} from "lit-element";
+import { PropertyValues, UpdatingElement, property } from "lit-element";
 import { HassEntity } from "home-assistant-js-websocket";
 
 import "./more-info-alarm_control_panel";
@@ -33,17 +29,10 @@ import dynamicContentUpdater from "../../../common/dom/dynamic_content_updater";
 import { HomeAssistant } from "../../../types";
 
 class MoreInfoContent extends UpdatingElement {
-  public hass?: HomeAssistant;
-  public stateObj?: HassEntity;
+  @property() public hass?: HomeAssistant;
+  @property() public stateObj?: HassEntity;
   private _detachedChild?: ChildNode;
 
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      stateObj: {},
-    };
-  }
-
   protected firstUpdated(): void {
     this.style.position = "relative";
     this.style.display = "block";
diff --git a/src/panels/config/area_registry/dialog-area-registry-detail.ts b/src/panels/config/area_registry/dialog-area-registry-detail.ts
index f2703018c9..ca92374853 100644
--- a/src/panels/config/area_registry/dialog-area-registry-detail.ts
+++ b/src/panels/config/area_registry/dialog-area-registry-detail.ts
@@ -2,9 +2,9 @@ import {
   LitElement,
   html,
   css,
-  PropertyDeclarations,
   CSSResult,
   TemplateResult,
+  property,
 } from "lit-element";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import "@polymer/paper-input/paper-input";
@@ -17,19 +17,11 @@ import { HomeAssistant } from "../../../types";
 import { AreaRegistryEntryMutableParams } from "../../../data/area_registry";
 
 class DialogAreaDetail extends LitElement {
-  public hass!: HomeAssistant;
-  private _name!: string;
-  private _error?: string;
-  private _params?: AreaRegistryDetailDialogParams;
-  private _submitting?: boolean;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      _error: {},
-      _name: {},
-      _params: {},
-    };
-  }
+  @property() public hass!: HomeAssistant;
+  @property() private _name!: string;
+  @property() private _error?: string;
+  @property() private _params?: AreaRegistryDetailDialogParams;
+  @property() private _submitting?: boolean;
 
   public async showDialog(
     params: AreaRegistryDetailDialogParams
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 7054ad5365..5cc7b8abc7 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -4,8 +4,8 @@ import {
   html,
   CSSResult,
   css,
-  PropertyDeclarations,
   PropertyValues,
+  property,
 } from "lit-element";
 import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
@@ -38,26 +38,14 @@ function AutomationEditor(mountEl, props, mergeEl) {
 }
 
 export class HaAutomationEditor extends LitElement {
-  public hass!: HomeAssistant;
-  public automation!: AutomationEntity;
-  public isWide?: boolean;
-  public creatingNew?: boolean;
-  private _config?: AutomationConfig;
-  private _dirty?: boolean;
+  @property() public hass!: HomeAssistant;
+  @property() public automation!: AutomationEntity;
+  @property() public isWide?: boolean;
+  @property() public creatingNew?: boolean;
+  @property() private _config?: AutomationConfig;
+  @property() private _dirty?: boolean;
   private _rendered?: unknown;
-  private _errors?: string;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      automation: {},
-      creatingNew: {},
-      isWide: {},
-      _errors: {},
-      _dirty: {},
-      _config: {},
-    };
-  }
+  @property() private _errors?: string;
 
   constructor() {
     super();
diff --git a/src/panels/config/cloud/account/cloud-google-pref.ts b/src/panels/config/cloud/account/cloud-google-pref.ts
index 6c9ece442d..dd25e9efe9 100644
--- a/src/panels/config/cloud/account/cloud-google-pref.ts
+++ b/src/panels/config/cloud/account/cloud-google-pref.ts
@@ -1,10 +1,10 @@
 import {
   html,
   LitElement,
-  PropertyDeclarations,
   TemplateResult,
   CSSResult,
   css,
+  property,
 } from "lit-element";
 import "@material/mwc-button";
 import "../../../../components/buttons/ha-call-api-button";
@@ -21,15 +21,8 @@ import { PaperInputElement } from "@polymer/paper-input/paper-input";
 import { showSaveSuccessToast } from "../../../../util/toast-saved-success";
 
 export class CloudGooglePref extends LitElement {
-  public hass?: HomeAssistant;
-  public cloudStatus?: CloudStatusLoggedIn;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      cloudStatus: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public cloudStatus?: CloudStatusLoggedIn;
 
   protected render(): TemplateResult | void {
     if (!this.cloudStatus) {
diff --git a/src/panels/config/cloud/account/cloud-remote-pref.ts b/src/panels/config/cloud/account/cloud-remote-pref.ts
index 35f309c016..1c701487ff 100644
--- a/src/panels/config/cloud/account/cloud-remote-pref.ts
+++ b/src/panels/config/cloud/account/cloud-remote-pref.ts
@@ -1,11 +1,11 @@
 import {
   html,
   LitElement,
-  PropertyDeclarations,
   TemplateResult,
   customElement,
   CSSResult,
   css,
+  property,
 } from "lit-element";
 import "@material/mwc-button";
 import "@polymer/paper-item/paper-item-body";
@@ -26,15 +26,8 @@ import { showCloudCertificateDialog } from "../dialog-cloud-certificate/show-dia
 
 @customElement("cloud-remote-pref")
 export class CloudRemotePref extends LitElement {
-  public hass?: HomeAssistant;
-  public cloudStatus?: CloudStatusLoggedIn;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      cloudStatus: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public cloudStatus?: CloudStatusLoggedIn;
 
   protected render(): TemplateResult | void {
     if (!this.cloudStatus) {
diff --git a/src/panels/config/cloud/account/cloud-webhooks.ts b/src/panels/config/cloud/account/cloud-webhooks.ts
index 9f2b912283..af8a63d794 100644
--- a/src/panels/config/cloud/account/cloud-webhooks.ts
+++ b/src/panels/config/cloud/account/cloud-webhooks.ts
@@ -1,9 +1,4 @@
-import {
-  html,
-  LitElement,
-  PropertyDeclarations,
-  PropertyValues,
-} from "lit-element";
+import { html, LitElement, PropertyValues, property } from "lit-element";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
 import "@polymer/paper-spinner/paper-spinner";
@@ -22,21 +17,11 @@ import {
 import { showManageCloudhookDialog } from "../dialog-manage-cloudhook/show-dialog-manage-cloudhook";
 
 export class CloudWebhooks extends LitElement {
-  public hass?: HomeAssistant;
-  public cloudStatus?: CloudStatusLoggedIn;
-  private _cloudHooks?: { [webhookId: string]: CloudWebhook };
-  private _localHooks?: Webhook[];
-  private _progress: string[];
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      cloudStatus: {},
-      _cloudHooks: {},
-      _localHooks: {},
-      _progress: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public cloudStatus?: CloudStatusLoggedIn;
+  @property() private _cloudHooks?: { [webhookId: string]: CloudWebhook };
+  @property() private _localHooks?: Webhook[];
+  @property() private _progress: string[];
 
   constructor() {
     super();
diff --git a/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts b/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts
index 3ecdb04683..39628e44e9 100644
--- a/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts
+++ b/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts
@@ -1,10 +1,4 @@
-import {
-  html,
-  LitElement,
-  PropertyDeclarations,
-  css,
-  CSSResult,
-} from "lit-element";
+import { html, LitElement, css, CSSResult, property } from "lit-element";
 
 import "@material/mwc-button";
 import "@polymer/paper-input/paper-input";
@@ -24,13 +18,7 @@ const inputLabel = "Public URL – Click to copy to clipboard";
 
 export class DialogManageCloudhook extends LitElement {
   protected hass?: HomeAssistant;
-  private _params?: WebhookDialogParams;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      _params: {},
-    };
-  }
+  @property() private _params?: WebhookDialogParams;
 
   public async showDialog(params: WebhookDialogParams) {
     this._params = params;
diff --git a/src/panels/config/person/ha-config-person.ts b/src/panels/config/person/ha-config-person.ts
index 46958c4fd6..fbdcc0fcd3 100644
--- a/src/panels/config/person/ha-config-person.ts
+++ b/src/panels/config/person/ha-config-person.ts
@@ -4,7 +4,7 @@ import {
   html,
   css,
   CSSResult,
-  PropertyDeclarations,
+  property,
 } from "lit-element";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
@@ -30,21 +30,12 @@ import {
 import { User, fetchUsers } from "../../../data/user";
 
 class HaConfigPerson extends LitElement {
-  public hass?: HomeAssistant;
-  public isWide?: boolean;
-  private _storageItems?: Person[];
-  private _configItems?: Person[];
+  @property() public hass?: HomeAssistant;
+  @property() public isWide?: boolean;
+  @property() private _storageItems?: Person[];
+  @property() private _configItems?: Person[];
   private _usersLoad?: Promise<User[]>;
 
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      isWide: {},
-      _storageItems: {},
-      _configItems: {},
-    };
-  }
-
   protected render(): TemplateResult | void {
     if (
       !this.hass ||
diff --git a/src/panels/config/zha/zha-cluster-attributes.ts b/src/panels/config/zha/zha-cluster-attributes.ts
index c7b310eb1f..c438ca8200 100644
--- a/src/panels/config/zha/zha-cluster-attributes.ts
+++ b/src/panels/config/zha/zha-cluster-attributes.ts
@@ -14,9 +14,9 @@ import {
   CSSResult,
   html,
   LitElement,
-  PropertyDeclarations,
   PropertyValues,
   TemplateResult,
+  property,
 } from "lit-element";
 
 import {
@@ -37,39 +37,16 @@ import {
 } from "./types";
 
 export class ZHAClusterAttributes extends LitElement {
-  public hass?: HomeAssistant;
-  public isWide?: boolean;
-  public showHelp: boolean;
-  public selectedNode?: ZHADevice;
-  public selectedCluster?: Cluster;
-  private _attributes: Attribute[];
-  private _selectedAttributeIndex: number;
-  private _attributeValue?: any;
-  private _manufacturerCodeOverride?: string | number;
-  private _setAttributeServiceData?: SetAttributeServiceData;
-
-  constructor() {
-    super();
-    this.showHelp = false;
-    this._selectedAttributeIndex = -1;
-    this._attributes = [];
-    this._attributeValue = "";
-  }
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      isWide: {},
-      showHelp: {},
-      selectedNode: {},
-      selectedCluster: {},
-      _attributes: {},
-      _selectedAttributeIndex: {},
-      _attributeValue: {},
-      _manufacturerCodeOverride: {},
-      _setAttributeServiceData: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public isWide?: boolean;
+  @property() public showHelp = false;
+  @property() public selectedNode?: ZHADevice;
+  @property() public selectedCluster?: Cluster;
+  @property() private _attributes: Attribute[] = [];
+  @property() private _selectedAttributeIndex = -1;
+  @property() private _attributeValue?: any = "";
+  @property() private _manufacturerCodeOverride?: string | number;
+  @property() private _setAttributeServiceData?: SetAttributeServiceData;
 
   protected updated(changedProperties: PropertyValues): void {
     if (changedProperties.has("selectedCluster")) {
diff --git a/src/panels/config/zha/zha-cluster-commands.ts b/src/panels/config/zha/zha-cluster-commands.ts
index fd2d4d2041..881ee6681c 100644
--- a/src/panels/config/zha/zha-cluster-commands.ts
+++ b/src/panels/config/zha/zha-cluster-commands.ts
@@ -13,9 +13,9 @@ import {
   CSSResult,
   html,
   LitElement,
-  PropertyDeclarations,
   PropertyValues,
   TemplateResult,
+  property,
 } from "lit-element";
 
 import {
@@ -34,36 +34,15 @@ import {
 } from "./types";
 
 export class ZHAClusterCommands extends LitElement {
-  public hass?: HomeAssistant;
-  public isWide?: boolean;
-  public selectedNode?: ZHADevice;
-  public selectedCluster?: Cluster;
-  private _showHelp: boolean;
-  private _commands: Command[];
-  private _selectedCommandIndex: number;
-  private _manufacturerCodeOverride?: number;
-  private _issueClusterCommandServiceData?: IssueCommandServiceData;
-
-  constructor() {
-    super();
-    this._showHelp = false;
-    this._selectedCommandIndex = -1;
-    this._commands = [];
-  }
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      isWide: {},
-      selectedNode: {},
-      selectedCluster: {},
-      _showHelp: {},
-      _commands: {},
-      _selectedCommandIndex: {},
-      _manufacturerCodeOverride: {},
-      _issueClusterCommandServiceData: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public isWide?: boolean;
+  @property() public selectedNode?: ZHADevice;
+  @property() public selectedCluster?: Cluster;
+  @property() private _showHelp = false;
+  @property() private _commands: Command[] = [];
+  @property() private _selectedCommandIndex = -1;
+  @property() private _manufacturerCodeOverride?: number;
+  @property() private _issueClusterCommandServiceData?: IssueCommandServiceData;
 
   protected updated(changedProperties: PropertyValues): void {
     if (changedProperties.has("selectedCluster")) {
diff --git a/src/panels/config/zha/zha-clusters.ts b/src/panels/config/zha/zha-clusters.ts
index d1e0ec8c2d..b5baba730f 100644
--- a/src/panels/config/zha/zha-clusters.ts
+++ b/src/panels/config/zha/zha-clusters.ts
@@ -11,9 +11,9 @@ import {
   CSSResult,
   html,
   LitElement,
-  PropertyDeclarations,
   PropertyValues,
   TemplateResult,
+  property,
 } from "lit-element";
 
 import { fireEvent } from "../../../common/dom/fire_event";
@@ -39,30 +39,12 @@ const computeClusterKey = (cluster: Cluster): string => {
 };
 
 export class ZHAClusters extends LitElement {
-  public hass?: HomeAssistant;
-  public isWide?: boolean;
-  public showHelp: boolean;
-  public selectedDevice?: ZHADevice;
-  private _selectedClusterIndex: number;
-  private _clusters: Cluster[];
-
-  constructor() {
-    super();
-    this.showHelp = false;
-    this._selectedClusterIndex = -1;
-    this._clusters = [];
-  }
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      isWide: {},
-      showHelp: {},
-      selectedDevice: {},
-      _selectedClusterIndex: {},
-      _clusters: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public isWide?: boolean;
+  @property() public showHelp = false;
+  @property() public selectedDevice?: ZHADevice;
+  @property() private _selectedClusterIndex = -1;
+  @property() private _clusters: Cluster[] = [];
 
   protected updated(changedProperties: PropertyValues): void {
     if (changedProperties.has("selectedDevice")) {
diff --git a/src/panels/config/zha/zha-network.ts b/src/panels/config/zha/zha-network.ts
index a8c5761aef..78ee69857b 100644
--- a/src/panels/config/zha/zha-network.ts
+++ b/src/panels/config/zha/zha-network.ts
@@ -10,8 +10,8 @@ import {
   CSSResult,
   html,
   LitElement,
-  PropertyDeclarations,
   TemplateResult,
+  property,
 } from "lit-element";
 
 import { navigate } from "../../../common/navigate";
@@ -19,23 +19,9 @@ import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 
 export class ZHANetwork extends LitElement {
-  public hass?: HomeAssistant;
-  public isWide?: boolean;
-  private _showHelp: boolean;
-
-  constructor() {
-    super();
-    this._showHelp = false;
-  }
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      isWide: {},
-      _showHelp: {},
-      _joinParams: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public isWide?: boolean;
+  @property() private _showHelp = false;
 
   protected render(): TemplateResult | void {
     return html`
diff --git a/src/panels/developer-tools/info/system-health-card.ts b/src/panels/developer-tools/info/system-health-card.ts
index 82b819bc32..8db1b1ae0b 100644
--- a/src/panels/developer-tools/info/system-health-card.ts
+++ b/src/panels/developer-tools/info/system-health-card.ts
@@ -3,8 +3,8 @@ import {
   html,
   CSSResult,
   css,
-  PropertyDeclarations,
   TemplateResult,
+  property,
 } from "lit-element";
 import "@polymer/paper-spinner/paper-spinner";
 import "../../../components/ha-card";
@@ -32,15 +32,8 @@ const sortKeys = (a: string, b: string) => {
 };
 
 class SystemHealthCard extends LitElement {
-  public hass?: HomeAssistant;
-  private _info?: SystemHealthInfo;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      _info: {},
-    };
-  }
+  @property() public hass?: HomeAssistant;
+  @property() private _info?: SystemHealthInfo;
 
   protected render(): TemplateResult | void {
     if (!this.hass) {
diff --git a/src/panels/developer-tools/logs/dialog-system-log-detail.ts b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
index 4853d2e79b..ed9db2e1bb 100644
--- a/src/panels/developer-tools/logs/dialog-system-log-detail.ts
+++ b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
@@ -2,9 +2,9 @@ import {
   LitElement,
   html,
   css,
-  PropertyDeclarations,
   CSSResult,
   TemplateResult,
+  property,
 } from "lit-element";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 
@@ -16,14 +16,8 @@ import { haStyleDialog } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 
 class DialogSystemLogDetail extends LitElement {
-  public hass!: HomeAssistant;
-  private _params?: SystemLogDetailDialogParams;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      _params: {},
-    };
-  }
+  @property() public hass!: HomeAssistant;
+  @property() private _params?: SystemLogDetailDialogParams;
 
   public async showDialog(params: SystemLogDetailDialogParams): Promise<void> {
     this._params = params;
diff --git a/src/panels/developer-tools/logs/error-log-card.ts b/src/panels/developer-tools/logs/error-log-card.ts
index 131466dcc7..99269b80e9 100644
--- a/src/panels/developer-tools/logs/error-log-card.ts
+++ b/src/panels/developer-tools/logs/error-log-card.ts
@@ -3,8 +3,8 @@ import {
   html,
   CSSResult,
   css,
-  PropertyDeclarations,
   TemplateResult,
+  property,
 } from "lit-element";
 import "@polymer/paper-icon-button/paper-icon-button";
 import "@material/mwc-button";
@@ -13,15 +13,8 @@ import { HomeAssistant } from "../../../types";
 import { fetchErrorLog } from "../../../data/error_log";
 
 class ErrorLogCard extends LitElement {
-  public hass!: HomeAssistant;
-  private _errorLog?: string;
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      _errorLog: {},
-    };
-  }
+  @property() public hass!: HomeAssistant;
+  @property() private _errorLog?: string;
 
   protected render(): TemplateResult | void {
     return html`
diff --git a/src/panels/developer-tools/logs/system-log-card.ts b/src/panels/developer-tools/logs/system-log-card.ts
index dd7aa87fd4..ec11cc0775 100644
--- a/src/panels/developer-tools/logs/system-log-card.ts
+++ b/src/panels/developer-tools/logs/system-log-card.ts
@@ -3,9 +3,9 @@ import {
   html,
   CSSResult,
   css,
-  PropertyDeclarations,
   TemplateResult,
   customElement,
+  property,
 } from "lit-element";
 import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-item/paper-item-body";
@@ -32,16 +32,9 @@ const formatLogTime = (date, language: string) => {
 
 @customElement("system-log-card")
 export class SystemLogCard extends LitElement {
-  public hass!: HomeAssistant;
+  @property() public hass!: HomeAssistant;
   public loaded = false;
-  private _items?: LoggedError[];
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      _items: {},
-    };
-  }
+  @property() private _items?: LoggedError[];
 
   public async fetchData(): Promise<void> {
     this._items = undefined;
diff --git a/src/panels/lovelace/views/hui-view.ts b/src/panels/lovelace/views/hui-view.ts
index 08775f8809..a9e413eb1d 100644
--- a/src/panels/lovelace/views/hui-view.ts
+++ b/src/panels/lovelace/views/hui-view.ts
@@ -2,8 +2,8 @@ import {
   html,
   LitElement,
   PropertyValues,
-  PropertyDeclarations,
   TemplateResult,
+  property,
 } from "lit-element";
 
 import "../../../components/entity/ha-state-label-badge";
@@ -48,29 +48,12 @@ const getColumnIndex = (columnEntityCount: number[], size: number) => {
 };
 
 export class HUIView extends LitElement {
-  public hass?: HomeAssistant;
-  public lovelace?: Lovelace;
-  public columns?: number;
-  public index?: number;
-  private _cards: Array<LovelaceCard | HuiErrorCard>;
-  private _badges: LovelaceBadge[];
-
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      lovelace: {},
-      columns: { type: Number },
-      index: { type: Number },
-      _cards: {},
-      _badges: {},
-    };
-  }
-
-  constructor() {
-    super();
-    this._cards = [];
-    this._badges = [];
-  }
+  @property() public hass?: HomeAssistant;
+  @property() public lovelace?: Lovelace;
+  @property({ type: Number }) public columns?: number;
+  @property({ type: Number }) public index?: number;
+  @property() private _cards: Array<LovelaceCard | HuiErrorCard> = [];
+  @property() private _badges: LovelaceBadge[] = [];
 
   // Public to make demo happy
   public createCardElement(cardConfig: LovelaceCardConfig) {

From d05dc2e4dc1c68be04afe45ac284fc56c9ae724c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Sat, 19 Oct 2019 14:06:04 +0200
Subject: [PATCH 32/70] Bring back babel (#3974)

* Bring back babel

* bump preset env

* Remove empty TS properties in mixins
---
 build-scripts/babel.js                |  14 +-
 build-scripts/webpack.js              |  35 +----
 gallery/webpack.config.js             |  54 ++-----
 hassio/webpack.config.js              |  46 ++----
 package.json                          |   5 +-
 src/mixins/lit-localize-lite-mixin.ts |   4 +-
 src/mixins/subscribe-mixin.ts         |   6 +-
 src/state/hass-base-mixin.ts          |   6 +-
 tsconfig.json                         |   1 -
 yarn.lock                             | 217 +++++++++++++++-----------
 10 files changed, 184 insertions(+), 204 deletions(-)

diff --git a/build-scripts/babel.js b/build-scripts/babel.js
index 3951116cbd..67021b92c4 100644
--- a/build-scripts/babel.js
+++ b/build-scripts/babel.js
@@ -3,7 +3,7 @@ module.exports.babelLoaderConfig = ({ latestBuild }) => {
     throw Error("latestBuild not defined for babel loader config");
   }
   return {
-    test: /\.m?js$/,
+    test: /\.m?js$|\.tsx?$/,
     use: {
       loader: "babel-loader",
       options: {
@@ -12,6 +12,12 @@ module.exports.babelLoaderConfig = ({ latestBuild }) => {
             require("@babel/preset-env").default,
             { modules: false },
           ],
+          [
+            require("@babel/preset-typescript").default,
+            {
+              jsxPragma: "h",
+            },
+          ],
         ].filter(Boolean),
         plugins: [
           // Part of ES2018. Converts {...a, b: 2} to Object.assign({}, a, {b: 2})
@@ -21,6 +27,12 @@ module.exports.babelLoaderConfig = ({ latestBuild }) => {
           ],
           // Only support the syntax, Webpack will handle it.
           "@babel/syntax-dynamic-import",
+          [
+            "@babel/transform-react-jsx",
+            {
+              pragma: "h",
+            },
+          ],
           [
             require("@babel/plugin-proposal-decorators").default,
             { decoratorsBeforeExport: true },
diff --git a/build-scripts/webpack.js b/build-scripts/webpack.js
index b7d8948f5d..fa9bfb9edd 100644
--- a/build-scripts/webpack.js
+++ b/build-scripts/webpack.js
@@ -41,20 +41,6 @@ const resolve = {
   },
 };
 
-const tsLoader = (latestBuild) => ({
-  test: /\.ts|tsx$/,
-  exclude: [path.resolve(paths.polymer_dir, "node_modules")],
-  use: [
-    {
-      loader: "ts-loader",
-      options: {
-        compilerOptions: latestBuild
-          ? { noEmit: false }
-          : { target: "es5", noEmit: false },
-      },
-    },
-  ],
-});
 const cssLoader = {
   test: /\.css$/,
   use: "raw-loader",
@@ -127,17 +113,12 @@ const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
     "hass-icons": "./src/entrypoints/hass-icons.ts",
   };
 
-  const rules = [tsLoader(latestBuild), cssLoader, htmlLoader];
-  if (!latestBuild) {
-    rules.push(babelLoaderConfig({ latestBuild }));
-  }
-
   return {
     mode: genMode(isProdBuild),
     devtool: genDevTool(isProdBuild),
     entry,
     module: {
-      rules,
+      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
     },
     optimization: optimization(latestBuild),
     plugins: [
@@ -197,11 +178,6 @@ const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
 };
 
 const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  const rules = [tsLoader(latestBuild), cssLoader, htmlLoader];
-  if (!latestBuild) {
-    rules.push(babelLoaderConfig({ latestBuild }));
-  }
-
   return {
     mode: genMode(isProdBuild),
     devtool: genDevTool(isProdBuild),
@@ -210,7 +186,7 @@ const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
       compatibility: "./src/entrypoints/compatibility.ts",
     },
     module: {
-      rules,
+      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
     },
     optimization: optimization(latestBuild),
     plugins: [
@@ -252,17 +228,12 @@ const createCastConfig = ({ isProdBuild, latestBuild }) => {
     entry.receiver = "./cast/src/receiver/entrypoint.ts";
   }
 
-  const rules = [tsLoader(latestBuild), cssLoader, htmlLoader];
-  if (!latestBuild) {
-    rules.push(babelLoaderConfig({ latestBuild }));
-  }
-
   return {
     mode: genMode(isProdBuild),
     devtool: genDevTool(isProdBuild),
     entry,
     module: {
-      rules,
+      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
     },
     optimization: optimization(latestBuild),
     plugins: [
diff --git a/gallery/webpack.config.js b/gallery/webpack.config.js
index 0c3e364379..dc03993c98 100644
--- a/gallery/webpack.config.js
+++ b/gallery/webpack.config.js
@@ -9,43 +9,6 @@ const buildPath = path.resolve(__dirname, "dist");
 const publicPath = isProd ? "./" : "http://localhost:8080/";
 const latestBuild = true;
 
-const rules = [
-  {
-    exclude: [path.resolve(__dirname, "../node_modules")],
-    test: /\.ts$/,
-    use: [
-      {
-        loader: "ts-loader",
-        options: {
-          compilerOptions: latestBuild
-            ? { noEmit: false }
-            : {
-                target: "es5",
-                noEmit: false,
-              },
-        },
-      },
-    ],
-  },
-  {
-    test: /\.css$/,
-    use: "raw-loader",
-  },
-  {
-    test: /\.(html)$/,
-    use: {
-      loader: "html-loader",
-      options: {
-        exportAsEs6Default: true,
-      },
-    },
-  },
-];
-
-if (!latestBuild) {
-  rules.push(babelLoaderConfig({ latestBuild }));
-}
-
 module.exports = {
   mode: isProd ? "production" : "development",
   // Disabled in prod while we make Home Assistant able to serve the right files.
@@ -53,7 +16,22 @@ module.exports = {
   devtool: isProd ? "none" : "inline-source-map",
   entry: "./src/entrypoint.js",
   module: {
-    rules,
+    rules: [
+      babelLoaderConfig({ latestBuild }),
+      {
+        test: /\.css$/,
+        use: "raw-loader",
+      },
+      {
+        test: /\.(html)$/,
+        use: {
+          loader: "html-loader",
+          options: {
+            exportAsEs6Default: true,
+          },
+        },
+      },
+    ],
   },
   optimization: webpackBase.optimization(latestBuild),
   plugins: [
diff --git a/hassio/webpack.config.js b/hassio/webpack.config.js
index cdbd23911e..630778c69e 100644
--- a/hassio/webpack.config.js
+++ b/hassio/webpack.config.js
@@ -11,39 +11,6 @@ const isCI = process.env.CI === "true";
 const chunkFilename = isProdBuild ? "chunk.[chunkhash].js" : "[name].chunk.js";
 const latestBuild = false;
 
-const rules = [
-  {
-    exclude: [config.nodeDir],
-    test: /\.ts$/,
-    use: [
-      {
-        loader: "ts-loader",
-        options: {
-          compilerOptions: latestBuild
-            ? { noEmit: false }
-            : {
-                target: "es5",
-                noEmit: false,
-              },
-        },
-      },
-    ],
-  },
-  {
-    test: /\.(html)$/,
-    use: {
-      loader: "html-loader",
-      options: {
-        exportAsEs6Default: true,
-      },
-    },
-  },
-];
-
-if (!latestBuild) {
-  rules.push(babelLoaderConfig({ latestBuild }));
-}
-
 module.exports = {
   mode: isProdBuild ? "production" : "development",
   devtool: isProdBuild ? "source-map" : "inline-source-map",
@@ -51,7 +18,18 @@ module.exports = {
     entrypoint: "./src/entrypoint.js",
   },
   module: {
-    rules,
+    rules: [
+      babelLoaderConfig({ latestBuild }),
+      {
+        test: /\.(html)$/,
+        use: {
+          loader: "html-loader",
+          options: {
+            exportAsEs6Default: true,
+          },
+        },
+      },
+    ],
   },
   optimization: webpackBase.optimization(latestBuild),
   plugins: [
diff --git a/package.json b/package.json
index 64bc94cb62..b4705eebd9 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,9 @@
     "@babel/plugin-proposal-decorators": "^7.4.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.4.0",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "^7.4.0",
+    "@babel/plugin-transform-react-jsx": "^7.3.0",
+    "@babel/preset-env": "^7.4.2",
+    "@babel/preset-typescript": "^7.4.0",
     "@gfx/zopfli": "^1.0.11",
     "@types/chai": "^4.1.7",
     "@types/chromecast-caf-receiver": "^3.0.12",
@@ -158,7 +160,6 @@
     "require-dir": "^1.2.0",
     "sinon": "^7.3.1",
     "terser-webpack-plugin": "^1.2.3",
-    "ts-loader": "^6.1.1",
     "ts-mocha": "^6.0.0",
     "tslint": "^5.14.0",
     "tslint-config-prettier": "^1.18.0",
diff --git a/src/mixins/lit-localize-lite-mixin.ts b/src/mixins/lit-localize-lite-mixin.ts
index afc30c074a..59a90f5364 100644
--- a/src/mixins/lit-localize-lite-mixin.ts
+++ b/src/mixins/lit-localize-lite-mixin.ts
@@ -22,8 +22,8 @@ export const litLocalizeLiteMixin = <T extends LitElement>(
 ): Constructor<T & LitLocalizeLiteMixin> =>
   // @ts-ignore
   class extends localizeLiteBaseMixin(superClass) {
-    public localize: LocalizeFunc;
-
+    // Decorators not possible in anonymous classes
+    // And also, we cannot declare the variable without overriding the Lit setter.
     static get properties(): PropertyDeclarations {
       return {
         localize: {},
diff --git a/src/mixins/subscribe-mixin.ts b/src/mixins/subscribe-mixin.ts
index 63e9f1436b..95b31e5eeb 100644
--- a/src/mixins/subscribe-mixin.ts
+++ b/src/mixins/subscribe-mixin.ts
@@ -5,7 +5,6 @@ import {
   PropertyDeclarations,
 } from "lit-element";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
-import { HomeAssistant } from "../types";
 
 export interface HassSubscribeElement {
   hassSubscribe(): UnsubscribeFunc[];
@@ -17,10 +16,11 @@ export const SubscribeMixin = <T extends LitElement>(
 ): Constructor<T & HassSubscribeElement> =>
   // @ts-ignore
   class extends superClass {
-    private hass?: HomeAssistant;
     /* tslint:disable-next-line */
     private __unsubs?: UnsubscribeFunc[];
 
+    // Decorators not possible in anonymous classes
+    // And also, we cannot declare the variable without overriding the Lit setter.
     static get properties(): PropertyDeclarations {
       return {
         hass: {},
@@ -50,7 +50,6 @@ export const SubscribeMixin = <T extends LitElement>(
     }
 
     protected hassSubscribe(): UnsubscribeFunc[] {
-      super.hassSubscribe();
       return [];
     }
 
@@ -58,6 +57,7 @@ export const SubscribeMixin = <T extends LitElement>(
       if (
         this.__unsubs !== undefined ||
         !((this as unknown) as Element).isConnected ||
+        // @ts-ignore
         this.hass === undefined
       ) {
         return;
diff --git a/src/state/hass-base-mixin.ts b/src/state/hass-base-mixin.ts
index df5d9e7352..e93d4d2fe4 100644
--- a/src/state/hass-base-mixin.ts
+++ b/src/state/hass-base-mixin.ts
@@ -29,14 +29,13 @@ export default <T>(superClass: Constructor<T>): Constructor<T & HassBaseEl> =>
     private __provideHass: HTMLElement[] = [];
 
     // Decorators not possible in anonymous classes
+    // And also, we cannot declare the variable without overriding the Lit setter.
     static get properties(): PropertyDeclarations {
       return {
         hass: {},
       };
     }
 
-    protected hass!: HomeAssistant;
-
     // Exists so all methods can safely call super method
     protected hassConnected() {
       // tslint:disable-next-line
@@ -62,14 +61,17 @@ export default <T>(superClass: Constructor<T>): Constructor<T & HassBaseEl> =>
 
     public provideHass(el) {
       this.__provideHass.push(el);
+      // @ts-ignore
       el.hass = this.hass;
     }
 
     protected async _updateHass(obj: Partial<HomeAssistant>) {
+      // @ts-ignore
       if (!this.hass) {
         this._pendingHass = { ...this._pendingHass, ...obj };
         return;
       }
+      // @ts-ignore
       this.hass = { ...this.hass, ...obj };
     }
   };
diff --git a/tsconfig.json b/tsconfig.json
index 6e9415d1ab..7ca6093963 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,6 @@
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
     "strict": true,
-    "sourceMap": true,
     "noImplicitAny": false,
     "skipLibCheck": true,
     "resolveJsonModule": true,
diff --git a/yarn.lock b/yarn.lock
index 87f4d1b083..520feae282 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -73,6 +73,14 @@
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-builder-react-jsx@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"
+  integrity sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+    esutils "^2.0.0"
+
 "@babel/helper-call-delegate@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
@@ -297,7 +305,7 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.4.0", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
+"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.4.0":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58"
   integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==
@@ -305,6 +313,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
+"@babel/plugin-proposal-object-rest-spread@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
+  integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
@@ -313,14 +329,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
-  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
+"@babel/plugin-proposal-unicode-property-regex@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802"
+  integrity sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    regexpu-core "^4.6.0"
 
 "@babel/plugin-syntax-async-generators@^7.0.0", "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
@@ -357,6 +373,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-jsx@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
+  integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
@@ -371,6 +394,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-typescript@^7.2.0":
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz#a7cc3f66119a9f7ebe2de5383cce193473d65991"
+  integrity sha512-dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
@@ -394,7 +424,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.6.0":
+"@babel/plugin-transform-block-scoping@^7.0.0":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz#c49e21228c4bbd4068a35667e6d951c75439b1dc"
   integrity sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA==
@@ -402,6 +432,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
 
+"@babel/plugin-transform-block-scoping@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
+  integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    lodash "^4.17.13"
+
 "@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9"
@@ -430,14 +468,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
-  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
+"@babel/plugin-transform-dotall-regex@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9"
+  integrity sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    regexpu-core "^4.6.0"
 
 "@babel/plugin-transform-duplicate-keys@^7.0.0", "@babel/plugin-transform-duplicate-keys@^7.5.0":
   version "7.5.0"
@@ -526,12 +564,12 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz#1e6e663097813bb4f53d42df0750cf28ad3bb3f1"
-  integrity sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf"
+  integrity sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==
   dependencies:
-    regexp-tree "^0.1.13"
+    regexpu-core "^4.6.0"
 
 "@babel/plugin-transform-new-target@^7.4.4":
   version "7.4.4"
@@ -564,6 +602,15 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-react-jsx@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290"
+  integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==
+  dependencies:
+    "@babel/helper-builder-react-jsx" "^7.3.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
+
 "@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.4.5":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
@@ -585,13 +632,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.2.0":
+"@babel/plugin-transform-spread@^7.0.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
   integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-spread@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"
+  integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-sticky-regex@^7.0.0", "@babel/plugin-transform-sticky-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
@@ -615,7 +669,16 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0", "@babel/plugin-transform-unicode-regex@^7.4.4":
+"@babel/plugin-transform-typescript@^7.6.0":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz#dddb50cf3b8b2ef70b22e5326e9a91f05a1db13b"
+  integrity sha512-aiWINBrPMSC3xTXRNM/dfmyYuPNKY/aexYqBgh0HBI5Y+WO5oRAqW/oROYeYHrF4Zw12r9rK4fMk/ZlAmqx/FQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.6.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-unicode-regex@^7.0.0":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
   integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
@@ -624,19 +687,28 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
-"@babel/preset-env@^7.4.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz#aae4141c506100bb2bfaa4ac2a5c12b395619e50"
-  integrity sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg==
+"@babel/plugin-transform-unicode-regex@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698"
+  integrity sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.6.0"
+
+"@babel/preset-env@^7.4.2":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
+  integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-dynamic-import" "^7.5.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.5.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.6.2"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
@@ -645,11 +717,11 @@
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
     "@babel/plugin-transform-async-to-generator" "^7.5.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.6.0"
+    "@babel/plugin-transform-block-scoping" "^7.6.3"
     "@babel/plugin-transform-classes" "^7.5.5"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
     "@babel/plugin-transform-destructuring" "^7.6.0"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.6.2"
     "@babel/plugin-transform-duplicate-keys" "^7.5.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
     "@babel/plugin-transform-for-of" "^7.4.4"
@@ -660,7 +732,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.6.0"
     "@babel/plugin-transform-modules-systemjs" "^7.5.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.3"
     "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.5.5"
     "@babel/plugin-transform-parameters" "^7.4.4"
@@ -668,18 +740,26 @@
     "@babel/plugin-transform-regenerator" "^7.4.5"
     "@babel/plugin-transform-reserved-words" "^7.2.0"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.2.0"
+    "@babel/plugin-transform-spread" "^7.6.2"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
     "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.4.4"
-    "@babel/types" "^7.6.0"
+    "@babel/plugin-transform-unicode-regex" "^7.6.2"
+    "@babel/types" "^7.6.3"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
+"@babel/preset-typescript@^7.4.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz#25768cb8830280baf47c45ab1a519a9977498c98"
+  integrity sha512-4xKw3tTcCm0qApyT6PqM9qniseCE79xGHiUnNdKGdxNsGUc2X7WwZybqIpnTmoukg3nhPceI5KPNzNqLNeIJww==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-typescript" "^7.6.0"
+
 "@babel/runtime@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
@@ -727,6 +807,15 @@
     lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.3.0", "@babel/types@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
+  integrity sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
   version "7.6.1"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
@@ -3414,13 +3503,6 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -5166,7 +5248,7 @@ engine.io@~3.3.1:
     engine.io-parser "~2.1.0"
     ws "~6.1.0"
 
-enhanced-resolve@4.1.0, enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
@@ -5527,6 +5609,11 @@ esutils@^1.1.6:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
   integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
 
+esutils@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -5885,13 +5972,6 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
@@ -7480,11 +7560,6 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -8734,14 +8809,6 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -9898,11 +9965,6 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.5:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
-  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
-
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -10748,17 +10810,12 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp-tree@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz#5b19ab9377edc68bc3679256840bb29afc158d7f"
-  integrity sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw==
-
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
-regexpu-core@^4.5.4:
+regexpu-core@^4.5.4, regexpu-core@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
   integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
@@ -11173,7 +11230,7 @@ semver-greatest-satisfied-range@^1.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
+semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -12338,13 +12395,6 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -12414,17 +12464,6 @@ triple-beam@^1.2.0, triple-beam@^1.3.0:
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
-ts-loader@^6.1.1:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.1.2.tgz#ff6bc767334970226438949fbde2e211147a1325"
-  integrity sha512-dudxFKm0Ellrg/gLNlu+97/UgwvoMK0SdUVImPUSzq3IcRUVtShylZvcMX+CgvCQL1BEKb913NL0gAP1GA/OFw==
-  dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^4.0.0"
-    semver "^6.0.0"
-
 ts-mocha@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/ts-mocha/-/ts-mocha-6.0.0.tgz#40b8c5462ffce6f5dcee5ff729655b2958f26e50"

From e3ed0cf436232623628fd19ff15cff0a24d4815e Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Sat, 19 Oct 2019 05:18:59 -0700
Subject: [PATCH 33/70] Hide save on card configuration if no card is picked
 (#4062)

---
 .../card-editor/hui-dialog-edit-card.ts       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts

diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
old mode 100644
new mode 100755
index 68fdda58ae..ab23793448
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
@@ -117,16 +117,20 @@ export class HuiDialogEditCard extends LitElement {
           <mwc-button @click="${this._close}">
             ${this.hass!.localize("ui.common.cancel")}
           </mwc-button>
-          <mwc-button
-            ?disabled="${!this._canSave || this._saving}"
-            @click="${this._save}"
-          >
-            ${this._saving
-              ? html`
-                  <paper-spinner active alt="Saving"></paper-spinner>
-                `
-              : this.hass!.localize("ui.common.save")}
-          </mwc-button>
+          ${this._cardConfig !== undefined
+            ? html`
+                <mwc-button
+                  ?disabled="${!this._canSave || this._saving}"
+                  @click="${this._save}"
+                >
+                  ${this._saving
+                    ? html`
+                        <paper-spinner active alt="Saving"></paper-spinner>
+                      `
+                    : this.hass!.localize("ui.common.save")}
+                </mwc-button>
+              `
+            : ``}
         </div>
       </ha-paper-dialog>
     `;

From 0a7772865220139113e39c74dd1415a02b46e32a Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Sat, 19 Oct 2019 05:24:28 -0700
Subject: [PATCH 34/70] Move Home Assistant and version on info page into h2
 (#4061)

---
 .../info/developer-tools-info.ts              | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 src/panels/developer-tools/info/developer-tools-info.ts

diff --git a/src/panels/developer-tools/info/developer-tools-info.ts b/src/panels/developer-tools/info/developer-tools-info.ts
old mode 100644
new mode 100755
index 03328ee90c..dbeef30367
--- a/src/panels/developer-tools/info/developer-tools-info.ts
+++ b/src/panels/developer-tools/info/developer-tools-info.ts
@@ -48,8 +48,7 @@ class HaPanelDevInfo extends LitElement {
               alt="Home Assistant logo"
           /></a>
           <br />
-          Home Assistant<br />
-          ${hass.config.version}
+          <h2>Home Assistant ${hass.config.version}</h2>
         </p>
         <p>
           Path to configuration.yaml: ${hass.config.config_dir}
@@ -92,21 +91,23 @@ class HaPanelDevInfo extends LitElement {
         </p>
         <p>
           Frontend version: ${JS_VERSION} - ${JS_TYPE}
-          ${customUiList.length > 0
-            ? html`
-                <div>
-                  Custom UIs:
-                  ${customUiList.map(
-                    (item) => html`
-                      <div>
-                        <a href="${item.url}" target="_blank"> ${item.name}</a>:
-                        ${item.version}
-                      </div>
-                    `
-                  )}
-                </div>
-              `
-            : ""}
+          ${
+            customUiList.length > 0
+              ? html`
+                  <div>
+                    Custom UIs:
+                    ${customUiList.map(
+                      (item) => html`
+                        <div>
+                          <a href="${item.url}" target="_blank"> ${item.name}</a
+                          >: ${item.version}
+                        </div>
+                      `
+                    )}
+                  </div>
+                `
+              : ""
+          }
         </p>
         <p>
           <a href="${nonDefaultLink}">${nonDefaultLinkText}</a><br />

From fbee4937a0ed8a7d6f6eb9839a38ee4b12962f0a Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Sat, 19 Oct 2019 07:25:14 -0500
Subject: [PATCH 35/70] add icon option to entities card name (#4024)

* add icon option to entities card name

* account for only icon

* address comments
---
 .../lovelace/cards/hui-entities-card.ts       | 23 +++++++++++++++----
 src/panels/lovelace/cards/types.ts            |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 15f5762029..cc680c8d60 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -82,16 +82,27 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
     if (!this._config || !this._hass) {
       return html``;
     }
-    const { show_header_toggle, title } = this._config;
 
     return html`
       <ha-card>
-        ${!title && !show_header_toggle
+        ${!this._config.title &&
+        !this._config.show_header_toggle &&
+        !this._config.icon
           ? html``
           : html`
               <div class="card-header">
-                <div class="name">${title}</div>
-                ${show_header_toggle === false
+                <div class="name">
+                  ${this._config.icon
+                    ? html`
+                        <ha-icon
+                          class="icon"
+                          .icon="${this._config.icon}"
+                        ></ha-icon>
+                      `
+                    : ""}
+                  ${this._config.title}
+                </div>
+                ${this._config.show_header_toggle === false
                   ? html``
                   : html`
                       <hui-entities-toggle
@@ -140,6 +151,10 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
       .state-card-dialog {
         cursor: pointer;
       }
+
+      .icon {
+        padding: 0px 18px 0px 8px;
+      }
     `;
   }
 
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index 6ec2085d82..dcdff54c76 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -35,6 +35,7 @@ export interface EntitiesCardConfig extends LovelaceCardConfig {
   title?: string;
   entities: EntitiesCardEntityConfig[];
   theme?: string;
+  icon?: string;
 }
 
 export interface EntityButtonCardConfig extends LovelaceCardConfig {

From bbc3e7d93f82542b900a1109e9b2624b1ffaa9cc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 19 Oct 2019 08:18:56 -0700
Subject: [PATCH 36/70] Make updateHass not async (#4060)

---
 src/state/hass-base-mixin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/state/hass-base-mixin.ts b/src/state/hass-base-mixin.ts
index e93d4d2fe4..81c4e06899 100644
--- a/src/state/hass-base-mixin.ts
+++ b/src/state/hass-base-mixin.ts
@@ -65,7 +65,7 @@ export default <T>(superClass: Constructor<T>): Constructor<T & HassBaseEl> =>
       el.hass = this.hass;
     }
 
-    protected async _updateHass(obj: Partial<HomeAssistant>) {
+    protected _updateHass(obj: Partial<HomeAssistant>) {
       // @ts-ignore
       if (!this.hass) {
         this._pendingHass = { ...this._pendingHass, ...obj };

From 603240c467ee308f0d71b868080c02e8990ce4d6 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Sat, 19 Oct 2019 17:59:57 +0200
Subject: [PATCH 37/70] Translated developer tools info page (#4054)

* Translated developer tools info page

* Added set or remove as a variable in translation of key default_ui
---
 .../info/developer-tools-info.ts              | 62 ++++++++++++++-----
 .../info/system-health-card.ts                |  9 +--
 src/translations/en.json                      | 19 +++++-
 3 files changed, 69 insertions(+), 21 deletions(-)
 mode change 100755 => 100644 src/panels/developer-tools/info/developer-tools-info.ts

diff --git a/src/panels/developer-tools/info/developer-tools-info.ts b/src/panels/developer-tools/info/developer-tools-info.ts
old mode 100755
new mode 100644
index dbeef30367..9e86c9df61
--- a/src/panels/developer-tools/info/developer-tools-info.ts
+++ b/src/panels/developer-tools/info/developer-tools-info.ts
@@ -31,12 +31,18 @@ class HaPanelDevInfo extends LitElement {
 
     const nonDefaultLinkText =
       localStorage.defaultPage === OPT_IN_PANEL && OPT_IN_PANEL === "states"
-        ? "Go to the Lovelace UI"
-        : "Go to the states UI";
+        ? this.hass.localize("ui.panel.developer-tools.tabs.info.lovelace_ui")
+        : this.hass.localize("ui.panel.developer-tools.tabs.info.states_ui");
 
-    const defaultPageText = `${
-      localStorage.defaultPage === OPT_IN_PANEL ? "Remove" : "Set"
-    } ${OPT_IN_PANEL} as default page on this device`;
+    const defaultPageText = `${this.hass.localize(
+      "ui.panel.developer-tools.tabs.info.default_ui",
+      "action",
+      localStorage.defaultPage === OPT_IN_PANEL
+        ? this.hass.localize("ui.panel.developer-tools.tabs.info.remove")
+        : this.hass.localize("ui.panel.developer-tools.tabs.info.set"),
+      "name",
+      OPT_IN_PANEL
+    )}`;
 
     return html`
       <div class="about">
@@ -45,42 +51,58 @@ class HaPanelDevInfo extends LitElement {
             ><img
               src="/static/icons/favicon-192x192.png"
               height="192"
-              alt="Home Assistant logo"
+              alt="${this.hass.localize(
+                "ui.panel.developer-tools.tabs.info.home_assistant_logo"
+              )}"
           /></a>
           <br />
           <h2>Home Assistant ${hass.config.version}</h2>
         </p>
         <p>
-          Path to configuration.yaml: ${hass.config.config_dir}
+          ${this.hass.localize(
+            "ui.panel.developer-tools.tabs.info.path_configuration",
+            "path",
+            hass.config.config_dir
+          )}
         </p>
         <p class="develop">
           <a
             href="https://www.home-assistant.io/developers/credits/"
             target="_blank"
           >
-            Developed by a bunch of awesome people.
+            ${this.hass.localize(
+              "ui.panel.developer-tools.tabs.info.developed_by"
+            )}
           </a>
         </p>
         <p>
-          Published under the Apache 2.0 license<br />
-          Source:
+          ${this.hass.localize(
+            "ui.panel.developer-tools.tabs.info.license"
+          )}<br />
+          ${this.hass.localize("ui.panel.developer-tools.tabs.info.source")}
           <a
             href="https://github.com/home-assistant/home-assistant"
             target="_blank"
-            >server</a
+            >${this.hass.localize(
+              "ui.panel.developer-tools.tabs.info.server"
+            )}</a
           >
           &mdash;
           <a
             href="https://github.com/home-assistant/home-assistant-polymer"
             target="_blank"
-            >frontend-ui</a
+            >${this.hass.localize(
+              "ui.panel.developer-tools.tabs.info.frontend"
+            )}</a
           >
         </p>
         <p>
-          Built using
+          ${this.hass.localize(
+            "ui.panel.developer-tools.tabs.info.built_using"
+          )}
           <a href="https://www.python.org">Python 3</a>,
           <a href="https://www.polymer-project.org" target="_blank">Polymer</a>,
-          Icons by
+          ${this.hass.localize("ui.panel.developer-tools.tabs.info.icons_by")}
           <a href="https://www.google.com/design/icons/" target="_blank"
             >Google</a
           >
@@ -90,12 +112,20 @@ class HaPanelDevInfo extends LitElement {
           >.
         </p>
         <p>
-          Frontend version: ${JS_VERSION} - ${JS_TYPE}
+          ${this.hass.localize(
+            "ui.panel.developer-tools.tabs.info.frontend_version",
+            "version",
+            JS_VERSION,
+            "type",
+            JS_TYPE
+          )}
           ${
             customUiList.length > 0
               ? html`
                   <div>
-                    Custom UIs:
+                    ${this.hass.localize(
+                      "ui.panel.developer-tools.tabs.info.custom_uis"
+                    )}
                     ${customUiList.map(
                       (item) => html`
                         <div>
diff --git a/src/panels/developer-tools/info/system-health-card.ts b/src/panels/developer-tools/info/system-health-card.ts
index 8db1b1ae0b..b0acaa3b1a 100644
--- a/src/panels/developer-tools/info/system-health-card.ts
+++ b/src/panels/developer-tools/info/system-health-card.ts
@@ -32,7 +32,7 @@ const sortKeys = (a: string, b: string) => {
 };
 
 class SystemHealthCard extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property() public hass!: HomeAssistant;
   @property() private _info?: SystemHealthInfo;
 
   protected render(): TemplateResult | void {
@@ -78,7 +78,7 @@ class SystemHealthCard extends LitElement {
     }
 
     return html`
-      <ha-card header="System Health">
+      <ha-card header="${this.hass.localize("domain.system_health")}">
         <div class="card-content">${sections}</div>
       </ha-card>
     `;
@@ -98,8 +98,9 @@ class SystemHealthCard extends LitElement {
     } catch (err) {
       this._info = {
         system_health: {
-          error:
-            "System Health component is not loaded. Add 'system_health:' to configuration.yaml",
+          error: this.hass.localize(
+            "ui.panel.developer-tools.tabs.info.system_health_error"
+          ),
         },
       };
     }
diff --git a/src/translations/en.json b/src/translations/en.json
index 3964da212a..7f77a2cdaf 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1793,7 +1793,24 @@
       "developer-tools": {
         "tabs": {
           "info": {
-            "title": "Info"
+            "title": "Info",
+            "remove": "Remove",
+            "set": "Set",
+            "default_ui": "{action} {name} as default page on this device",
+            "lovelace_ui": "Go to the Lovelace UI",
+            "states_ui": "Go to the states UI",
+            "home_assistant_logo": "Home Assistant logo",
+            "path_configuration": "Path to configuration.yaml: {path}",
+            "developed_by": "Developed by a bunch of awesome people.",
+            "license": "Published under the Apache 2.0 license",
+            "source": "Source:",
+            "server": "server",
+            "frontend": "frontend-ui",
+            "built_using": "Built using",
+            "icons_by": "Icons by",
+            "frontend_version": "Frontend version: {version} - {type}",
+            "custom_uis": "Custom UIs:",
+            "system_health_error": "System Health component is not loaded. Add 'system_health:' to configuration.yaml"
           },
           "logs": {
             "title": "Logs",

From 4dbf5327bdb0785eeaf48d1f5d89a06a465c853c Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Sat, 19 Oct 2019 09:03:22 -0700
Subject: [PATCH 38/70] Update snapshot actions to be a list (#4045)

* Update snapshot actions to be a list

* Update text of delete button to warning color
---
 .../snapshot/dialog-hassio-snapshot.ts        | 66 ++++++++++++-------
 1 file changed, 42 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts

diff --git a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts b/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts
old mode 100644
new mode 100755
index 3d1cc54cdd..f0ae53eac4
--- a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts
+++ b/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts
@@ -3,6 +3,7 @@ import "@material/mwc-button";
 import "@polymer/paper-checkbox/paper-checkbox";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import "@polymer/paper-icon-button/paper-icon-button";
+import "@polymer/iron-icon/iron-icon";
 import "@polymer/paper-input/paper-input";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
@@ -94,13 +95,23 @@ class HassioSnapshotDialog extends PolymerElement {
         .details {
           color: var(--secondary-text-color);
         }
-        .download {
-          color: var(--primary-color);
-        }
         .warning,
         .error {
           color: var(--google-red-500);
         }
+        .buttons {
+          display: flex;
+          flex-direction: column;
+        }
+        .buttons li {
+          list-style-type: none;
+        }
+        .buttons .icon {
+          margin-right: 16px;
+        }
+        .no-margin-top {
+          margin-top: 0;
+        }
       </style>
       <ha-paper-dialog
         id="dialog"
@@ -132,7 +143,7 @@ class HassioSnapshotDialog extends PolymerElement {
         </template>
         <template is="dom-if" if="[[_addons.length]]">
           <div>Add-ons:</div>
-          <paper-dialog-scrollable>
+          <paper-dialog-scrollable class="no-margin-top">
             <template is="dom-repeat" items="[[_addons]]" sort="_sortAddons">
               <paper-checkbox checked="{{item.checked}}">
                 [[item.name]] <span class="details">([[item.version]])</span>
@@ -151,28 +162,35 @@ class HassioSnapshotDialog extends PolymerElement {
         <template is="dom-if" if="[[error]]">
           <p class="error">Error: [[error]]</p>
         </template>
-        <div class="buttons">
-          <paper-icon-button
-            icon="hassio:delete"
-            on-click="_deleteClicked"
-            class="warning"
-            title="Delete snapshot"
-          ></paper-icon-button>
-          <paper-icon-button
-            on-click="_downloadClicked"
-            icon="hassio:download"
-            class="download"
-            title="Download snapshot"
-          ></paper-icon-button>
-          <mwc-button on-click="_partialRestoreClicked"
-            >Restore selected</mwc-button
-          >
+        <div>Actions:</div>
+        <ul class="buttons">
+          <li>
+            <mwc-button on-click="_downloadClicked">
+              <iron-icon icon="hassio:download" class="icon"></iron-icon>
+              Download Snapshot
+            </mwc-button>
+          </li>
+          <li>
+            <mwc-button on-click="_partialRestoreClicked">
+              <iron-icon icon="hassio:history" class="icon"> </iron-icon>
+              Restore Selected
+            </mwc-button>
+          </li>
           <template is="dom-if" if="[[_isFullSnapshot(snapshot.type)]]">
-            <mwc-button on-click="_fullRestoreClicked"
-              >Wipe &amp; restore</mwc-button
-            >
+            <li>
+              <mwc-button on-click="_fullRestoreClicked">
+                <iron-icon icon="hassio:history" class="icon"> </iron-icon>
+                Wipe &amp; restore
+              </mwc-button>
+            </li>
           </template>
-        </div>
+          <li>
+            <mwc-button on-click="_deleteClicked">
+              <iron-icon icon="hassio:delete" class="icon warning"> </iron-icon>
+              <span class="warning">Delete Snapshot</span>
+            </mwc-button>
+          </li>
+        </ul>
       </ha-paper-dialog>
     `;
   }

From 785453aa795429ef2c2562a9ece8b1b3f6f7d20c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 20 Oct 2019 05:31:58 -0700
Subject: [PATCH 39/70] Clean up mixins (#4076)

* Clean up mixins

* Lint
---
 src/components/ha-checkbox.ts                 |   3 +-
 src/components/ha-fab.ts                      |   8 +-
 src/components/ha-icon.ts                     |   3 +-
 src/components/ha-paper-dropdown-menu.ts      |   2 +-
 .../ha-paper-icon-button-arrow-next.ts        |   2 +-
 .../ha-paper-icon-button-arrow-prev.ts        |   2 +-
 src/components/ha-paper-icon-button-next.ts   |   2 +-
 src/components/ha-paper-icon-button-prev.ts   |   2 +-
 src/components/ha-switch.ts                   |   3 +-
 src/mixins/lit-localize-lite-mixin.ts         |  89 +++++++------
 src/mixins/localize-lite-base-mixin.ts        |  51 --------
 src/mixins/localize-lite-mixin.ts             |  51 --------
 src/mixins/provide-hass-lit-mixin.ts          |  10 +-
 src/mixins/subscribe-mixin.ts                 |  32 ++---
 src/state/auth-mixin.ts                       |   4 +-
 src/state/connection-mixin.ts                 |  10 +-
 src/state/dialog-manager-mixin.ts             |   6 +-
 src/state/disconnect-toast-mixin.ts           |   4 +-
 src/state/haptic-mixin.ts                     |   6 +-
 src/state/hass-base-mixin.ts                  | 120 +++++++-----------
 src/state/hass-element.ts                     |   8 +-
 src/state/more-info-mixin.ts                  |   5 +-
 src/state/notification-mixin.ts               |   6 +-
 src/state/sidebar-mixin.ts                    |   5 +-
 src/state/themes-mixin.ts                     |   4 +-
 src/state/translations-mixin.ts               |   5 +-
 src/state/url-sync-mixin.ts                   |   6 +-
 src/state/zha-dialog-mixin.ts                 |   5 +-
 src/types.ts                                  |   2 +
 29 files changed, 165 insertions(+), 291 deletions(-)
 delete mode 100644 src/mixins/localize-lite-base-mixin.ts
 delete mode 100644 src/mixins/localize-lite-mixin.ts

diff --git a/src/components/ha-checkbox.ts b/src/components/ha-checkbox.ts
index c4ef540352..232d663b13 100644
--- a/src/components/ha-checkbox.ts
+++ b/src/components/ha-checkbox.ts
@@ -1,8 +1,9 @@
-import { Constructor, customElement, CSSResult, css } from "lit-element";
+import { customElement, CSSResult, css } from "lit-element";
 import "@material/mwc-checkbox";
 // tslint:disable-next-line
 import { Checkbox } from "@material/mwc-checkbox";
 import { style } from "@material/mwc-checkbox/mwc-checkbox-css";
+import { Constructor } from "../types";
 // tslint:disable-next-line
 const MwcCheckbox = customElements.get("mwc-checkbox") as Constructor<Checkbox>;
 
diff --git a/src/components/ha-fab.ts b/src/components/ha-fab.ts
index f7ffee55fe..2003ac0c41 100644
--- a/src/components/ha-fab.ts
+++ b/src/components/ha-fab.ts
@@ -1,12 +1,8 @@
-import {
-  classMap,
-  html,
-  customElement,
-  Constructor,
-} from "@material/mwc-base/base-element";
+import { classMap, html, customElement } from "@material/mwc-base/base-element";
 import { ripple } from "@material/mwc-ripple/ripple-directive.js";
 
 import "@material/mwc-fab";
+import { Constructor } from "../types";
 // tslint:disable-next-line
 import { Fab } from "@material/mwc-fab";
 // tslint:disable-next-line
diff --git a/src/components/ha-icon.ts b/src/components/ha-icon.ts
index 2e2a6ba848..5d71f214ed 100644
--- a/src/components/ha-icon.ts
+++ b/src/components/ha-icon.ts
@@ -1,4 +1,5 @@
-import { Constructor } from "lit-element";
+import { Constructor } from "../types";
+
 import "@polymer/iron-icon/iron-icon";
 // Not duplicate, this is for typing.
 // tslint:disable-next-line
diff --git a/src/components/ha-paper-dropdown-menu.ts b/src/components/ha-paper-dropdown-menu.ts
index bed3e0ea10..72f2f6b15c 100644
--- a/src/components/ha-paper-dropdown-menu.ts
+++ b/src/components/ha-paper-dropdown-menu.ts
@@ -1,6 +1,6 @@
 import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import { Constructor } from "lit-element";
 import { PolymerElement } from "@polymer/polymer";
+import { Constructor } from "../types";
 
 const paperDropdownClass = customElements.get(
   "paper-dropdown-menu"
diff --git a/src/components/ha-paper-icon-button-arrow-next.ts b/src/components/ha-paper-icon-button-arrow-next.ts
index 6bf526ec2e..f0d4730385 100644
--- a/src/components/ha-paper-icon-button-arrow-next.ts
+++ b/src/components/ha-paper-icon-button-arrow-next.ts
@@ -1,5 +1,5 @@
-import { Constructor } from "lit-element";
 import "@polymer/paper-icon-button/paper-icon-button";
+import { Constructor } from "../types";
 // Not duplicate, this is for typing.
 // tslint:disable-next-line
 import { PaperIconButtonElement } from "@polymer/paper-icon-button/paper-icon-button";
diff --git a/src/components/ha-paper-icon-button-arrow-prev.ts b/src/components/ha-paper-icon-button-arrow-prev.ts
index dd6378acad..d79c8c66f4 100644
--- a/src/components/ha-paper-icon-button-arrow-prev.ts
+++ b/src/components/ha-paper-icon-button-arrow-prev.ts
@@ -1,5 +1,5 @@
-import { Constructor } from "lit-element";
 import "@polymer/paper-icon-button/paper-icon-button";
+import { Constructor } from "../types";
 // Not duplicate, this is for typing.
 // tslint:disable-next-line
 import { PaperIconButtonElement } from "@polymer/paper-icon-button/paper-icon-button";
diff --git a/src/components/ha-paper-icon-button-next.ts b/src/components/ha-paper-icon-button-next.ts
index e3038e5a00..cca612de4f 100644
--- a/src/components/ha-paper-icon-button-next.ts
+++ b/src/components/ha-paper-icon-button-next.ts
@@ -1,5 +1,5 @@
-import { Constructor } from "lit-element";
 import "@polymer/paper-icon-button/paper-icon-button";
+import { Constructor } from "../types";
 // Not duplicate, this is for typing.
 // tslint:disable-next-line
 import { PaperIconButtonElement } from "@polymer/paper-icon-button/paper-icon-button";
diff --git a/src/components/ha-paper-icon-button-prev.ts b/src/components/ha-paper-icon-button-prev.ts
index 396482be4b..ca4c32ff1c 100644
--- a/src/components/ha-paper-icon-button-prev.ts
+++ b/src/components/ha-paper-icon-button-prev.ts
@@ -1,5 +1,5 @@
-import { Constructor } from "lit-element";
 import "@polymer/paper-icon-button/paper-icon-button";
+import { Constructor } from "../types";
 // Not duplicate, this is for typing.
 // tslint:disable-next-line
 import { PaperIconButtonElement } from "@polymer/paper-icon-button/paper-icon-button";
diff --git a/src/components/ha-switch.ts b/src/components/ha-switch.ts
index 53b8cf1229..b31909c499 100644
--- a/src/components/ha-switch.ts
+++ b/src/components/ha-switch.ts
@@ -1,8 +1,9 @@
-import { Constructor, customElement, CSSResult, css, query } from "lit-element";
+import { customElement, CSSResult, css, query } from "lit-element";
 import "@material/mwc-switch";
 import { style } from "@material/mwc-switch/mwc-switch-css";
 // tslint:disable-next-line
 import { Switch } from "@material/mwc-switch";
+import { Constructor } from "../types";
 // tslint:disable-next-line
 const MwcSwitch = customElements.get("mwc-switch") as Constructor<Switch>;
 
diff --git a/src/mixins/lit-localize-lite-mixin.ts b/src/mixins/lit-localize-lite-mixin.ts
index 59a90f5364..c99d32c5a8 100644
--- a/src/mixins/lit-localize-lite-mixin.ts
+++ b/src/mixins/lit-localize-lite-mixin.ts
@@ -1,45 +1,20 @@
-import {
-  Constructor,
-  LitElement,
-  PropertyDeclarations,
-  PropertyValues,
-} from "lit-element";
-import { getLocalLanguage } from "../util/hass-translation";
-import { localizeLiteBaseMixin } from "./localize-lite-base-mixin";
+import { LitElement, PropertyValues, property } from "lit-element";
+import { getLocalLanguage, getTranslation } from "../util/hass-translation";
 import { computeLocalize, LocalizeFunc } from "../common/translations/localize";
+import { Constructor, Resources } from "../types";
 
 const empty = () => "";
 
-interface LitLocalizeLiteMixin {
-  language: string;
-  resources: {};
-  translationFragment: string;
-  localize: LocalizeFunc;
-}
-
-export const litLocalizeLiteMixin = <T extends LitElement>(
-  superClass: Constructor<T>
-): Constructor<T & LitLocalizeLiteMixin> =>
-  // @ts-ignore
-  class extends localizeLiteBaseMixin(superClass) {
-    // Decorators not possible in anonymous classes
-    // And also, we cannot declare the variable without overriding the Lit setter.
-    static get properties(): PropertyDeclarations {
-      return {
-        localize: {},
-        language: {},
-        resources: {},
-        translationFragment: {},
-      };
-    }
-
-    constructor() {
-      super();
-      // This will prevent undefined errors if called before connected to DOM.
-      this.localize = empty;
-      // Use browser language setup before login.
-      this.language = getLocalLanguage();
-    }
+export const litLocalizeLiteMixin = <T extends Constructor<LitElement>>(
+  superClass: T
+) => {
+  class LitLocalizeLiteClass extends superClass {
+    // Initialized to empty will prevent undefined errors if called before connected to DOM.
+    @property() public localize: LocalizeFunc = empty;
+    @property() public resources?: Resources;
+    // Use browser language setup before login.
+    @property() public language?: string = getLocalLanguage();
+    @property() public translationFragment?: string;
 
     public connectedCallback(): void {
       super.connectedCallback();
@@ -51,7 +26,7 @@ export const litLocalizeLiteMixin = <T extends LitElement>(
       );
     }
 
-    public updated(changedProperties: PropertyValues) {
+    protected updated(changedProperties: PropertyValues) {
       super.updated(changedProperties);
       if (
         changedProperties.has("language") ||
@@ -64,4 +39,38 @@ export const litLocalizeLiteMixin = <T extends LitElement>(
         );
       }
     }
-  };
+
+    protected async _initializeLocalizeLite() {
+      if (this.resources) {
+        return;
+      }
+
+      if (!this.translationFragment) {
+        // In dev mode, we will issue a warning if after a second we are still
+        // not configured correctly.
+        if (__DEV__) {
+          setTimeout(
+            () =>
+              !this.resources &&
+              // tslint:disable-next-line
+              console.error(
+                "Forgot to pass in resources or set translationFragment for",
+                this.nodeName
+              ),
+            1000
+          );
+        }
+        return;
+      }
+
+      const { language, data } = await getTranslation(
+        this.translationFragment!,
+        this.language!
+      );
+      this.resources = {
+        [language]: data,
+      };
+    }
+  }
+  return LitLocalizeLiteClass;
+};
diff --git a/src/mixins/localize-lite-base-mixin.ts b/src/mixins/localize-lite-base-mixin.ts
deleted file mode 100644
index 83fbd612af..0000000000
--- a/src/mixins/localize-lite-base-mixin.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Lite base mixin to add localization without depending on the Hass object.
- */
-import { getTranslation } from "../util/hass-translation";
-import { Resources } from "../types";
-
-/**
- * @polymerMixin
- */
-export const localizeLiteBaseMixin = (superClass) =>
-  class extends superClass {
-    public resources?: Resources;
-    public language?: string;
-    public translationFragment?: string;
-
-    protected _initializeLocalizeLite() {
-      if (this.resources) {
-        return;
-      }
-
-      if (!this.translationFragment) {
-        // In dev mode, we will issue a warning if after a second we are still
-        // not configured correctly.
-        if (__DEV__) {
-          setTimeout(
-            () =>
-              !this.resources &&
-              // tslint:disable-next-line
-              console.error(
-                "Forgot to pass in resources or set translationFragment for",
-                this.nodeName
-              ),
-            1000
-          );
-        }
-        return;
-      }
-
-      this._downloadResources();
-    }
-
-    private async _downloadResources() {
-      const { language, data } = await getTranslation(
-        this.translationFragment!,
-        this.language!
-      );
-      this.resources = {
-        [language]: data,
-      };
-    }
-  };
diff --git a/src/mixins/localize-lite-mixin.ts b/src/mixins/localize-lite-mixin.ts
deleted file mode 100644
index 8fcf112972..0000000000
--- a/src/mixins/localize-lite-mixin.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Lite mixin to add localization without depending on the Hass object.
- */
-import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin";
-import { getLocalLanguage } from "../util/hass-translation";
-import { localizeLiteBaseMixin } from "./localize-lite-base-mixin";
-import { computeLocalize } from "../common/translations/localize";
-
-/**
- * @polymerMixin
- */
-export const localizeLiteMixin = dedupingMixin(
-  (superClass) =>
-    class extends localizeLiteBaseMixin(superClass) {
-      static get properties() {
-        return {
-          language: {
-            type: String,
-            // Use browser language setup before login.
-            value: getLocalLanguage(),
-          },
-          resources: Object,
-          // The fragment to load.
-          translationFragment: String,
-          /**
-           * Translates a string to the current `language`. Any parameters to the
-           * string should be passed in order, as follows:
-           * `localize(stringKey, param1Name, param1Value, param2Name, param2Value)`
-           */
-          localize: {
-            type: Function,
-            computed: "__computeLocalize(language, resources, formats)",
-          },
-        };
-      }
-
-      public ready() {
-        super.ready();
-        this._initializeLocalizeLite();
-      }
-
-      protected __computeLocalize(language, resources, formats?) {
-        return computeLocalize(
-          this.constructor.prototype,
-          language,
-          resources,
-          formats
-        );
-      }
-    }
-);
diff --git a/src/mixins/provide-hass-lit-mixin.ts b/src/mixins/provide-hass-lit-mixin.ts
index 3b45ecedbe..fb9d1b3e93 100644
--- a/src/mixins/provide-hass-lit-mixin.ts
+++ b/src/mixins/provide-hass-lit-mixin.ts
@@ -1,5 +1,5 @@
-import { UpdatingElement, Constructor, PropertyValues } from "lit-element";
-import { HomeAssistant } from "../types";
+import { UpdatingElement, PropertyValues } from "lit-element";
+import { HomeAssistant, Constructor } from "../types";
 
 export interface ProvideHassElement {
   provideHass(element: HTMLElement);
@@ -7,9 +7,9 @@ export interface ProvideHassElement {
 
 /* tslint:disable */
 
-export const ProvideHassLitMixin = <T extends UpdatingElement>(
-  superClass: Constructor<T>
-): Constructor<T & ProvideHassElement> =>
+export const ProvideHassLitMixin = <T extends Constructor<UpdatingElement>>(
+  superClass: T
+) =>
   // @ts-ignore
   class extends superClass {
     protected hass!: HomeAssistant;
diff --git a/src/mixins/subscribe-mixin.ts b/src/mixins/subscribe-mixin.ts
index 95b31e5eeb..350055d232 100644
--- a/src/mixins/subscribe-mixin.ts
+++ b/src/mixins/subscribe-mixin.ts
@@ -1,32 +1,21 @@
-import {
-  LitElement,
-  Constructor,
-  PropertyValues,
-  PropertyDeclarations,
-} from "lit-element";
+import { LitElement, PropertyValues, property } from "lit-element";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
+import { HomeAssistant, Constructor } from "../types";
 
 export interface HassSubscribeElement {
   hassSubscribe(): UnsubscribeFunc[];
 }
 
 /* tslint:disable-next-line */
-export const SubscribeMixin = <T extends LitElement>(
-  superClass: Constructor<T>
-): Constructor<T & HassSubscribeElement> =>
-  // @ts-ignore
-  class extends superClass {
+export const SubscribeMixin = <T extends Constructor<LitElement>>(
+  superClass: T
+) => {
+  class SubscribeClass extends superClass {
+    @property() public hass?: HomeAssistant;
+
     /* tslint:disable-next-line */
     private __unsubs?: UnsubscribeFunc[];
 
-    // Decorators not possible in anonymous classes
-    // And also, we cannot declare the variable without overriding the Lit setter.
-    static get properties(): PropertyDeclarations {
-      return {
-        hass: {},
-      };
-    }
-
     public connectedCallback() {
       super.connectedCallback();
       this.__checkSubscribed();
@@ -57,11 +46,12 @@ export const SubscribeMixin = <T extends LitElement>(
       if (
         this.__unsubs !== undefined ||
         !((this as unknown) as Element).isConnected ||
-        // @ts-ignore
         this.hass === undefined
       ) {
         return;
       }
       this.__unsubs = this.hassSubscribe();
     }
-  };
+  }
+  return SubscribeClass;
+};
diff --git a/src/state/auth-mixin.ts b/src/state/auth-mixin.ts
index c97730ac3f..baf012cfdc 100644
--- a/src/state/auth-mixin.ts
+++ b/src/state/auth-mixin.ts
@@ -1,8 +1,8 @@
 import { clearState } from "../util/ha-pref-storage";
 import { askWrite } from "../common/auth/token_storage";
 import { subscribeUser, userCollection } from "../data/ws-user";
-import { Constructor, LitElement } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
+import { Constructor } from "../types";
 
 declare global {
   // for fire event
@@ -11,7 +11,7 @@ declare global {
   }
 }
 
-export default (superClass: Constructor<LitElement & HassBaseEl>) =>
+export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
index eb439c8135..5712b14392 100644
--- a/src/state/connection-mixin.ts
+++ b/src/state/connection-mixin.ts
@@ -17,12 +17,12 @@ import hassCallApi from "../util/hass-call-api";
 import { subscribePanels } from "../data/ws-panels";
 import { forwardHaptic } from "../data/haptics";
 import { fireEvent } from "../common/dom/fire_event";
-import { Constructor, LitElement } from "lit-element";
+import { Constructor } from "../types";
 import { HassBaseEl } from "./hass-base-mixin";
 import { broadcastConnectionStatus } from "../data/connection-status";
 
-export const connectionMixin = (
-  superClass: Constructor<LitElement & HassBaseEl>
+export const connectionMixin = <T extends Constructor<HassBaseEl>>(
+  superClass: T
 ) =>
   class extends superClass {
     protected initializeHass(auth: Auth, conn: Connection) {
@@ -90,13 +90,13 @@ export const connectionMixin = (
           conn.sendMessage(msg);
         },
         // For messages that expect a response
-        callWS: <T>(msg) => {
+        callWS: <R>(msg) => {
           if (__DEV__) {
             // tslint:disable-next-line: no-console
             console.log("Sending", msg);
           }
 
-          const resp = conn.sendMessagePromise<T>(msg);
+          const resp = conn.sendMessagePromise<R>(msg);
 
           if (__DEV__) {
             resp.then(
diff --git a/src/state/dialog-manager-mixin.ts b/src/state/dialog-manager-mixin.ts
index 5fcae876a3..f6e525b5fc 100644
--- a/src/state/dialog-manager-mixin.ts
+++ b/src/state/dialog-manager-mixin.ts
@@ -1,7 +1,7 @@
-import { Constructor, LitElement } from "lit-element";
 import { HASSDomEvent } from "../common/dom/fire_event";
 import { HassBaseEl } from "./hass-base-mixin";
 import { makeDialogManager, showDialog } from "../dialogs/make-dialog-manager";
+import { Constructor } from "../types";
 
 interface RegisterDialogParams {
   dialogShowEvent: keyof HASSDomEvents;
@@ -20,8 +20,8 @@ declare global {
   }
 }
 
-export const dialogManagerMixin = (
-  superClass: Constructor<LitElement & HassBaseEl>
+export const dialogManagerMixin = <T extends Constructor<HassBaseEl>>(
+  superClass: T
 ) =>
   class extends superClass {
     protected firstUpdated(changedProps) {
diff --git a/src/state/disconnect-toast-mixin.ts b/src/state/disconnect-toast-mixin.ts
index a36ec359ff..e2b6aeb14e 100644
--- a/src/state/disconnect-toast-mixin.ts
+++ b/src/state/disconnect-toast-mixin.ts
@@ -1,8 +1,8 @@
-import { Constructor, LitElement } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
 import { showToast } from "../util/toast";
+import { Constructor } from "../types";
 
-export default (superClass: Constructor<LitElement & HassBaseEl>) =>
+export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
diff --git a/src/state/haptic-mixin.ts b/src/state/haptic-mixin.ts
index 44c02664c9..3fe9adea69 100644
--- a/src/state/haptic-mixin.ts
+++ b/src/state/haptic-mixin.ts
@@ -1,8 +1,8 @@
-import { Constructor, LitElement, PropertyValues } from "lit-element";
+import { PropertyValues } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
 
 import { HapticType } from "../data/haptics";
-import { HomeAssistant } from "../types";
+import { HomeAssistant, Constructor } from "../types";
 import { HASSDomEvent } from "../common/dom/fire_event";
 import { storeState } from "../util/ha-pref-storage";
 
@@ -35,7 +35,7 @@ const handleHaptic = (hapticTypeEvent: HASSDomEvent<HapticType>) => {
   navigator.vibrate(hapticPatterns[hapticTypeEvent.detail]);
 };
 
-export const hapticMixin = (superClass: Constructor<LitElement & HassBaseEl>) =>
+export const hapticMixin = <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     protected firstUpdated(changedProps: PropertyValues) {
       super.firstUpdated(changedProps);
diff --git a/src/state/hass-base-mixin.ts b/src/state/hass-base-mixin.ts
index 81c4e06899..34bd9eebae 100644
--- a/src/state/hass-base-mixin.ts
+++ b/src/state/hass-base-mixin.ts
@@ -1,77 +1,51 @@
-import {
-  Constructor,
-  // @ts-ignore
-  property,
-  PropertyDeclarations,
-} from "lit-element";
-import { Auth, Connection } from "home-assistant-js-websocket";
+import { LitElement, property } from "lit-element";
 import { HomeAssistant } from "../types";
+import { Auth, Connection } from "home-assistant-js-websocket";
 
-/* tslint:disable */
-
-export class HassBaseEl {
-  protected hass?: HomeAssistant;
+export class HassBaseEl extends LitElement {
+  @property() public hass?: HomeAssistant;
   protected _pendingHass: Partial<HomeAssistant> = {};
-  protected initializeHass(_auth: Auth, _conn: Connection) {}
-  protected hassConnected() {}
-  protected hassReconnected() {}
-  protected hassDisconnected() {}
-  protected hassChanged(_hass: HomeAssistant, _oldHass?: HomeAssistant) {}
-  protected panelUrlChanged(_newPanelUrl: string) {}
-  public provideHass(_el: HTMLElement) {}
-  protected _updateHass(_obj: Partial<HomeAssistant>) {}
+  // tslint:disable-next-line: variable-name
+  private __provideHass: HTMLElement[] = [];
+
+  public provideHass(el) {
+    this.__provideHass.push(el);
+    el.hass = this.hass;
+  }
+
+  protected initializeHass(_auth: Auth, _conn: Connection) {
+    // implemented in connection-mixin
+    // tslint:disable-next-line
+  }
+
+  // Exists so all methods can safely call super method
+  protected hassConnected() {
+    // tslint:disable-next-line
+  }
+
+  protected hassReconnected() {
+    // tslint:disable-next-line
+  }
+
+  protected hassDisconnected() {
+    // tslint:disable-next-line
+  }
+
+  protected panelUrlChanged(_newPanelUrl) {
+    // tslint:disable-next-line
+  }
+
+  protected hassChanged(hass, _oldHass) {
+    this.__provideHass.forEach((el) => {
+      (el as any).hass = hass;
+    });
+  }
+
+  protected _updateHass(obj: Partial<HomeAssistant>) {
+    if (!this.hass) {
+      this._pendingHass = { ...this._pendingHass, ...obj };
+      return;
+    }
+    this.hass = { ...this.hass, ...obj };
+  }
 }
-
-export default <T>(superClass: Constructor<T>): Constructor<T & HassBaseEl> =>
-  // @ts-ignore
-  class extends superClass {
-    protected _pendingHass: Partial<HomeAssistant> = {};
-    private __provideHass: HTMLElement[] = [];
-
-    // Decorators not possible in anonymous classes
-    // And also, we cannot declare the variable without overriding the Lit setter.
-    static get properties(): PropertyDeclarations {
-      return {
-        hass: {},
-      };
-    }
-
-    // Exists so all methods can safely call super method
-    protected hassConnected() {
-      // tslint:disable-next-line
-    }
-
-    protected hassReconnected() {
-      // tslint:disable-next-line
-    }
-
-    protected hassDisconnected() {
-      // tslint:disable-next-line
-    }
-
-    protected panelUrlChanged(_newPanelUrl) {
-      // tslint:disable-next-line
-    }
-
-    protected hassChanged(hass, _oldHass) {
-      this.__provideHass.forEach((el) => {
-        (el as any).hass = hass;
-      });
-    }
-
-    public provideHass(el) {
-      this.__provideHass.push(el);
-      // @ts-ignore
-      el.hass = this.hass;
-    }
-
-    protected _updateHass(obj: Partial<HomeAssistant>) {
-      // @ts-ignore
-      if (!this.hass) {
-        this._pendingHass = { ...this._pendingHass, ...obj };
-        return;
-      }
-      // @ts-ignore
-      this.hass = { ...this.hass, ...obj };
-    }
-  };
diff --git a/src/state/hass-element.ts b/src/state/hass-element.ts
index c225ef9224..9aaa9ccc6a 100644
--- a/src/state/hass-element.ts
+++ b/src/state/hass-element.ts
@@ -1,4 +1,3 @@
-import HassBaseMixin from "./hass-base-mixin";
 import AuthMixin from "./auth-mixin";
 import TranslationsMixin from "./translations-mixin";
 import ThemesMixin from "./themes-mixin";
@@ -11,12 +10,13 @@ import NotificationMixin from "./notification-mixin";
 import DisconnectToastMixin from "./disconnect-toast-mixin";
 import { hapticMixin } from "./haptic-mixin";
 import { urlSyncMixin } from "./url-sync-mixin";
-import { LitElement } from "lit-element";
+import { Constructor } from "../types";
+import { HassBaseEl } from "./hass-base-mixin";
 
-const ext = <T>(baseClass: T, mixins): T =>
+const ext = <T extends Constructor>(baseClass: T, mixins): T =>
   mixins.reduceRight((base, mixin) => mixin(base), baseClass);
 
-export class HassElement extends ext(HassBaseMixin(LitElement), [
+export class HassElement extends ext(HassBaseEl, [
   AuthMixin,
   ThemesMixin,
   TranslationsMixin,
diff --git a/src/state/more-info-mixin.ts b/src/state/more-info-mixin.ts
index 9cd8a12939..8b3af120d5 100644
--- a/src/state/more-info-mixin.ts
+++ b/src/state/more-info-mixin.ts
@@ -1,6 +1,5 @@
-import { Constructor, LitElement } from "lit-element";
-
 import { HassBaseEl } from "./hass-base-mixin";
+import { Constructor } from "../types";
 
 declare global {
   // for fire event
@@ -11,7 +10,7 @@ declare global {
   }
 }
 
-export default (superClass: Constructor<LitElement & HassBaseEl>) =>
+export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     private _moreInfoEl?: any;
 
diff --git a/src/state/notification-mixin.ts b/src/state/notification-mixin.ts
index 726f335052..5149e3a80c 100644
--- a/src/state/notification-mixin.ts
+++ b/src/state/notification-mixin.ts
@@ -1,7 +1,11 @@
-export default (superClass) =>
+import { HassBaseEl } from "./hass-base-mixin";
+import { Constructor } from "../types";
+
+export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
+      // @ts-ignore
       this.registerDialog({
         dialogShowEvent: "hass-notification",
         dialogTag: "notification-manager",
diff --git a/src/state/sidebar-mixin.ts b/src/state/sidebar-mixin.ts
index 0432be0014..456ec7120b 100644
--- a/src/state/sidebar-mixin.ts
+++ b/src/state/sidebar-mixin.ts
@@ -1,8 +1,7 @@
 import { storeState } from "../util/ha-pref-storage";
-import { Constructor, LitElement } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
 import { HASSDomEvent } from "../common/dom/fire_event";
-import { HomeAssistant } from "../types";
+import { HomeAssistant, Constructor } from "../types";
 
 interface DockSidebarParams {
   dock: HomeAssistant["dockedSidebar"];
@@ -19,7 +18,7 @@ declare global {
   }
 }
 
-export default (superClass: Constructor<LitElement & HassBaseEl>) =>
+export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
diff --git a/src/state/themes-mixin.ts b/src/state/themes-mixin.ts
index b97419237e..4fd14c823a 100644
--- a/src/state/themes-mixin.ts
+++ b/src/state/themes-mixin.ts
@@ -1,9 +1,9 @@
 import applyThemesOnElement from "../common/dom/apply_themes_on_element";
 import { storeState } from "../util/ha-pref-storage";
 import { subscribeThemes } from "../data/ws-themes";
-import { Constructor, LitElement } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
 import { HASSDomEvent } from "../common/dom/fire_event";
+import { Constructor } from "../types";
 
 declare global {
   // for add event listener
@@ -12,7 +12,7 @@ declare global {
   }
 }
 
-export default (superClass: Constructor<LitElement & HassBaseEl>) =>
+export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
diff --git a/src/state/translations-mixin.ts b/src/state/translations-mixin.ts
index edce6341cc..da7c3f2f3f 100644
--- a/src/state/translations-mixin.ts
+++ b/src/state/translations-mixin.ts
@@ -4,11 +4,10 @@ import {
   getLocalLanguage,
   getUserLanguage,
 } from "../util/hass-translation";
-import { Constructor, LitElement } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
 import { computeLocalize } from "../common/translations/localize";
 import { computeRTL } from "../common/util/compute_rtl";
-import { HomeAssistant } from "../types";
+import { HomeAssistant, Constructor } from "../types";
 import { storeState } from "../util/ha-pref-storage";
 import {
   getHassTranslations,
@@ -19,7 +18,7 @@ import {
  * superClass needs to contain `this.hass` and `this._updateHass`.
  */
 
-export default (superClass: Constructor<LitElement & HassBaseEl>) =>
+export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
     // tslint:disable-next-line: variable-name
     private __coreProgress?: string;
diff --git a/src/state/url-sync-mixin.ts b/src/state/url-sync-mixin.ts
index 920066bd85..94325cab7b 100644
--- a/src/state/url-sync-mixin.ts
+++ b/src/state/url-sync-mixin.ts
@@ -1,12 +1,12 @@
-import { Constructor, LitElement } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
 import { fireEvent } from "../common/dom/fire_event";
+import { Constructor } from "../types";
 
 /* tslint:disable:no-console */
 const DEBUG = false;
 
-export const urlSyncMixin = (
-  superClass: Constructor<LitElement & HassBaseEl>
+export const urlSyncMixin = <T extends Constructor<HassBaseEl>>(
+  superClass: T
 ) =>
   // Disable this functionality in the demo.
   __DEMO__
diff --git a/src/state/zha-dialog-mixin.ts b/src/state/zha-dialog-mixin.ts
index 600c9c4972..ba6e294c2d 100644
--- a/src/state/zha-dialog-mixin.ts
+++ b/src/state/zha-dialog-mixin.ts
@@ -1,10 +1,11 @@
-import { Constructor, LitElement } from "lit-element";
+import { UpdatingElement } from "lit-element";
 import { HassBaseEl } from "./hass-base-mixin";
 import {
   showZHADeviceInfoDialog,
   ZHADeviceInfoDialogParams,
 } from "../dialogs/zha-device-info-dialog/show-dialog-zha-device-info";
 import { HASSDomEvent } from "../common/dom/fire_event";
+import { Constructor } from "../types";
 
 declare global {
   // for fire event
@@ -15,7 +16,7 @@ declare global {
   }
 }
 
-export default (superClass: Constructor<LitElement & HassBaseEl>) =>
+export default (superClass: Constructor<UpdatingElement & HassBaseEl>) =>
   class extends superClass {
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
diff --git a/src/types.ts b/src/types.ts
index d67d460285..4288597623 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -40,6 +40,8 @@ declare global {
   }
 }
 
+export type Constructor<T = {}> = new (...args: any[]) => T;
+
 export interface WebhookError {
   code: number;
   message: string;

From c25f2d3941db33e06332c8f80f16ab0444962ff8 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 20 Oct 2019 05:42:20 -0700
Subject: [PATCH 40/70] Move compression from Webpack to Gulp (#4074)

---
 build-scripts/gulp/app.js           |  8 +++-----
 build-scripts/gulp/compress.js      | 31 +++++++++++++++++++++++++++++
 build-scripts/gulp/gather-static.js | 18 -----------------
 build-scripts/webpack.js            | 12 -----------
 4 files changed, 34 insertions(+), 35 deletions(-)
 create mode 100644 build-scripts/gulp/compress.js

diff --git a/build-scripts/gulp/app.js b/build-scripts/gulp/app.js
index 1396af5528..a86e68b527 100644
--- a/build-scripts/gulp/app.js
+++ b/build-scripts/gulp/app.js
@@ -5,6 +5,7 @@ require("./clean.js");
 require("./translations.js");
 require("./gen-icons.js");
 require("./gather-static.js");
+require("./compress.js");
 require("./webpack.js");
 require("./service-worker.js");
 require("./entry-html.js");
@@ -37,11 +38,8 @@ gulp.task(
     "clean",
     gulp.parallel("gen-icons", "build-translations"),
     "copy-static",
-    gulp.parallel(
-      "webpack-prod-app",
-      // Do not compress static files in CI, it's SLOW.
-      ...(process.env.CI === "true" ? [] : ["compress-static"])
-    ),
+    "webpack-prod-app",
+    ...(process.env.CI === "true" ? [] : ["compress-app"]),
     gulp.parallel(
       "gen-pages-prod",
       "gen-index-app-prod",
diff --git a/build-scripts/gulp/compress.js b/build-scripts/gulp/compress.js
new file mode 100644
index 0000000000..f41122c55c
--- /dev/null
+++ b/build-scripts/gulp/compress.js
@@ -0,0 +1,31 @@
+// Tasks to compress
+
+const gulp = require("gulp");
+const zopfli = require("gulp-zopfli-green");
+const merge = require("merge-stream");
+const path = require("path");
+const paths = require("../paths");
+
+gulp.task("compress-app", function compressApp() {
+  const jsLatest = gulp
+    .src(path.resolve(paths.output, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.output));
+
+  const jsEs5 = gulp
+    .src(path.resolve(paths.output_es5, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.output_es5));
+
+  const polyfills = gulp
+    .src(path.resolve(paths.static, "polyfills/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(path.resolve(paths.static, "polyfills")));
+
+  const translations = gulp
+    .src(path.resolve(paths.static, "translations/*.json"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(path.resolve(paths.static, "translations")));
+
+  return merge(jsLatest, jsEs5, polyfills, translations);
+});
diff --git a/build-scripts/gulp/gather-static.js b/build-scripts/gulp/gather-static.js
index 3d80035e17..7b3b9300be 100644
--- a/build-scripts/gulp/gather-static.js
+++ b/build-scripts/gulp/gather-static.js
@@ -4,8 +4,6 @@ const gulp = require("gulp");
 const path = require("path");
 const cpx = require("cpx");
 const fs = require("fs-extra");
-const zopfli = require("gulp-zopfli-green");
-const merge = require("merge-stream");
 const paths = require("../paths");
 
 const npmPath = (...parts) =>
@@ -67,20 +65,6 @@ function copyMapPanel(staticDir) {
   );
 }
 
-function compressStatic(staticDir) {
-  const staticPath = genStaticPath(staticDir);
-  const polyfills = gulp
-    .src(staticPath("polyfills/*.js"))
-    .pipe(zopfli())
-    .pipe(gulp.dest(staticPath("polyfills")));
-  const translations = gulp
-    .src(staticPath("translations/*.json"))
-    .pipe(zopfli())
-    .pipe(gulp.dest(staticPath("translations")));
-
-  return merge(polyfills, translations);
-}
-
 gulp.task("copy-static", (done) => {
   const staticDir = paths.static;
   const staticPath = genStaticPath(paths.static);
@@ -100,8 +84,6 @@ gulp.task("copy-static", (done) => {
   done();
 });
 
-gulp.task("compress-static", () => compressStatic(paths.static));
-
 gulp.task("copy-static-demo", (done) => {
   // Copy app static files
   fs.copySync(
diff --git a/build-scripts/webpack.js b/build-scripts/webpack.js
index fa9bfb9edd..bb69d91948 100644
--- a/build-scripts/webpack.js
+++ b/build-scripts/webpack.js
@@ -3,8 +3,6 @@ const fs = require("fs");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
 const WorkboxPlugin = require("workbox-webpack-plugin");
-const CompressionPlugin = require("compression-webpack-plugin");
-const zopfli = require("@gfx/zopfli");
 const ManifestPlugin = require("webpack-manifest-plugin");
 const paths = require("./paths.js");
 const { babelLoaderConfig } = require("./babel.js");
@@ -134,16 +132,6 @@ const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
         ),
       }),
       ...plugins,
-      isProdBuild &&
-        !isCI &&
-        !isStatsBuild &&
-        new CompressionPlugin({
-          cache: true,
-          exclude: [/\.js\.map$/, /\.LICENSE$/, /\.py$/, /\.txt$/],
-          algorithm(input, compressionOptions, callback) {
-            return zopfli.gzip(input, compressionOptions, callback);
-          },
-        }),
       latestBuild &&
         new WorkboxPlugin.InjectManifest({
           swSrc: "./src/entrypoints/service-worker-hass.js",

From b96b0269059edc9e4b04581a171a3fa191cc9f33 Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Sun, 20 Oct 2019 06:02:11 -0700
Subject: [PATCH 41/70] Add hovers (title attrs) to buttons on integrations
 config entry (#4059)

* Add integration specific titles to config buttons

* Rename tranlation var to integration, move button labels inline
---
 .../config-entry/ha-config-entry-page.ts          | 15 +++++++++++++++
 src/translations/en.json                          |  3 +++
 2 files changed, 18 insertions(+)
 mode change 100644 => 100755 src/panels/config/integrations/config-entry/ha-config-entry-page.ts

diff --git a/src/panels/config/integrations/config-entry/ha-config-entry-page.ts b/src/panels/config/integrations/config-entry/ha-config-entry-page.ts
old mode 100644
new mode 100755
index af6e559f0d..12d3674bc4
--- a/src/panels/config/integrations/config-entry/ha-config-entry-page.ts
+++ b/src/panels/config/integrations/config-entry/ha-config-entry-page.ts
@@ -84,17 +84,32 @@ class HaConfigEntryPage extends LitElement {
                 slot="toolbar-icon"
                 icon="hass:settings"
                 @click=${this._showSettings}
+                title=${this.hass.localize(
+                  "ui.panel.config.integrations.config_entry.settings_button",
+                  "integration",
+                  configEntry.title
+                )}
               ></paper-icon-button>
             `
           : ""}
         <paper-icon-button
           slot="toolbar-icon"
           icon="hass:message-settings-variant"
+          title=${this.hass.localize(
+            "ui.panel.config.integrations.config_entry.system_options_button",
+            "integration",
+            configEntry.title
+          )}
           @click=${this._showSystemOptions}
         ></paper-icon-button>
         <paper-icon-button
           slot="toolbar-icon"
           icon="hass:delete"
+          title=${this.hass.localize(
+            "ui.panel.config.integrations.config_entry.delete_button",
+            "integration",
+            configEntry.title
+          )}
           @click=${this._removeEntry}
         ></paper-icon-button>
 
diff --git a/src/translations/en.json b/src/translations/en.json
index 7f77a2cdaf..9c0b16ed55 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1187,6 +1187,9 @@
           "configure": "Configure",
           "none": "Nothing configured yet",
           "config_entry": {
+            "settings_button": "Edit settings for {integration}",
+            "system_options_button": "System options for {integration}",
+            "delete_button": "Delete {integration}",
             "no_devices": "This integration has no devices.",
             "no_device": "Entities without devices",
             "delete_confirm": "Are you sure you want to delete this integration?",

From 96d14b7ab7cd00f7a67ed12b080763e893efdeb3 Mon Sep 17 00:00:00 2001
From: Sean Mooney <sean.mooney@gmail.com>
Date: Sun, 20 Oct 2019 09:10:07 -0400
Subject: [PATCH 42/70] Changed outdated "GUI editor" reference to "visual
 editor" (#4068)

Changed warning text from "GUI editor" to "visual editor" to match the updated naming being used in card editors.
---
 src/panels/lovelace/editor/card-editor/hui-card-editor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
index 0825bddbc4..b3af42b963 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
@@ -229,7 +229,7 @@ export class HuiCardEditor extends LitElement {
           configElement = await elClass.getConfigElement();
         } else {
           configElement = undefined;
-          throw Error(`WARNING: No GUI editor available for: ${cardType}`);
+          throw Error(`WARNING: No visual editor available for: ${cardType}`);
         }
 
         this._configElement = configElement;

From 6d10a5dd4c9464928f47c2b16285a82dfb6e5c92 Mon Sep 17 00:00:00 2001
From: aquarium <peter@vashevko.com>
Date: Mon, 21 Oct 2019 03:27:06 -0400
Subject: [PATCH 43/70] Split data table background color into separate theme
 variable (#4031)

* Split data table background color into separate theme variable

* Remove reference to MDC in data table theme variable name
---
 src/components/data-table/ha-data-table.ts | 2 +-
 src/resources/ha-style.ts                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts
index d009bd8c77..0fa519b4d9 100644
--- a/src/components/data-table/ha-data-table.ts
+++ b/src/components/data-table/ha-data-table.ts
@@ -427,7 +427,7 @@ export class HaDataTable extends BaseElement {
       }
 
       .mdc-data-table {
-        background-color: var(--card-background-color);
+        background-color: var(--data-table-background-color);
         border-radius: 4px;
         border-width: 1px;
         border-style: solid;
diff --git a/src/resources/ha-style.ts b/src/resources/ha-style.ts
index 88b9552598..0ab68dbaa2 100644
--- a/src/resources/ha-style.ts
+++ b/src/resources/ha-style.ts
@@ -123,6 +123,9 @@ documentContainer.innerHTML = `<custom-style>
       --paper-slider-container-color: var(--slider-bar-color);
       --ha-paper-slider-pin-font-size: 15px;
 
+      /* set data table style */
+      --data-table-background-color: var(--card-background-color);
+
       /* rgb */
       --rgb-primary-color: 3, 169, 244;
       --rgb-accent-color: 255, 152, 0;

From 5e3cb812ec11068364faa2c6c93ee21cdb03509c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 21 Oct 2019 17:36:09 +0200
Subject: [PATCH 44/70] Fix `yaml` name collision in card editor (#4079)

* Fix `yaml` name collision

* Add types for js-yaml change to named imports
---
 gallery/src/components/demo-card.js                    |  4 ++--
 package.json                                           |  1 +
 src/panels/config/js/yaml_textarea.tsx                 |  6 +++---
 .../developer-tools/event/developer-tools-event.js     |  4 ++--
 .../developer-tools/service/developer-tools-service.js | 10 +++++-----
 .../developer-tools/state/developer-tools-state.js     |  8 ++++----
 src/panels/lovelace/cards/hui-error-card.ts            |  4 ++--
 .../lovelace/editor/card-editor/hui-card-editor.ts     |  6 +++---
 src/panels/lovelace/hui-editor.ts                      |  6 +++---
 yarn.lock                                              |  5 +++++
 10 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/gallery/src/components/demo-card.js b/gallery/src/components/demo-card.js
index adc7282ba1..b782aaf882 100644
--- a/gallery/src/components/demo-card.js
+++ b/gallery/src/components/demo-card.js
@@ -1,6 +1,6 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
-import JsYaml from "js-yaml";
+import { safeLoad } from "js-yaml";
 
 import { createCardElement } from "../../../src/panels/lovelace/common/create-card-element";
 
@@ -62,7 +62,7 @@ class DemoCard extends PolymerElement {
       card.removeChild(card.lastChild);
     }
 
-    const el = createCardElement(JsYaml.safeLoad(config.config)[0]);
+    const el = createCardElement(safeLoad(config.config)[0]);
     el.hass = this.hass;
     card.appendChild(el);
   }
diff --git a/package.json b/package.json
index b4705eebd9..537235c1af 100644
--- a/package.json
+++ b/package.json
@@ -119,6 +119,7 @@
     "@types/chromecast-caf-sender": "^1.0.1",
     "@types/codemirror": "^0.0.78",
     "@types/hls.js": "^0.12.3",
+    "@types/js-yaml": "^3.12.1",
     "@types/leaflet": "^1.4.3",
     "@types/memoize-one": "4.1.0",
     "@types/mocha": "^5.2.6",
diff --git a/src/panels/config/js/yaml_textarea.tsx b/src/panels/config/js/yaml_textarea.tsx
index 5050576db2..0b8115e7d3 100644
--- a/src/panels/config/js/yaml_textarea.tsx
+++ b/src/panels/config/js/yaml_textarea.tsx
@@ -1,5 +1,5 @@
 import { h, Component } from "preact";
-import yaml from "js-yaml";
+import { safeDump, safeLoad } from "js-yaml";
 import "../../../components/ha-code-editor";
 
 const isEmpty = (obj: object) => {
@@ -19,7 +19,7 @@ export default class YAMLTextArea extends Component<any, any> {
     try {
       value =
         props.value && !isEmpty(props.value)
-          ? yaml.safeDump(props.value)
+          ? safeDump(props.value)
           : undefined;
     } catch (err) {
       alert(`There was an error converting to YAML: ${err}`);
@@ -40,7 +40,7 @@ export default class YAMLTextArea extends Component<any, any> {
 
     if (value) {
       try {
-        parsed = yaml.safeLoad(value);
+        parsed = safeLoad(value);
         isValid = true;
       } catch (err) {
         // Invalid YAML
diff --git a/src/panels/developer-tools/event/developer-tools-event.js b/src/panels/developer-tools/event/developer-tools-event.js
index ed754093b2..074fcb6851 100644
--- a/src/panels/developer-tools/event/developer-tools-event.js
+++ b/src/panels/developer-tools/event/developer-tools-event.js
@@ -4,7 +4,7 @@ import "@polymer/paper-input/paper-input";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import yaml from "js-yaml";
+import { safeLoad } from "js-yaml";
 
 import "../../../components/ha-code-editor";
 import "../../../resources/ha-style";
@@ -138,7 +138,7 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
 
   _computeParsedEventData(eventData) {
     try {
-      return eventData.trim() ? yaml.safeLoad(eventData) : {};
+      return eventData.trim() ? safeLoad(eventData) : {};
     } catch (err) {
       return ERROR_SENTINEL;
     }
diff --git a/src/panels/developer-tools/service/developer-tools-service.js b/src/panels/developer-tools/service/developer-tools-service.js
index 6c73be3733..55397cf48a 100644
--- a/src/panels/developer-tools/service/developer-tools-service.js
+++ b/src/panels/developer-tools/service/developer-tools-service.js
@@ -2,7 +2,7 @@ import "@material/mwc-button";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import yaml from "js-yaml";
+import { safeDump, safeLoad } from "js-yaml";
 
 import { ENTITY_COMPONENT_DOMAINS } from "../../../data/entity";
 import "../../../components/entity/ha-entity-picker";
@@ -266,7 +266,7 @@ class HaPanelDevService extends LocalizeMixin(PolymerElement) {
 
   _computeParsedServiceData(serviceData) {
     try {
-      return serviceData.trim() ? yaml.safeLoad(serviceData) : {};
+      return serviceData.trim() ? safeLoad(serviceData) : {};
     } catch (err) {
       return ERROR_SENTINEL;
     }
@@ -310,18 +310,18 @@ class HaPanelDevService extends LocalizeMixin(PolymerElement) {
       if (attribute.example) {
         let value = "";
         try {
-          value = yaml.safeLoad(attribute.example);
+          value = safeLoad(attribute.example);
         } catch (err) {
           value = attribute.example;
         }
         example[attribute.key] = value;
       }
     });
-    this.serviceData = yaml.safeDump(example);
+    this.serviceData = safeDump(example);
   }
 
   _entityPicked(ev) {
-    this.serviceData = yaml.safeDump({
+    this.serviceData = safeDump({
       ...this.parsedJSON,
       entity_id: ev.target.value,
     });
diff --git a/src/panels/developer-tools/state/developer-tools-state.js b/src/panels/developer-tools/state/developer-tools-state.js
index 8e9a0fbb4b..bf15c25a68 100644
--- a/src/panels/developer-tools/state/developer-tools-state.js
+++ b/src/panels/developer-tools/state/developer-tools-state.js
@@ -4,7 +4,7 @@ import "@polymer/paper-input/paper-input";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import yaml from "js-yaml";
+import { safeDump, safeLoad } from "js-yaml";
 
 import "../../../components/entity/ha-entity-picker";
 import "../../../components/ha-code-editor";
@@ -235,14 +235,14 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
     var state = ev.model.entity;
     this._entityId = state.entity_id;
     this._state = state.state;
-    this._stateAttributes = yaml.safeDump(state.attributes);
+    this._stateAttributes = safeDump(state.attributes);
     ev.preventDefault();
   }
 
   entityIdChanged() {
     var state = this.hass.states[this._entityId];
     this._state = state.state;
-    this._stateAttributes = yaml.safeDump(state.attributes);
+    this._stateAttributes = safeDump(state.attributes);
   }
 
   entityMoreInfo(ev) {
@@ -363,7 +363,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
 
   _computeParsedStateAttributes(stateAttributes) {
     try {
-      return stateAttributes.trim() ? yaml.safeLoad(stateAttributes) : {};
+      return stateAttributes.trim() ? safeLoad(stateAttributes) : {};
     } catch (err) {
       return ERROR_SENTINEL;
     }
diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts
index bacf546e0e..2cf4e480bf 100644
--- a/src/panels/lovelace/cards/hui-error-card.ts
+++ b/src/panels/lovelace/cards/hui-error-card.ts
@@ -7,7 +7,7 @@ import {
   css,
   CSSResult,
 } from "lit-element";
-import yaml from "js-yaml";
+import { safeDump } from "js-yaml";
 
 import { LovelaceCard } from "../types";
 import { HomeAssistant } from "../../../types";
@@ -46,7 +46,7 @@ export class HuiErrorCard extends LitElement implements LovelaceCard {
 
     return html`
       ${this._config.error}
-      <pre>${yaml.safeDump(this._config.origConfig)}</pre>
+      <pre>${safeDump(this._config.origConfig)}</pre>
     `;
   }
 
diff --git a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
index b3af42b963..0509788ef4 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
@@ -8,7 +8,7 @@ import {
   property,
 } from "lit-element";
 
-import yaml from "js-yaml";
+import { safeDump, safeLoad } from "js-yaml";
 
 import "@material/mwc-button";
 import { HomeAssistant } from "../../../../types";
@@ -63,7 +63,7 @@ export class HuiCardEditor extends LitElement {
   public set yaml(_yaml: string) {
     this._yaml = _yaml;
     try {
-      this._config = yaml.safeLoad(this.yaml);
+      this._config = safeLoad(this.yaml);
       this._updateConfigElement();
       this._error = undefined;
     } catch (err) {
@@ -80,7 +80,7 @@ export class HuiCardEditor extends LitElement {
   }
   public set value(config: LovelaceCardConfig | undefined) {
     if (JSON.stringify(config) !== JSON.stringify(this._config || {})) {
-      this.yaml = yaml.safeDump(config);
+      this.yaml = safeDump(config);
     }
   }
 
diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts
index 169c4b1809..49a387493b 100644
--- a/src/panels/lovelace/hui-editor.ts
+++ b/src/panels/lovelace/hui-editor.ts
@@ -1,6 +1,6 @@
 import { LitElement, html, TemplateResult, CSSResult, css } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
-import yaml from "js-yaml";
+import { safeDump, safeLoad } from "js-yaml";
 
 import "@polymer/app-layout/app-header-layout/app-header-layout";
 import "@polymer/app-layout/app-header/app-header";
@@ -96,7 +96,7 @@ class LovelaceFullConfigEditor extends LitElement {
   }
 
   protected firstUpdated() {
-    this.yamlEditor.value = yaml.safeDump(this.lovelace!.config);
+    this.yamlEditor.value = safeDump(this.lovelace!.config);
   }
 
   static get styles(): CSSResult[] {
@@ -183,7 +183,7 @@ class LovelaceFullConfigEditor extends LitElement {
 
     let value;
     try {
-      value = yaml.safeLoad(this.yamlEditor.value);
+      value = safeLoad(this.yamlEditor.value);
     } catch (err) {
       alert(`Unable to parse YAML: ${err}`);
       this._saving = false;
diff --git a/yarn.lock b/yarn.lock
index 520feae282..67c20ec468 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1863,6 +1863,11 @@
   resolved "https://registry.yarnpkg.com/@types/is-windows/-/is-windows-0.2.0.tgz#6f24ee48731d31168ea510610d6dd15e5fc9c6ff"
   integrity sha1-byTuSHMdMRaOpRBhDW3RXl/Jxv8=
 
+"@types/js-yaml@^3.12.1":
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656"
+  integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"

From 540f1d9bce1b870849ea9572c6ebb2e2b36060aa Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Mon, 21 Oct 2019 17:45:40 +0200
Subject: [PATCH 45/70] Fix for Zone icon visibility on Map panel and Lovelace
 Map card (#4085)

* Set icon color to black in ha-panel-map.js

* Changed icon color depending on dark mode in lovelace map card

* Fixed build error by swapping var for let and const

* Replaced hardcoded style with the light and dark classes
---
 src/panels/lovelace/cards/hui-map-card.ts | 24 +++++++++++++++++++++--
 src/panels/map/ha-panel-map.js            | 12 +++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index 0bc34ec734..cef40d09d7 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -325,13 +325,25 @@ class HuiMapCard extends LitElement implements LovelaceCard {
           continue;
         }
 
+        // create icon
+        let iconHTML = "";
+        if (icon) {
+          const el = document.createElement("ha-icon");
+          el.setAttribute("icon", icon);
+          iconHTML = el.outerHTML;
+        } else {
+          const el = document.createElement("span");
+          el.innerHTML = title;
+          iconHTML = el.outerHTML;
+        }
+
         // create marker with the icon
         mapItems.push(
           Leaflet.marker([latitude, longitude], {
             icon: Leaflet.divIcon({
-              html: icon ? `<ha-icon icon="${icon}"></ha-icon>` : title,
+              html: iconHTML,
               iconSize: [24, 24],
-              className: "",
+              className: this._config!.dark_mode === true ? "dark" : "light",
             }),
             interactive: false,
             title,
@@ -455,6 +467,14 @@ class HuiMapCard extends LitElement implements LovelaceCard {
       :host([ispanel]) #root {
         height: 100%;
       }
+
+      .dark {
+        color: #ffffff;
+      }
+
+      .light {
+        color: #000000;
+      }
     `;
   }
 }
diff --git a/src/panels/map/ha-panel-map.js b/src/panels/map/ha-panel-map.js
index 24053cee0e..a3ed6c8ae8 100644
--- a/src/panels/map/ha-panel-map.js
+++ b/src/panels/map/ha-panel-map.js
@@ -24,6 +24,10 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
           width: 100%;
           z-index: 0;
         }
+
+        .light {
+          color: #000000;
+        }
       </style>
 
       <app-toolbar>
@@ -120,16 +124,18 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
           el.setAttribute("icon", entity.attributes.icon);
           iconHTML = el.outerHTML;
         } else {
-          iconHTML = title;
+          const el = document.createElement("span");
+          el.innerHTML = title;
+          iconHTML = el.outerHTML;
         }
 
         icon = this.Leaflet.divIcon({
           html: iconHTML,
           iconSize: [24, 24],
-          className: "",
+          className: "light",
         });
 
-        // create market with the icon
+        // create marker with the icon
         mapItems.push(
           this.Leaflet.marker(
             [entity.attributes.latitude, entity.attributes.longitude],

From 0078b48e3c5791451f03e7dc11c36c640067069b Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 21 Oct 2019 12:38:06 -0500
Subject: [PATCH 46/70] card level themes (#4057)

* card level themes

weather-forecast
shopping-list
plant-status
markdown
alarm-panel

* fix markdown

* address comments

also added picture cards

* update updated

* address comments

* address comments
---
 hassio/src/hassio-main.ts                     |  2 +-
 src/common/dom/apply_themes_on_element.ts     |  6 +--
 src/fake_data/provide_hass.ts                 |  2 +-
 .../lovelace/cards/hui-alarm-panel-card.ts    | 38 +++++++++++++---
 .../lovelace/cards/hui-entities-card.ts       | 21 +++++++--
 .../lovelace/cards/hui-entity-button-card.ts  | 31 +++++++++----
 src/panels/lovelace/cards/hui-gauge-card.ts   | 12 ++++-
 src/panels/lovelace/cards/hui-glance-card.ts  | 45 ++++++++++++-------
 src/panels/lovelace/cards/hui-light-card.ts   | 13 +++++-
 .../lovelace/cards/hui-markdown-card.ts       | 22 +++++++++
 src/panels/lovelace/cards/hui-picture-card.ts | 22 +++++++++
 .../cards/hui-picture-elements-card.ts        | 22 +++++++++
 .../lovelace/cards/hui-picture-entity-card.ts | 21 +++++++++
 .../lovelace/cards/hui-picture-glance-card.ts | 29 ++++++++++++
 .../lovelace/cards/hui-plant-status-card.ts   | 21 +++++++++
 src/panels/lovelace/cards/hui-sensor-card.ts  | 13 +++++-
 .../lovelace/cards/hui-shopping-list-card.ts  | 24 +++++++++-
 .../lovelace/cards/hui-thermostat-card.ts     | 12 ++++-
 .../cards/hui-weather-forecast-card.ts        | 18 ++++++++
 src/panels/lovelace/cards/types.ts            |  8 ++++
 src/panels/lovelace/common/has-changed.ts     |  7 +++
 .../hui-alarm-panel-card-editor.ts            | 14 +++++-
 .../hui-markdown-card-editor.ts               | 13 ++++++
 .../hui-picture-card-editor.ts                | 12 +++++
 .../hui-picture-entity-card-editor.ts         | 12 +++++
 .../hui-picture-glance-card-editor.ts         | 12 +++++
 .../hui-plant-status-card-editor.ts           | 12 +++++
 .../hui-shopping-list-editor.ts               | 13 ++++++
 .../hui-weather-forecast-card-editor.ts       | 12 +++++
 src/panels/lovelace/views/hui-panel-view.ts   |  2 +-
 src/panels/lovelace/views/hui-view.ts         |  2 +-
 src/state/themes-mixin.ts                     |  2 +-
 32 files changed, 444 insertions(+), 51 deletions(-)

diff --git a/hassio/src/hassio-main.ts b/hassio/src/hassio-main.ts
index 29966015f5..33bf94e573 100644
--- a/hassio/src/hassio-main.ts
+++ b/hassio/src/hassio-main.ts
@@ -3,7 +3,7 @@ import { PolymerElement } from "@polymer/polymer";
 import "@polymer/paper-icon-button";
 
 import "../../src/resources/ha-style";
-import applyThemesOnElement from "../../src/common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
 import { fireEvent } from "../../src/common/dom/fire_event";
 import {
   HassRouterPage,
diff --git a/src/common/dom/apply_themes_on_element.ts b/src/common/dom/apply_themes_on_element.ts
index 22b13893c0..5d5222ca7c 100644
--- a/src/common/dom/apply_themes_on_element.ts
+++ b/src/common/dom/apply_themes_on_element.ts
@@ -21,12 +21,12 @@ const hexToRgb = (hex: string): string | null => {
  * localTheme: selected theme.
  * updateMeta: boolean if we should update the theme-color meta element.
  */
-export default function applyThemesOnElement(
+export const applyThemesOnElement = (
   element,
   themes,
   localTheme,
   updateMeta = false
-) {
+) => {
   if (!element._themes) {
     element._themes = {};
   }
@@ -76,4 +76,4 @@ export default function applyThemesOnElement(
       styles["--primary-color"] || meta.getAttribute("default-content");
     meta.setAttribute("content", themeColor);
   }
-}
+};
diff --git a/src/fake_data/provide_hass.ts b/src/fake_data/provide_hass.ts
index bdb58eee00..f3101d5125 100644
--- a/src/fake_data/provide_hass.ts
+++ b/src/fake_data/provide_hass.ts
@@ -1,4 +1,4 @@
-import applyThemesOnElement from "../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 
 import { demoConfig } from "./demo_config";
 import { demoServices } from "./demo_services";
diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
index bcd217f305..c9f85e20ec 100644
--- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts
+++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
@@ -22,6 +22,7 @@ import {
 } from "../../../data/alarm_control_panel";
 import { AlarmPanelCardConfig } from "./types";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 const ICONS = {
   armed_away: "hass:shield-lock",
@@ -81,19 +82,44 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
     this._code = "";
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this.hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | AlarmPanelCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this.hass.themes, this._config.theme);
+    }
+  }
+
   protected shouldUpdate(changedProps: PropertyValues): boolean {
     if (changedProps.has("_config") || changedProps.has("_code")) {
       return true;
     }
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    if (oldHass) {
-      return (
-        oldHass.states[this._config!.entity] !==
-        this.hass!.states[this._config!.entity]
-      );
+
+    if (
+      !oldHass ||
+      oldHass.themes !== this.hass!.themes ||
+      oldHass.language !== this.hass!.language
+    ) {
+      return true;
     }
-    return true;
+    return (
+      oldHass.states[this._config!.entity] !==
+      this.hass!.states[this._config!.entity]
+    );
   }
 
   protected render(): TemplateResult | void {
diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index cc680c8d60..ce5a2df85b 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -22,7 +22,7 @@ import { createRowElement } from "../common/create-row-element";
 import { EntitiesCardConfig, EntitiesCardEntityConfig } from "./types";
 
 import { computeDomain } from "../../../common/entity/compute_domain";
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-entities-card")
 class HuiEntitiesCard extends LitElement implements LovelaceCard {
@@ -71,9 +71,22 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
     this._configEntities = entities;
   }
 
-  protected updated(changedProperties: PropertyValues): void {
-    super.updated(changedProperties);
-    if (this._hass && this._config) {
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this._hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | EntitiesCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
       applyThemesOnElement(this, this._hass.themes, this._config.theme);
     }
   }
diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
index ee79f1e80b..38a02242e2 100644
--- a/src/panels/lovelace/cards/hui-entity-button-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -19,7 +19,7 @@ import { isValidEntityId } from "../../../common/entity/valid_entity_id";
 import { stateIcon } from "../../../common/entity/state_icon";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 import { computeStateName } from "../../../common/entity/compute_state_name";
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeDomain } from "../../../common/entity/compute_domain";
 
 import { HomeAssistant, LightEntity } from "../../../types";
@@ -91,13 +91,19 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard {
     }
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    if (oldHass) {
-      return (
-        oldHass.states[this._config!.entity] !==
-        this.hass!.states[this._config!.entity]
-      );
+
+    if (
+      !oldHass ||
+      oldHass.themes !== this.hass!.themes ||
+      oldHass.language !== this.hass!.language
+    ) {
+      return true;
     }
-    return true;
+
+    return (
+      oldHass.states[this._config!.entity] !==
+      this.hass!.states[this._config!.entity]
+    );
   }
 
   protected render(): TemplateResult | void {
@@ -161,7 +167,16 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard {
       return;
     }
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    if (!oldHass || oldHass.themes !== this.hass.themes) {
+    const oldConfig = changedProps.get("_config") as
+      | EntityButtonCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
       applyThemesOnElement(this, this.hass.themes, this._config.theme);
     }
   }
diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index 8264931b39..da0a1b53ac 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -14,7 +14,7 @@ import "../../../components/ha-card";
 import "../components/hui-warning";
 
 import { isValidEntityId } from "../../../common/entity/valid_entity_id";
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { HomeAssistant } from "../../../types";
@@ -149,8 +149,16 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
     }
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | GaugeCardConfig
+      | undefined;
 
-    if (!oldHass || oldHass.themes !== this.hass.themes) {
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
       applyThemesOnElement(this, this.hass.themes, this._config.theme);
     }
   }
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 4e78f669dd..8b2daf8bd4 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -11,7 +11,7 @@ import {
 import { classMap } from "lit-html/directives/class-map";
 
 import { computeStateName } from "../../../common/entity/compute_state_name";
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import relativeTime from "../../../common/datetime/relative_time";
 
 import "../../../components/entity/state-badge";
@@ -87,17 +87,23 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
     }
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    if (oldHass && this._configEntities) {
-      for (const entity of this._configEntities) {
-        if (
-          oldHass.states[entity.entity] !== this.hass!.states[entity.entity]
-        ) {
-          return true;
-        }
-      }
-      return false;
+
+    if (
+      !this._configEntities ||
+      !oldHass ||
+      oldHass.themes !== this.hass!.themes ||
+      oldHass.language !== this.hass!.language
+    ) {
+      return true;
     }
-    return true;
+
+    for (const entity of this._configEntities) {
+      if (oldHass.states[entity.entity] !== this.hass!.states[entity.entity]) {
+        return true;
+      }
+    }
+
+    return false;
   }
 
   protected render(): TemplateResult | void {
@@ -117,14 +123,23 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  protected updated(changedProperties: PropertyValues): void {
-    super.updated(changedProperties);
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
     if (!this._config || !this.hass) {
       return;
     }
 
-    const oldHass = changedProperties.get("hass") as HomeAssistant | undefined;
-    if (!oldHass || oldHass.themes !== this.hass.themes) {
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | GlanceCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
       applyThemesOnElement(this, this.hass.themes, this._config.theme);
     }
   }
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index b93274b2a2..5aa4606197 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -11,7 +11,7 @@ import "@thomasloven/round-slider";
 
 import { stateIcon } from "../../../common/entity/state_icon";
 import { computeStateName } from "../../../common/entity/compute_state_name";
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
@@ -145,7 +145,16 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
     }
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    if (!oldHass || oldHass.themes !== this.hass.themes) {
+    const oldConfig = changedProps.get("_config") as
+      | LightCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
       applyThemesOnElement(this, this.hass.themes, this._config.theme);
     }
   }
diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts
index 1232a8e0b2..8ed40d8fda 100644
--- a/src/panels/lovelace/cards/hui-markdown-card.ts
+++ b/src/panels/lovelace/cards/hui-markdown-card.ts
@@ -6,6 +6,7 @@ import {
   property,
   css,
   CSSResult,
+  PropertyValues,
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
@@ -17,6 +18,7 @@ import { HomeAssistant } from "../../../types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
 import { MarkdownCardConfig } from "./types";
 import { subscribeRenderTemplate } from "../../../data/ws-templates";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-markdown-card")
 export class HuiMarkdownCard extends LitElement implements LovelaceCard {
@@ -84,6 +86,26 @@ export class HuiMarkdownCard extends LitElement implements LovelaceCard {
     `;
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this._hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | MarkdownCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this._hass.themes, this._config.theme);
+    }
+  }
+
   private async _connect() {
     if (!this._unsubRenderTemplate && this._hass && this._config) {
       this._unsubRenderTemplate = subscribeRenderTemplate(
diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index 36dffad8ab..b7a29d4dcd 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -6,6 +6,7 @@ import {
   property,
   css,
   CSSResult,
+  PropertyValues,
 } from "lit-element";
 
 import "../../../components/ha-card";
@@ -17,6 +18,7 @@ import { handleClick } from "../common/handle-click";
 import { longPress } from "../common/directives/long-press-directive";
 import { PictureCardConfig } from "./types";
 import { hasDoubleClick } from "../common/has-double-click";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-picture-card")
 export class HuiPictureCard extends LitElement implements LovelaceCard {
@@ -49,6 +51,26 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
     this._config = config;
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this.hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | PictureCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this.hass.themes, this._config.theme);
+    }
+  }
+
   protected render(): TemplateResult | void {
     if (!this._config || !this.hass) {
       return html``;
diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
index c135ce9265..66f97df653 100644
--- a/src/panels/lovelace/cards/hui-picture-elements-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -6,6 +6,7 @@ import {
   customElement,
   css,
   CSSResult,
+  PropertyValues,
 } from "lit-element";
 
 import { createStyledHuiElement } from "./picture-elements/create-styled-hui-element";
@@ -13,6 +14,7 @@ import { LovelaceCard } from "../types";
 import { HomeAssistant } from "../../../types";
 import { LovelaceElementConfig, LovelaceElement } from "../elements/types";
 import { PictureElementsCardConfig } from "./types";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-picture-elements-card")
 class HuiPictureElementsCard extends LitElement implements LovelaceCard {
@@ -49,6 +51,26 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
     this._config = config;
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this._hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | PictureElementsCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this._hass.themes, this._config.theme);
+    }
+  }
+
   protected render(): TemplateResult | void {
     if (!this._config) {
       return html``;
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index 22bef5170c..54880f88fe 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -26,6 +26,7 @@ import { UNAVAILABLE } from "../../../data/entity";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { PictureEntityCardConfig } from "./types";
 import { hasDoubleClick } from "../common/has-double-click";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-picture-entity-card")
 class HuiPictureEntityCard extends LitElement implements LovelaceCard {
@@ -68,6 +69,26 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard {
     return hasConfigOrEntityChanged(this, changedProps);
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this.hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | PictureEntityCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this.hass.themes, this._config.theme);
+    }
+  }
+
   protected render(): TemplateResult | void {
     if (!this._config || !this.hass) {
       return html``;
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index cbad92508d..bb40055ceb 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -28,6 +28,7 @@ import { handleClick } from "../common/handle-click";
 import { hasDoubleClick } from "../common/has-double-click";
 import { PictureGlanceCardConfig, PictureGlanceEntityConfig } from "./types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 const STATES_OFF = new Set(["closed", "locked", "not_home", "off"]);
 
@@ -93,6 +94,14 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
 
+    if (
+      !oldHass ||
+      oldHass.themes !== this.hass!.themes ||
+      oldHass.language !== this.hass!.language
+    ) {
+      return true;
+    }
+
     if (this._entitiesDialog) {
       for (const entity of this._entitiesDialog) {
         if (
@@ -116,6 +125,26 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
     return false;
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this.hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | PictureGlanceCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this.hass.themes, this._config.theme);
+    }
+  }
+
   protected render(): TemplateResult | void {
     if (!this._config || !this.hass) {
       return html``;
diff --git a/src/panels/lovelace/cards/hui-plant-status-card.ts b/src/panels/lovelace/cards/hui-plant-status-card.ts
index 8d4bc0f56d..82a3971602 100644
--- a/src/panels/lovelace/cards/hui-plant-status-card.ts
+++ b/src/panels/lovelace/cards/hui-plant-status-card.ts
@@ -20,6 +20,7 @@ import { HomeAssistant } from "../../../types";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { PlantStatusCardConfig, PlantAttributeTarget } from "./types";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 const SENSORS = {
   moisture: "hass:water",
@@ -60,6 +61,26 @@ class HuiPlantStatusCard extends LitElement implements LovelaceCard {
     return hasConfigOrEntityChanged(this, changedProps);
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this.hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | PlantStatusCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this.hass.themes, this._config.theme);
+    }
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass || !this._config) {
       return html``;
diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts
index c747334930..91a765533e 100644
--- a/src/panels/lovelace/cards/hui-sensor-card.ts
+++ b/src/panels/lovelace/cards/hui-sensor-card.ts
@@ -11,7 +11,7 @@ import {
 } from "lit-element";
 import "@polymer/paper-spinner/paper-spinner";
 
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { stateIcon } from "../../../common/entity/state_icon";
 
@@ -277,7 +277,16 @@ class HuiSensorCard extends LitElement implements LovelaceCard {
     }
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    if (!oldHass || oldHass.themes !== this.hass.themes) {
+    const oldConfig = changedProps.get("_config") as
+      | SensorCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
       applyThemesOnElement(this, this.hass.themes, this._config!.theme);
     }
 
diff --git a/src/panels/lovelace/cards/hui-shopping-list-card.ts b/src/panels/lovelace/cards/hui-shopping-list-card.ts
index 10f391e6aa..cb0426475a 100644
--- a/src/panels/lovelace/cards/hui-shopping-list-card.ts
+++ b/src/panels/lovelace/cards/hui-shopping-list-card.ts
@@ -6,6 +6,7 @@ import {
   CSSResult,
   property,
   customElement,
+  PropertyValues,
 } from "lit-element";
 import { repeat } from "lit-html/directives/repeat";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
@@ -23,7 +24,8 @@ import {
   clearItems,
   addItem,
 } from "../../../data/shopping-list";
-import { ShoppingListCardConfig } from "./types";
+import { ShoppingListCardConfig, SensorCardConfig } from "./types";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-shopping-list-card")
 class HuiShoppingListCard extends LitElement implements LovelaceCard {
@@ -77,6 +79,26 @@ class HuiShoppingListCard extends LitElement implements LovelaceCard {
     }
   }
 
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (!this._config || !this.hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | SensorCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this.hass.themes, this._config.theme);
+    }
+  }
+
   protected render(): TemplateResult | void {
     if (!this._config || !this.hass) {
       return html``;
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index d4ca705b41..631fd5b1b7 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -16,7 +16,7 @@ import "../../../components/ha-card";
 import "../../../components/ha-icon";
 import "../components/hui-warning";
 
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { hasConfigOrEntityChanged } from "../common/has-changed";
@@ -235,8 +235,16 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
     }
 
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | ThermostatCardConfig
+      | undefined;
 
-    if (!oldHass || oldHass.themes !== this.hass.themes) {
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
       applyThemesOnElement(this, this.hass.themes, this._config.theme);
     }
 
diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
index e17b06d311..df76105511 100644
--- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts
+++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
@@ -22,6 +22,7 @@ import { WeatherForecastCardConfig } from "./types";
 import { computeRTL } from "../../../common/util/compute_rtl";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { toggleAttribute } from "../../../common/dom/toggle_attribute";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 const cardinalDirections = [
   "N",
@@ -92,6 +93,23 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
 
   protected updated(changedProps: PropertyValues): void {
     super.updated(changedProps);
+    if (!this._config || !this.hass) {
+      return;
+    }
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    const oldConfig = changedProps.get("_config") as
+      | WeatherForecastCardConfig
+      | undefined;
+
+    if (
+      !oldHass ||
+      !oldConfig ||
+      oldHass.themes !== this.hass.themes ||
+      oldConfig.theme !== this._config.theme
+    ) {
+      applyThemesOnElement(this, this.hass.themes, this._config.theme);
+    }
+
     if (changedProps.has("hass")) {
       toggleAttribute(this, "rtl", computeRTL(this.hass!));
     }
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index dcdff54c76..7b0d74c5e5 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -8,6 +8,7 @@ export interface AlarmPanelCardConfig extends LovelaceCardConfig {
   entity: string;
   name?: string;
   states?: string[];
+  theme?: string;
 }
 
 export interface ConditionalCardConfig extends LovelaceCardConfig {
@@ -134,6 +135,7 @@ export interface MarkdownCardConfig extends LovelaceCardConfig {
   title?: string;
   card_size?: number;
   entity_ids?: string | string[];
+  theme?: string;
 }
 
 export interface MediaControlCardConfig extends LovelaceCardConfig {
@@ -145,6 +147,7 @@ export interface PictureCardConfig extends LovelaceCardConfig {
   tap_action?: ActionConfig;
   hold_action?: ActionConfig;
   double_tap_action?: ActionConfig;
+  theme?: string;
 }
 
 export interface PictureElementsCardConfig extends LovelaceCardConfig {
@@ -157,6 +160,7 @@ export interface PictureElementsCardConfig extends LovelaceCardConfig {
   aspect_ratio?: string;
   entity?: string;
   elements: LovelaceElementConfig[];
+  theme?: string;
 }
 
 export interface PictureEntityCardConfig extends LovelaceCardConfig {
@@ -173,6 +177,7 @@ export interface PictureEntityCardConfig extends LovelaceCardConfig {
   double_tap_action?: ActionConfig;
   show_name?: boolean;
   show_state?: boolean;
+  theme?: string;
 }
 
 export interface PictureGlanceCardConfig extends LovelaceCardConfig {
@@ -189,6 +194,7 @@ export interface PictureGlanceCardConfig extends LovelaceCardConfig {
   hold_action?: ActionConfig;
   double_tap_action?: ActionConfig;
   show_state?: boolean;
+  theme?: string;
 }
 
 export interface PlantAttributeTarget extends EventTarget {
@@ -198,6 +204,7 @@ export interface PlantAttributeTarget extends EventTarget {
 export interface PlantStatusCardConfig extends LovelaceCardConfig {
   name?: string;
   entity: string;
+  theme?: string;
 }
 
 export interface SensorCardConfig extends LovelaceCardConfig {
@@ -213,6 +220,7 @@ export interface SensorCardConfig extends LovelaceCardConfig {
 
 export interface ShoppingListCardConfig extends LovelaceCardConfig {
   title?: string;
+  theme?: string;
 }
 
 export interface StackCardConfig extends LovelaceCardConfig {
diff --git a/src/panels/lovelace/common/has-changed.ts b/src/panels/lovelace/common/has-changed.ts
index 904a7c2462..121e0e39e3 100644
--- a/src/panels/lovelace/common/has-changed.ts
+++ b/src/panels/lovelace/common/has-changed.ts
@@ -15,6 +15,13 @@ export function hasConfigOrEntityChanged(
     return true;
   }
 
+  if (
+    oldHass.themes !== element.hass!.themes ||
+    oldHass.language !== element.hass!.language
+  ) {
+    return true;
+  }
+
   return (
     oldHass.states[element._config!.entity] !==
       element.hass!.states[element._config!.entity] ||
diff --git a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
index 4a4e2c7d67..c7bcf454da 100644
--- a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
@@ -17,16 +17,18 @@ import { HomeAssistant } from "../../../../types";
 import { LovelaceCardEditor } from "../../types";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { configElementStyle } from "./config-elements-style";
+import { AlarmPanelCardConfig } from "../../cards/types";
 
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/ha-icon";
-import { AlarmPanelCardConfig } from "../../cards/types";
+import "../../components/hui-theme-select-editor";
 
 const cardConfigStruct = struct({
   type: "string",
   entity: "string?",
   name: "string?",
   states: "array?",
+  theme: "string?",
 });
 
 @customElement("hui-alarm-panel-card-editor")
@@ -53,6 +55,10 @@ export class HuiAlarmPanelCardEditor extends LitElement
     return this._config!.states || [];
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -113,6 +119,12 @@ export class HuiAlarmPanelCardEditor extends LitElement
             })}
           </paper-listbox>
         </paper-dropdown-menu>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
       </div>
     `;
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
index 364f7ebb63..22f60e30ce 100644
--- a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
@@ -16,10 +16,13 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { configElementStyle } from "./config-elements-style";
 import { MarkdownCardConfig } from "../../cards/types";
 
+import "../../components/hui-theme-select-editor";
+
 const cardConfigStruct = struct({
   type: "string",
   title: "string?",
   content: "string",
+  theme: "string?",
 });
 
 @customElement("hui-markdown-card-editor")
@@ -42,6 +45,10 @@ export class HuiMarkdownCardEditor extends LitElement
     return this._config!.content || "";
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -73,6 +80,12 @@ export class HuiMarkdownCardEditor extends LitElement
           autocomplete="off"
           spellcheck="false"
         ></paper-textarea>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
       </div>
     `;
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
index b68736e6b3..dacc3e7758 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
@@ -8,6 +8,7 @@ import {
 import "@polymer/paper-input/paper-input";
 
 import "../../components/hui-action-editor";
+import "../../components/hui-theme-select-editor";
 
 import { struct } from "../../common/structs/struct";
 import {
@@ -27,6 +28,7 @@ const cardConfigStruct = struct({
   image: "string?",
   tap_action: struct.optional(actionConfigStruct),
   hold_action: struct.optional(actionConfigStruct),
+  theme: "string?",
 });
 
 @customElement("hui-picture-card-editor")
@@ -53,6 +55,10 @@ export class HuiPictureCardEditor extends LitElement
     return this._config!.hold_action || { action: "none" };
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -98,6 +104,12 @@ export class HuiPictureCardEditor extends LitElement
             .configValue="${"hold_action"}"
             @action-changed="${this._valueChanged}"
           ></hui-action-editor>
+          <hui-theme-select-editor
+            .hass="${this.hass}"
+            .value="${this._theme}"
+            .configValue="${"theme"}"
+            @theme-changed="${this._valueChanged}"
+          ></hui-theme-select-editor>
         </div>
       </div>
     `;
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
index f63068b6eb..528ff23327 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
@@ -13,6 +13,7 @@ import "@polymer/paper-listbox/paper-listbox";
 import "../../components/hui-action-editor";
 import "../../components/hui-entity-editor";
 import "../../../../components/ha-switch";
+import "../../components/hui-theme-select-editor";
 
 import { struct } from "../../common/structs/struct";
 import {
@@ -39,6 +40,7 @@ const cardConfigStruct = struct({
   hold_action: struct.optional(actionConfigStruct),
   show_name: "boolean?",
   show_state: "boolean?",
+  theme: "string?",
 });
 
 @customElement("hui-picture-entity-card-editor")
@@ -93,6 +95,10 @@ export class HuiPictureEntityCardEditor extends LitElement
     return this._config!.show_state || true;
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -225,6 +231,12 @@ export class HuiPictureEntityCardEditor extends LitElement
             .configValue="${"hold_action"}"
             @action-changed="${this._valueChanged}"
           ></hui-action-editor>
+          <hui-theme-select-editor
+            .hass="${this.hass}"
+            .value="${this._theme}"
+            .configValue="${"theme"}"
+            @theme-changed="${this._valueChanged}"
+          ></hui-theme-select-editor>
         </div>
       </div>
     `;
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
index 1d5df3d946..9c5e73c23c 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
@@ -13,6 +13,7 @@ import "@polymer/paper-listbox/paper-listbox";
 import "../../components/hui-action-editor";
 import "../../components/hui-entity-editor";
 import "../../../../components/entity/ha-entity-picker";
+import "../../components/hui-theme-select-editor";
 
 import { struct } from "../../common/structs/struct";
 import {
@@ -41,6 +42,7 @@ const cardConfigStruct = struct({
   tap_action: struct.optional(actionConfigStruct),
   hold_action: struct.optional(actionConfigStruct),
   entities: [entitiesConfigStruct],
+  theme: "string?",
 });
 
 @customElement("hui-picture-glance-card-editor")
@@ -104,6 +106,10 @@ export class HuiPictureGlanceCardEditor extends LitElement
     return this._config!.show_state || false;
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -224,6 +230,12 @@ export class HuiPictureGlanceCardEditor extends LitElement
           .entities="${this._configEntities}"
           @entities-changed="${this._valueChanged}"
         ></hui-entity-editor>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
       </div>
     `;
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
index b95c170a7b..2b0fe94faa 100644
--- a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
@@ -9,6 +9,7 @@ import "@polymer/paper-input/paper-input";
 
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/ha-icon";
+import "../../components/hui-theme-select-editor";
 
 import { struct } from "../../common/structs/struct";
 import { EntitiesEditorEvent, EditorTarget } from "../types";
@@ -22,6 +23,7 @@ const cardConfigStruct = struct({
   type: "string",
   entity: "string",
   name: "string?",
+  theme: "string?",
 });
 
 @customElement("hui-plant-status-card-editor")
@@ -44,6 +46,10 @@ export class HuiPlantStatusCardEditor extends LitElement
     return this._config!.name || "";
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -75,6 +81,12 @@ export class HuiPlantStatusCardEditor extends LitElement
           .configValue="${"name"}"
           @value-changed="${this._valueChanged}"
         ></paper-input>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
       </div>
     `;
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
index c963bf9173..b75adbda1e 100644
--- a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
@@ -14,9 +14,12 @@ import { LovelaceCardEditor } from "../../types";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { ShoppingListCardConfig } from "../../cards/types";
 
+import "../../components/hui-theme-select-editor";
+
 const cardConfigStruct = struct({
   type: "string",
   title: "string?",
+  theme: "string?",
 });
 
 @customElement("hui-shopping-list-card-editor")
@@ -35,6 +38,10 @@ export class HuiShoppingListEditor extends LitElement
     return this._config!.title || "";
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -52,6 +59,12 @@ export class HuiShoppingListEditor extends LitElement
           .configValue="${"title"}"
           @value-changed="${this._valueChanged}"
         ></paper-input>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
       </div>
     `;
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
index 99df6a8a03..e45ed0a9f7 100644
--- a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
@@ -7,6 +7,7 @@ import {
 } from "lit-element";
 
 import "../../../../components/entity/ha-entity-picker";
+import "../../components/hui-theme-select-editor";
 
 import { struct } from "../../common/structs/struct";
 import { EntitiesEditorEvent, EditorTarget } from "../types";
@@ -20,6 +21,7 @@ const cardConfigStruct = struct({
   type: "string",
   entity: "string?",
   name: "string?",
+  theme: "string?",
 });
 
 @customElement("hui-weather-forecast-card-editor")
@@ -42,6 +44,10 @@ export class HuiWeatherForecastCardEditor extends LitElement
     return this._config!.name || "";
   }
 
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
   protected render(): TemplateResult | void {
     if (!this.hass) {
       return html``;
@@ -73,6 +79,12 @@ export class HuiWeatherForecastCardEditor extends LitElement
           .configValue="${"name"}"
           @value-changed="${this._valueChanged}"
         ></paper-input>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
       </div>
     `;
   }
diff --git a/src/panels/lovelace/views/hui-panel-view.ts b/src/panels/lovelace/views/hui-panel-view.ts
index 525465c05f..2b92d68f42 100644
--- a/src/panels/lovelace/views/hui-panel-view.ts
+++ b/src/panels/lovelace/views/hui-panel-view.ts
@@ -5,7 +5,7 @@ import {
   UpdatingElement,
 } from "lit-element";
 
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 import { HomeAssistant } from "../../../types";
 import { LovelaceCard } from "../types";
diff --git a/src/panels/lovelace/views/hui-view.ts b/src/panels/lovelace/views/hui-view.ts
index a9e413eb1d..22d2b15f37 100644
--- a/src/panels/lovelace/views/hui-view.ts
+++ b/src/panels/lovelace/views/hui-view.ts
@@ -9,7 +9,7 @@ import {
 import "../../../components/entity/ha-state-label-badge";
 // This one is for types
 
-import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 import {
   LovelaceViewConfig,
diff --git a/src/state/themes-mixin.ts b/src/state/themes-mixin.ts
index 4fd14c823a..6c151f2a71 100644
--- a/src/state/themes-mixin.ts
+++ b/src/state/themes-mixin.ts
@@ -1,4 +1,4 @@
-import applyThemesOnElement from "../common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 import { storeState } from "../util/ha-pref-storage";
 import { subscribeThemes } from "../data/ws-themes";
 import { HassBaseEl } from "./hass-base-mixin";

From be678b02c5c741b6da4273dc8fd0c8bf99451a31 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 21 Oct 2019 13:04:08 -0500
Subject: [PATCH 47/70] Convert more-info-weather to LitElement (#4073)

* Convert more-info-weather to LitElement

* address comments

* add shouldUpdate
---
 .../more-info/controls/more-info-weather.js   | 235 --------------
 .../more-info/controls/more-info-weather.ts   | 288 ++++++++++++++++++
 2 files changed, 288 insertions(+), 235 deletions(-)
 delete mode 100644 src/dialogs/more-info/controls/more-info-weather.js
 create mode 100644 src/dialogs/more-info/controls/more-info-weather.ts

diff --git a/src/dialogs/more-info/controls/more-info-weather.js b/src/dialogs/more-info/controls/more-info-weather.js
deleted file mode 100644
index a9309905cd..0000000000
--- a/src/dialogs/more-info/controls/more-info-weather.js
+++ /dev/null
@@ -1,235 +0,0 @@
-import "@polymer/iron-icon/iron-icon";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import LocalizeMixin from "../../../mixins/localize-mixin";
-
-/*
- * @appliesMixin LocalizeMixin
- */
-class MoreInfoWeather extends LocalizeMixin(PolymerElement) {
-  static get template() {
-    return html`
-      <style>
-        iron-icon {
-          color: var(--paper-item-icon-color);
-        }
-        .section {
-          margin: 16px 0 8px 0;
-          font-size: 1.2em;
-        }
-
-        .flex {
-          display: flex;
-          height: 32px;
-          align-items: center;
-        }
-
-        .main {
-          flex: 1;
-          margin-left: 24px;
-        }
-
-        .temp,
-        .templow {
-          min-width: 48px;
-          text-align: right;
-        }
-
-        .templow {
-          margin: 0 16px;
-          color: var(--secondary-text-color);
-        }
-
-        .attribution {
-          color: var(--secondary-text-color);
-          text-align: center;
-        }
-      </style>
-
-      <div class="flex">
-        <iron-icon icon="hass:thermometer"></iron-icon>
-        <div class="main">
-          [[localize('ui.card.weather.attributes.temperature')]]
-        </div>
-        <div>
-          [[stateObj.attributes.temperature]] [[getUnit('temperature')]]
-        </div>
-      </div>
-      <template is="dom-if" if="[[_showValue(stateObj.attributes.pressure)]]">
-        <div class="flex">
-          <iron-icon icon="hass:gauge"></iron-icon>
-          <div class="main">
-            [[localize('ui.card.weather.attributes.air_pressure')]]
-          </div>
-          <div>
-            [[stateObj.attributes.pressure]] [[getUnit('air_pressure')]]
-          </div>
-        </div>
-      </template>
-      <template is="dom-if" if="[[_showValue(stateObj.attributes.humidity)]]">
-        <div class="flex">
-          <iron-icon icon="hass:water-percent"></iron-icon>
-          <div class="main">
-            [[localize('ui.card.weather.attributes.humidity')]]
-          </div>
-          <div>[[stateObj.attributes.humidity]] %</div>
-        </div>
-      </template>
-      <template is="dom-if" if="[[_showValue(stateObj.attributes.wind_speed)]]">
-        <div class="flex">
-          <iron-icon icon="hass:weather-windy"></iron-icon>
-          <div class="main">
-            [[localize('ui.card.weather.attributes.wind_speed')]]
-          </div>
-          <div>
-            [[getWind(stateObj.attributes.wind_speed,
-            stateObj.attributes.wind_bearing, localize)]]
-          </div>
-        </div>
-      </template>
-      <template is="dom-if" if="[[_showValue(stateObj.attributes.visibility)]]">
-        <div class="flex">
-          <iron-icon icon="hass:eye"></iron-icon>
-          <div class="main">
-            [[localize('ui.card.weather.attributes.visibility')]]
-          </div>
-          <div>[[stateObj.attributes.visibility]] [[getUnit('length')]]</div>
-        </div>
-      </template>
-
-      <template is="dom-if" if="[[stateObj.attributes.forecast]]">
-        <div class="section">[[localize('ui.card.weather.forecast')]]:</div>
-        <template is="dom-repeat" items="[[stateObj.attributes.forecast]]">
-          <div class="flex">
-            <template is="dom-if" if="[[_showValue(item.condition)]]">
-              <iron-icon icon="[[getWeatherIcon(item.condition)]]"></iron-icon>
-            </template>
-            <template is="dom-if" if="[[!_showValue(item.templow)]]">
-              <div class="main">[[computeDateTime(item.datetime)]]</div>
-            </template>
-            <template is="dom-if" if="[[_showValue(item.templow)]]">
-              <div class="main">[[computeDate(item.datetime)]]</div>
-              <div class="templow">
-                [[item.templow]] [[getUnit('temperature')]]
-              </div>
-            </template>
-            <div class="temp">
-              [[item.temperature]] [[getUnit('temperature')]]
-            </div>
-          </div>
-        </template>
-      </template>
-
-      <template is="dom-if" if="stateObj.attributes.attribution">
-        <div class="attribution">[[stateObj.attributes.attribution]]</div>
-      </template>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: Object,
-      stateObj: Object,
-    };
-  }
-
-  constructor() {
-    super();
-    this.cardinalDirections = [
-      "N",
-      "NNE",
-      "NE",
-      "ENE",
-      "E",
-      "ESE",
-      "SE",
-      "SSE",
-      "S",
-      "SSW",
-      "SW",
-      "WSW",
-      "W",
-      "WNW",
-      "NW",
-      "NNW",
-      "N",
-    ];
-    this.weatherIcons = {
-      "clear-night": "hass:weather-night",
-      cloudy: "hass:weather-cloudy",
-      exceptional: "hass:alert-circle-outline",
-      fog: "hass:weather-fog",
-      hail: "hass:weather-hail",
-      lightning: "hass:weather-lightning",
-      "lightning-rainy": "hass:weather-lightning-rainy",
-      partlycloudy: "hass:weather-partly-cloudy",
-      pouring: "hass:weather-pouring",
-      rainy: "hass:weather-rainy",
-      snowy: "hass:weather-snowy",
-      "snowy-rainy": "hass:weather-snowy-rainy",
-      sunny: "hass:weather-sunny",
-      windy: "hass:weather-windy",
-      "windy-variant": "hass:weather-windy-variant",
-    };
-  }
-
-  computeDate(data) {
-    const date = new Date(data);
-    return date.toLocaleDateString(this.hass.language, {
-      weekday: "long",
-      month: "short",
-      day: "numeric",
-    });
-  }
-
-  computeDateTime(data) {
-    const date = new Date(data);
-    return date.toLocaleDateString(this.hass.language, {
-      weekday: "long",
-      hour: "numeric",
-    });
-  }
-
-  getUnit(measure) {
-    const lengthUnit = this.hass.config.unit_system.length || "";
-    switch (measure) {
-      case "air_pressure":
-        return lengthUnit === "km" ? "hPa" : "inHg";
-      case "length":
-        return lengthUnit;
-      case "precipitation":
-        return lengthUnit === "km" ? "mm" : "in";
-      default:
-        return this.hass.config.unit_system[measure] || "";
-    }
-  }
-
-  windBearingToText(degree) {
-    const degreenum = parseInt(degree);
-    if (isFinite(degreenum)) {
-      return this.cardinalDirections[(((degreenum + 11.25) / 22.5) | 0) % 16];
-    }
-    return degree;
-  }
-
-  getWind(speed, bearing, localize) {
-    if (bearing != null) {
-      const cardinalDirection = this.windBearingToText(bearing);
-      return `${speed} ${this.getUnit("length")}/h (${localize(
-        `ui.card.weather.cardinal_direction.${cardinalDirection.toLowerCase()}`
-      ) || cardinalDirection})`;
-    }
-    return `${speed} ${this.getUnit("length")}/h`;
-  }
-
-  getWeatherIcon(condition) {
-    return this.weatherIcons[condition];
-  }
-
-  _showValue(item) {
-    return typeof item !== "undefined" && item !== null;
-  }
-}
-
-customElements.define("more-info-weather", MoreInfoWeather);
diff --git a/src/dialogs/more-info/controls/more-info-weather.ts b/src/dialogs/more-info/controls/more-info-weather.ts
new file mode 100644
index 0000000000..8d14f80cac
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-weather.ts
@@ -0,0 +1,288 @@
+import "@polymer/iron-icon/iron-icon";
+import {
+  LitElement,
+  property,
+  CSSResult,
+  css,
+  customElement,
+  PropertyValues,
+} from "lit-element";
+import { HassEntity } from "home-assistant-js-websocket";
+import { TemplateResult, html } from "lit-html";
+
+import { HomeAssistant } from "../../../types";
+
+const cardinalDirections = [
+  "N",
+  "NNE",
+  "NE",
+  "ENE",
+  "E",
+  "ESE",
+  "SE",
+  "SSE",
+  "S",
+  "SSW",
+  "SW",
+  "WSW",
+  "W",
+  "WNW",
+  "NW",
+  "NNW",
+  "N",
+];
+
+const weatherIcons = {
+  "clear-night": "hass:weather-night",
+  cloudy: "hass:weather-cloudy",
+  exceptional: "hass:alert-circle-outline",
+  fog: "hass:weather-fog",
+  hail: "hass:weather-hail",
+  lightning: "hass:weather-lightning",
+  "lightning-rainy": "hass:weather-lightning-rainy",
+  partlycloudy: "hass:weather-partly-cloudy",
+  pouring: "hass:weather-pouring",
+  rainy: "hass:weather-rainy",
+  snowy: "hass:weather-snowy",
+  "snowy-rainy": "hass:weather-snowy-rainy",
+  sunny: "hass:weather-sunny",
+  windy: "hass:weather-windy",
+  "windy-variant": "hass:weather-windy-variant",
+};
+
+@customElement("more-info-weather")
+class MoreInfoWeather extends LitElement {
+  @property() public hass!: HomeAssistant;
+  @property() public stateObj?: HassEntity;
+
+  protected shouldUpdate(changedProps: PropertyValues): boolean {
+    if (changedProps.has("stateObj")) {
+      return true;
+    }
+
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    if (
+      !oldHass ||
+      oldHass.language !== this.hass.language ||
+      oldHass.config.unit_system !== this.hass.config.unit_system
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  protected render(): TemplateResult | void {
+    if (!this.hass || !this.stateObj) {
+      return html``;
+    }
+
+    return html`
+      <div class="flex">
+        <iron-icon icon="hass:thermometer"></iron-icon>
+        <div class="main">
+          ${this.hass.localize("ui.card.weather.attributes.temperature")}
+        </div>
+        <div>
+          ${this.stateObj.attributes.temperature} ${this.getUnit("temperature")}
+        </div>
+      </div>
+      ${this.stateObj.attributes.pressure
+        ? html`
+            <div class="flex">
+              <iron-icon icon="hass:gauge"></iron-icon>
+              <div class="main">
+                ${this.hass.localize("ui.card.weather.attributes.air_pressure")}
+              </div>
+              <div>
+                ${this.stateObj.attributes.pressure}
+                ${this.getUnit("air_pressure")}
+              </div>
+            </div>
+          `
+        : ""}
+      ${this.stateObj.attributes.humidity
+        ? html`
+            <div class="flex">
+              <iron-icon icon="hass:water-percent"></iron-icon>
+              <div class="main">
+                ${this.hass.localize("ui.card.weather.attributes.humidity")}
+              </div>
+              <div>${this.stateObj.attributes.humidity} %</div>
+            </div>
+          `
+        : ""}
+      ${this.stateObj.attributes.wind_speed
+        ? html`
+            <div class="flex">
+              <iron-icon icon="hass:weather-windy"></iron-icon>
+              <div class="main">
+                ${this.hass.localize("ui.card.weather.attributes.wind_speed")}
+              </div>
+              <div>
+                ${this.getWind(
+                  this.stateObj.attributes.wind_speed,
+                  this.stateObj.attributes.wind_bearing
+                )}
+              </div>
+            </div>
+          `
+        : ""}
+      ${this.stateObj.attributes.visibility
+        ? html`
+            <div class="flex">
+              <iron-icon icon="hass:eye"></iron-icon>
+              <div class="main">
+                ${this.hass.localize("ui.card.weather.attributes.visibility")}
+              </div>
+              <div>
+                ${this.stateObj.attributes.visibility} ${this.getUnit("length")}
+              </div>
+            </div>
+          `
+        : ""}
+      ${this.stateObj.attributes.forecast
+        ? html`
+            <div class="section">
+              ${this.hass.localize("ui.card.weather.forecast")}:
+            </div>
+            ${this.stateObj.attributes.forecast.map((item) => {
+              return html`
+                <div class="flex">
+                  ${item.condition
+                    ? html`
+                        <iron-icon
+                          .icon="${weatherIcons[item.condition]}"
+                        ></iron-icon>
+                      `
+                    : ""}
+                  ${!item.templow
+                    ? html`
+                        <div class="main">
+                          ${this.computeDateTime(item.datetime)}
+                        </div>
+                      `
+                    : ""}
+                  ${item.templow
+                    ? html`
+                        <div class="main">
+                          ${this.computeDate(item.datetime)}
+                        </div>
+                        <div class="templow">
+                          ${item.templow} ${this.getUnit("temperature")}
+                        </div>
+                      `
+                    : ""};
+                  <div class="temp">
+                    ${item.temperature} ${this.getUnit("temperature")}
+                  </div>
+                </div>
+              `;
+            })}
+          `
+        : ""}
+      ${this.stateObj.attributes.attribution
+        ? html`
+            <div class="attribution">
+              ${this.stateObj.attributes.attribution}
+            </div>
+          `
+        : ""}
+    `;
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      iron-icon {
+        color: var(--paper-item-icon-color);
+      }
+      .section {
+        margin: 16px 0 8px 0;
+        font-size: 1.2em;
+      }
+
+      .flex {
+        display: flex;
+        height: 32px;
+        align-items: center;
+      }
+
+      .main {
+        flex: 1;
+        margin-left: 24px;
+      }
+
+      .temp,
+      .templow {
+        min-width: 48px;
+        text-align: right;
+      }
+
+      .templow {
+        margin: 0 16px;
+        color: var(--secondary-text-color);
+      }
+
+      .attribution {
+        color: var(--secondary-text-color);
+        text-align: center;
+      }
+    `;
+  }
+
+  private computeDate(data) {
+    const date = new Date(data);
+    return date.toLocaleDateString(this.hass.language, {
+      weekday: "long",
+      month: "short",
+      day: "numeric",
+    });
+  }
+
+  private computeDateTime(data) {
+    const date = new Date(data);
+    return date.toLocaleDateString(this.hass.language, {
+      weekday: "long",
+      hour: "numeric",
+    });
+  }
+
+  private getUnit(measure: string): string {
+    const lengthUnit = this.hass.config.unit_system.length || "";
+    switch (measure) {
+      case "air_pressure":
+        return lengthUnit === "km" ? "hPa" : "inHg";
+      case "length":
+        return lengthUnit;
+      case "precipitation":
+        return lengthUnit === "km" ? "mm" : "in";
+      default:
+        return this.hass.config.unit_system[measure] || "";
+    }
+  }
+
+  private windBearingToText(degree: string): string {
+    const degreenum = parseInt(degree, 10);
+    if (isFinite(degreenum)) {
+      // tslint:disable-next-line: no-bitwise
+      return cardinalDirections[(((degreenum + 11.25) / 22.5) | 0) % 16];
+    }
+    return degree;
+  }
+
+  private getWind(speed: string, bearing: string) {
+    if (bearing != null) {
+      const cardinalDirection = this.windBearingToText(bearing);
+      return `${speed} ${this.getUnit("length")}/h (${this.hass.localize(
+        `ui.card.weather.cardinal_direction.${cardinalDirection.toLowerCase()}`
+      ) || cardinalDirection})`;
+    }
+    return `${speed} ${this.getUnit("length")}/h`;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "more-info-weather": MoreInfoWeather;
+  }
+}

From 3c0ba1d7eb27d49a2eae8003b15c7baec7ddbd01 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 21 Oct 2019 13:04:22 -0500
Subject: [PATCH 48/70] Convert more-info-sun to Lit (#4075)

* Convert more-info-sun to Lit

* address comments
---
 .../more-info/controls/more-info-sun.js       | 83 ------------------
 .../more-info/controls/more-info-sun.ts       | 84 +++++++++++++++++++
 2 files changed, 84 insertions(+), 83 deletions(-)
 delete mode 100644 src/dialogs/more-info/controls/more-info-sun.js
 create mode 100644 src/dialogs/more-info/controls/more-info-sun.ts

diff --git a/src/dialogs/more-info/controls/more-info-sun.js b/src/dialogs/more-info/controls/more-info-sun.js
deleted file mode 100644
index d806826f23..0000000000
--- a/src/dialogs/more-info/controls/more-info-sun.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import "@polymer/iron-flex-layout/iron-flex-layout-classes";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../../../components/ha-relative-time";
-
-import LocalizeMixin from "../../../mixins/localize-mixin";
-import formatTime from "../../../common/datetime/format_time";
-
-class MoreInfoSun extends LocalizeMixin(PolymerElement) {
-  static get template() {
-    return html`
-      <style include="iron-flex iron-flex-alignment"></style>
-
-      <template
-        is="dom-repeat"
-        items="[[computeOrder(risingDate, settingDate)]]"
-      >
-        <div class="data-entry layout justified horizontal">
-          <div class="key">
-            <span>[[itemCaption(item)]]</span>
-            <ha-relative-time
-              hass="[[hass]]"
-              datetime-obj="[[itemDate(item)]]"
-            ></ha-relative-time>
-          </div>
-          <div class="value">[[itemValue(item)]]</div>
-        </div>
-      </template>
-      <div class="data-entry layout justified horizontal">
-        <div class="key">
-          [[localize('ui.dialogs.more_info_control.sun.elevation')]]
-        </div>
-        <div class="value">[[stateObj.attributes.elevation]]</div>
-      </div>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: Object,
-      stateObj: Object,
-      risingDate: {
-        type: Object,
-        computed: "computeRising(stateObj)",
-      },
-
-      settingDate: {
-        type: Object,
-        computed: "computeSetting(stateObj)",
-      },
-    };
-  }
-
-  computeRising(stateObj) {
-    return new Date(stateObj.attributes.next_rising);
-  }
-
-  computeSetting(stateObj) {
-    return new Date(stateObj.attributes.next_setting);
-  }
-
-  computeOrder(risingDate, settingDate) {
-    return risingDate > settingDate ? ["set", "ris"] : ["ris", "set"];
-  }
-
-  itemCaption(type) {
-    if (type === "ris") {
-      return this.localize("ui.dialogs.more_info_control.sun.rising");
-    }
-    return this.localize("ui.dialogs.more_info_control.sun.setting");
-  }
-
-  itemDate(type) {
-    return type === "ris" ? this.risingDate : this.settingDate;
-  }
-
-  itemValue(type) {
-    return formatTime(this.itemDate(type), this.hass.language);
-  }
-}
-
-customElements.define("more-info-sun", MoreInfoSun);
diff --git a/src/dialogs/more-info/controls/more-info-sun.ts b/src/dialogs/more-info/controls/more-info-sun.ts
new file mode 100644
index 0000000000..088e686379
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-sun.ts
@@ -0,0 +1,84 @@
+import {
+  property,
+  LitElement,
+  TemplateResult,
+  html,
+  customElement,
+  CSSResult,
+  css,
+} from "lit-element";
+import { HassEntity } from "home-assistant-js-websocket";
+
+import "../../../components/ha-relative-time";
+
+import formatTime from "../../../common/datetime/format_time";
+import { HomeAssistant } from "../../../types";
+
+@customElement("more-info-sun")
+class MoreInfoSun extends LitElement {
+  @property() public hass!: HomeAssistant;
+  @property() public stateObj?: HassEntity;
+
+  protected render(): TemplateResult | void {
+    if (!this.hass || !this.stateObj) {
+      return html``;
+    }
+
+    const risingDate = new Date(this.stateObj.attributes.next_rising);
+    const settingDate = new Date(this.stateObj.attributes.next_setting);
+    const order = risingDate > settingDate ? ["set", "ris"] : ["ris", "set"];
+
+    return html`
+      ${order.map((item) => {
+        return html`
+          <div class="row">
+            <div class="key">
+              <span
+                >${item === "ris"
+                  ? this.hass.localize(
+                      "ui.dialogs.more_info_control.sun.rising"
+                    )
+                  : this.hass.localize(
+                      "ui.dialogs.more_info_control.sun.setting"
+                    )}</span
+              >
+              <ha-relative-time
+                .hass=${this.hass}
+                .datetimeObj=${item === "ris" ? risingDate : settingDate}
+              ></ha-relative-time>
+            </div>
+            <div class="value">
+              ${formatTime(
+                item === "ris" ? risingDate : settingDate,
+                this.hass.language
+              )}
+            </div>
+          </div>
+        `;
+      })}
+      <div class="row">
+        <div class="key">
+          ${this.hass.localize("ui.dialogs.more_info_control.sun.elevation")}
+        </div>
+        <div class="value">${this.stateObj.attributes.elevation}</div>
+      </div>
+    `;
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      .row {
+        margin: 0 8px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "more-info-sun": MoreInfoSun;
+  }
+}

From c25a38b82f936fd6193b3c2a1070aac94f574ae3 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 21 Oct 2019 14:03:01 -0500
Subject: [PATCH 49/70] add actions to state-badge element and
 state-label-badge (default Lovelace badge type) (#4028)

* add actions to state-badge element

* address comments

state-label-badge no longer handles clicks
added actions to hui-state-label-badge
moved ha-badges-card to Lit
---
 src/cards/ha-badges-card.js                   | 31 -------------
 src/cards/ha-badges-card.ts                   | 45 +++++++++++++++++++
 src/components/entity/ha-state-label-badge.ts | 11 -----
 .../lovelace/badges/hui-state-label-badge.ts  | 21 +++++++++
 src/panels/lovelace/badges/types.ts           |  5 ++-
 .../elements/hui-state-badge-element.ts       | 21 +++++++++
 .../elements/hui-state-label-element.ts       |  1 -
 src/panels/lovelace/elements/types.ts         |  3 ++
 8 files changed, 94 insertions(+), 44 deletions(-)
 delete mode 100644 src/cards/ha-badges-card.js
 create mode 100644 src/cards/ha-badges-card.ts

diff --git a/src/cards/ha-badges-card.js b/src/cards/ha-badges-card.js
deleted file mode 100644
index 6b62930888..0000000000
--- a/src/cards/ha-badges-card.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../components/entity/ha-state-label-badge";
-
-class HaBadgesCard extends PolymerElement {
-  static get template() {
-    return html`
-      <style>
-        ha-state-label-badge {
-          display: inline-block;
-          margin-bottom: var(--ha-state-label-badge-margin-bottom, 16px);
-        }
-      </style>
-      <template is="dom-repeat" items="[[states]]">
-        <ha-state-label-badge
-          hass="[[hass]]"
-          state="[[item]]"
-        ></ha-state-label-badge>
-      </template>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: Object,
-      states: Array,
-    };
-  }
-}
-customElements.define("ha-badges-card", HaBadgesCard);
diff --git a/src/cards/ha-badges-card.ts b/src/cards/ha-badges-card.ts
new file mode 100644
index 0000000000..7e12681456
--- /dev/null
+++ b/src/cards/ha-badges-card.ts
@@ -0,0 +1,45 @@
+import { TemplateResult, html } from "lit-html";
+import { customElement, LitElement, property } from "lit-element";
+import { HassEntity } from "home-assistant-js-websocket";
+
+import "../components/entity/ha-state-label-badge";
+
+import { HomeAssistant } from "../types";
+import { fireEvent } from "../common/dom/fire_event";
+
+@customElement("ha-badges-card")
+class HaBadgesCard extends LitElement {
+  @property() public hass?: HomeAssistant;
+  @property() public states?: HassEntity[];
+
+  protected render(): TemplateResult | void {
+    if (!this.hass || !this.states) {
+      return html``;
+    }
+
+    return html`
+      ${this.states.map(
+        (state) => html`
+          <ha-state-label-badge
+            .hass=${this.hass}
+            .state=${state}
+            @click=${this._handleClick}
+          ></ha-state-label-badge>
+        `
+      )}
+    `;
+  }
+
+  private _handleClick(ev: Event) {
+    const entityId = ((ev.target as any).state as HassEntity).entity_id;
+    fireEvent(this, "hass-more-info", {
+      entityId,
+    });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-badges-card": HaBadgesCard;
+  }
+}
diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts
index 2d82e82095..33f7e1e5c1 100644
--- a/src/components/entity/ha-state-label-badge.ts
+++ b/src/components/entity/ha-state-label-badge.ts
@@ -11,7 +11,6 @@ import {
 
 import { HassEntity } from "home-assistant-js-websocket";
 import { classMap } from "lit-html/directives/class-map";
-import { fireEvent } from "../../common/dom/fire_event";
 import { HomeAssistant } from "../../types";
 
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
@@ -90,16 +89,6 @@ export class HaStateLabelBadge extends LitElement {
     `;
   }
 
-  protected firstUpdated(changedProperties: PropertyValues): void {
-    super.firstUpdated(changedProperties);
-    this.addEventListener("click", (ev) => {
-      ev.stopPropagation();
-      if (this.state) {
-        fireEvent(this, "hass-more-info", { entityId: this.state.entity_id });
-      }
-    });
-  }
-
   protected updated(changedProperties: PropertyValues): void {
     super.updated(changedProperties);
 
diff --git a/src/panels/lovelace/badges/hui-state-label-badge.ts b/src/panels/lovelace/badges/hui-state-label-badge.ts
index acef603a0a..d0523880a0 100644
--- a/src/panels/lovelace/badges/hui-state-label-badge.ts
+++ b/src/panels/lovelace/badges/hui-state-label-badge.ts
@@ -13,6 +13,9 @@ import { LovelaceBadge } from "../types";
 import { HomeAssistant } from "../../../types";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { StateLabelBadgeConfig } from "./types";
+import { longPress } from "../common/directives/long-press-directive";
+import { hasDoubleClick } from "../common/has-double-click";
+import { handleClick } from "../common/handle-click";
 
 @customElement("hui-state-label-badge")
 export class HuiStateLabelBadge extends LitElement implements LovelaceBadge {
@@ -41,9 +44,27 @@ export class HuiStateLabelBadge extends LitElement implements LovelaceBadge {
           : ""}
         .icon=${this._config.icon}
         .image=${this._config.image}
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
       ></ha-state-label-badge>
     `;
   }
+
+  private _handleClick() {
+    handleClick(this, this.hass!, this._config!, false, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
+  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/badges/types.ts b/src/panels/lovelace/badges/types.ts
index e462a0a4ee..7b28dae4fb 100644
--- a/src/panels/lovelace/badges/types.ts
+++ b/src/panels/lovelace/badges/types.ts
@@ -1,4 +1,4 @@
-import { LovelaceBadgeConfig } from "../../../data/lovelace";
+import { LovelaceBadgeConfig, ActionConfig } from "../../../data/lovelace";
 import { EntityFilterEntityConfig } from "../entity-rows/types";
 
 export interface EntityFilterBadgeConfig extends LovelaceBadgeConfig {
@@ -16,4 +16,7 @@ export interface StateLabelBadgeConfig extends LovelaceBadgeConfig {
   name?: string;
   icon?: string;
   image?: string;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }
diff --git a/src/panels/lovelace/elements/hui-state-badge-element.ts b/src/panels/lovelace/elements/hui-state-badge-element.ts
index 5102112bdb..8fa9722318 100644
--- a/src/panels/lovelace/elements/hui-state-badge-element.ts
+++ b/src/panels/lovelace/elements/hui-state-badge-element.ts
@@ -14,6 +14,9 @@ import { computeStateName } from "../../../common/entity/compute_state_name";
 import { LovelaceElement, StateBadgeElementConfig } from "./types";
 import { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
+import { longPress } from "../common/directives/long-press-directive";
+import { hasDoubleClick } from "../common/has-double-click";
+import { handleClick } from "../common/handle-click";
 
 @customElement("hui-state-badge-element")
 export class HuiStateBadgeElement extends LitElement
@@ -61,9 +64,27 @@ export class HuiStateBadgeElement extends LitElement
           : this._config.title === null
           ? ""
           : this._config.title}"
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config!.double_tap_action),
+        })}
       ></ha-state-label-badge>
     `;
   }
+
+  private _handleClick() {
+    handleClick(this, this.hass!, this._config!, false, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick() {
+    handleClick(this, this.hass!, this._config!, false, true);
+  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/elements/hui-state-label-element.ts b/src/panels/lovelace/elements/hui-state-label-element.ts
index 37c629b455..bef30f904b 100644
--- a/src/panels/lovelace/elements/hui-state-label-element.ts
+++ b/src/panels/lovelace/elements/hui-state-label-element.ts
@@ -9,7 +9,6 @@ import {
   PropertyValues,
 } from "lit-element";
 
-import "../../../components/entity/ha-state-label-badge";
 import "../components/hui-warning-element";
 
 import { computeStateDisplay } from "../../../common/entity/compute_state_display";
diff --git a/src/panels/lovelace/elements/types.ts b/src/panels/lovelace/elements/types.ts
index 2aec666e38..7c848c64ea 100644
--- a/src/panels/lovelace/elements/types.ts
+++ b/src/panels/lovelace/elements/types.ts
@@ -48,6 +48,9 @@ export interface ServiceButtonElementConfig extends LovelaceElementConfig {
 export interface StateBadgeElementConfig extends LovelaceElementConfig {
   entity: string;
   title?: string;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }
 
 export interface StateIconElementConfig extends LovelaceElementConfig {

From 3973374f3f5216e42bbda2e1124716d61f229fe7 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 21 Oct 2019 21:36:26 +0200
Subject: [PATCH 50/70] Add positive_time_period_dict to ha-form (#4090)

* Add positive_time_period_dict to ha-form

* select input on focus

* Update ha-form-positive_time_period_dict.ts
---
 src/components/ha-form/ha-form-float.ts       |   8 +-
 src/components/ha-form/ha-form-integer.ts     |   8 +-
 .../ha-form-positive_time_period_dict.ts      | 119 ++++++++++++++
 src/components/ha-form/ha-form.ts             |  16 +-
 src/components/paper-time-input.js            | 151 ++++++++++++++++--
 5 files changed, 279 insertions(+), 23 deletions(-)
 create mode 100644 src/components/ha-form/ha-form-positive_time_period_dict.ts

diff --git a/src/components/ha-form/ha-form-float.ts b/src/components/ha-form/ha-form-float.ts
index 0d2279ea72..d2d41990aa 100644
--- a/src/components/ha-form/ha-form-float.ts
+++ b/src/components/ha-form/ha-form-float.ts
@@ -32,7 +32,7 @@ export class HaFormFloat extends LitElement implements HaFormElement {
     return html`
       <paper-input
         .label=${this.label}
-        .value=${this.data}
+        .value=${this._value}
         .required=${this.schema.required}
         .autoValidate=${this.schema.required}
         @value-changed=${this._valueChanged}
@@ -42,9 +42,13 @@ export class HaFormFloat extends LitElement implements HaFormElement {
     `;
   }
 
+  private get _value() {
+    return this.data || 0;
+  }
+
   private _valueChanged(ev: Event) {
     const value = Number((ev.target as PaperInputElement).value);
-    if (this.data === value) {
+    if (this._value === value) {
       return;
     }
     fireEvent(
diff --git a/src/components/ha-form/ha-form-integer.ts b/src/components/ha-form/ha-form-integer.ts
index 4b38678e52..996110852b 100644
--- a/src/components/ha-form/ha-form-integer.ts
+++ b/src/components/ha-form/ha-form-integer.ts
@@ -41,7 +41,7 @@ export class HaFormInteger extends LitElement implements HaFormElement {
             ${this.label}
             <ha-paper-slider
               pin=""
-              .value=${this.data}
+              .value=${this._value}
               .min=${this.schema.valueMin}
               .max=${this.schema.valueMax}
               @value-changed=${this._valueChanged}
@@ -60,11 +60,15 @@ export class HaFormInteger extends LitElement implements HaFormElement {
         `;
   }
 
+  private get _value() {
+    return this.data || 0;
+  }
+
   private _valueChanged(ev: Event) {
     const value = Number(
       (ev.target as PaperInputElement | PaperSliderElement).value
     );
-    if (this.data === value) {
+    if (this._value === value) {
       return;
     }
     fireEvent(
diff --git a/src/components/ha-form/ha-form-positive_time_period_dict.ts b/src/components/ha-form/ha-form-positive_time_period_dict.ts
new file mode 100644
index 0000000000..5794f34d2e
--- /dev/null
+++ b/src/components/ha-form/ha-form-positive_time_period_dict.ts
@@ -0,0 +1,119 @@
+import {
+  customElement,
+  LitElement,
+  html,
+  property,
+  TemplateResult,
+  query,
+} from "lit-element";
+import { HaFormElement, HaFormTimeData, HaFormTimeSchema } from "./ha-form";
+import { fireEvent } from "../../common/dom/fire_event";
+
+@customElement("ha-form-positive_time_period_dict")
+export class HaFormTimePeriod extends LitElement implements HaFormElement {
+  @property() public schema!: HaFormTimeSchema;
+  @property() public data!: HaFormTimeData;
+  @property() public label!: string;
+  @property() public suffix!: string;
+  @query("paper-time-input") private _input?: HTMLElement;
+
+  public focus() {
+    if (this._input) {
+      this._input.focus();
+    }
+  }
+
+  protected render(): TemplateResult | void {
+    return html`
+      <paper-time-input
+        .label=${this.label}
+        .required=${this.schema.required}
+        .autoValidate=${this.schema.required}
+        error-message="Required"
+        enable-second
+        format="24"
+        .hour=${this._parseDuration(this._hours)}
+        .min=${this._parseDuration(this._minutes)}
+        .sec=${this._parseDuration(this._seconds)}
+        @hour-changed=${this._hourChanged}
+        @min-changed=${this._minChanged}
+        @sec-changed=${this._secChanged}
+        float-input-labels
+        no-hours-limit
+        always-float-input-labels
+        hour-label="hh"
+        min-label="mm"
+        sec-label="ss"
+      ></paper-time-input>
+    `;
+  }
+
+  private get _hours() {
+    return this.data && this.data.hours ? Number(this.data.hours) : 0;
+  }
+
+  private get _minutes() {
+    return this.data && this.data.minutes ? Number(this.data.minutes) : 0;
+  }
+
+  private get _seconds() {
+    return this.data && this.data.seconds ? Number(this.data.seconds) : 0;
+  }
+
+  private _parseDuration(value) {
+    return value.toString().padStart(2, "0");
+  }
+
+  private _hourChanged(ev) {
+    this._durationChanged(ev, "hours");
+  }
+
+  private _minChanged(ev) {
+    this._durationChanged(ev, "minutes");
+  }
+
+  private _secChanged(ev) {
+    this._durationChanged(ev, "seconds");
+  }
+
+  private _durationChanged(ev, unit) {
+    let value = Number(ev.detail.value);
+
+    if (value === this[`_${unit}`]) {
+      return;
+    }
+
+    let hours = this._hours;
+    let minutes = this._minutes;
+
+    if (unit === "seconds" && value > 59) {
+      minutes = minutes + Math.floor(value / 60);
+      value %= 60;
+    }
+
+    if (unit === "minutes" && value > 59) {
+      hours = hours + Math.floor(value / 60);
+      value %= 60;
+    }
+
+    fireEvent(
+      this,
+      "value-changed",
+      {
+        value: {
+          hours,
+          minutes,
+          seconds: this._seconds,
+          ...{ [unit]: value },
+        },
+      },
+      { bubbles: false }
+    );
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-form-positive_time_period_dict": HaFormTimePeriod;
+  }
+}
diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts
index a8fe7d813d..48973c63b9 100644
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -14,6 +14,7 @@ import "./ha-form-integer";
 import "./ha-form-float";
 import "./ha-form-boolean";
 import "./ha-form-select";
+import "./ha-form-positive_time_period_dict";
 import { fireEvent } from "../../common/dom/fire_event";
 
 export type HaFormSchema =
@@ -21,7 +22,8 @@ export type HaFormSchema =
   | HaFormIntegerSchema
   | HaFormFloatSchema
   | HaFormBooleanSchema
-  | HaFormSelectSchema;
+  | HaFormSelectSchema
+  | HaFormTimeSchema;
 
 export interface HaFormBaseSchema {
   name: string;
@@ -55,6 +57,10 @@ export interface HaFormBooleanSchema extends HaFormBaseSchema {
   type: "boolean";
 }
 
+export interface HaFormTimeSchema extends HaFormBaseSchema {
+  type: "time";
+}
+
 export interface HaFormDataContainer {
   [key: string]: HaFormData;
 }
@@ -64,13 +70,19 @@ export type HaFormData =
   | HaFormIntegerData
   | HaFormFloatData
   | HaFormBooleanData
-  | HaFormSelectData;
+  | HaFormSelectData
+  | HaFormTimeData;
 
 export type HaFormStringData = string;
 export type HaFormIntegerData = number;
 export type HaFormFloatData = number;
 export type HaFormBooleanData = boolean;
 export type HaFormSelectData = string;
+export interface HaFormTimeData {
+  hours?: number;
+  minutes?: number;
+  seconds?: number;
+}
 
 export interface HaFormElement extends LitElement {
   schema: HaFormSchema;
diff --git a/src/components/paper-time-input.js b/src/components/paper-time-input.js
index 2a2d5bb52b..620da4d7b1 100644
--- a/src/components/paper-time-input.js
+++ b/src/components/paper-time-input.js
@@ -87,6 +87,10 @@ export class PaperTimeInput extends PolymerElement {
 
         label {
           @apply --paper-font-caption;
+          color: var(
+            --paper-input-container-color,
+            var(--secondary-text-color)
+          );
         }
 
         .time-input-wrap {
@@ -106,14 +110,17 @@ export class PaperTimeInput extends PolymerElement {
           id="hour"
           type="number"
           value="{{hour}}"
+          label="[[hourLabel]]"
           on-change="_shouldFormatHour"
-          required=""
+          on-focus="_onFocus"
+          required
+          prevent-invalid-input
           auto-validate="[[autoValidate]]"
-          prevent-invalid-input=""
           maxlength="2"
           max="[[_computeHourMax(format)]]"
           min="0"
-          no-label-float=""
+          no-label-float$="[[!floatInputLabels]]"
+          always-float-label$="[[alwaysFloatInputLabels]]"
           disabled="[[disabled]]"
         >
           <span suffix="" slot="suffix">:</span>
@@ -124,15 +131,40 @@ export class PaperTimeInput extends PolymerElement {
           id="min"
           type="number"
           value="{{min}}"
+          label="[[minLabel]]"
           on-change="_formatMin"
-          required=""
+          on-focus="_onFocus"
+          required
           auto-validate="[[autoValidate]]"
-          prevent-invalid-input=""
+          prevent-invalid-input
           maxlength="2"
           max="59"
           min="0"
-          no-label-float=""
+          no-label-float$="[[!floatInputLabels]]"
+          always-float-label$="[[alwaysFloatInputLabels]]"
           disabled="[[disabled]]"
+        >
+          <span hidden$="[[!enableSecond]]" suffix slot="suffix">:</span>
+        </paper-input>
+
+        <!-- Sec Input -->
+        <paper-input
+          id="sec"
+          type="number"
+          value="{{sec}}"
+          label="[[secLabel]]"
+          on-change="_formatSec"
+          on-focus="_onFocus"
+          required
+          auto-validate="[[autoValidate]]"
+          prevent-invalid-input
+          maxlength="2"
+          max="59"
+          min="0"
+          no-label-float$="[[!floatInputLabels]]"
+          always-float-label$="[[alwaysFloatInputLabels]]"
+          disabled="[[disabled]]"
+          hidden$="[[!enableSecond]]"
         >
         </paper-input>
 
@@ -180,6 +212,20 @@ export class PaperTimeInput extends PolymerElement {
         type: Boolean,
         value: false,
       },
+      /**
+       * float the input labels
+       */
+      floatInputLabels: {
+        type: Boolean,
+        value: false,
+      },
+      /**
+       * always float the input labels
+       */
+      alwaysFloatInputLabels: {
+        type: Boolean,
+        value: false,
+      },
       /**
        * 12 or 24 hr format
        */
@@ -208,6 +254,48 @@ export class PaperTimeInput extends PolymerElement {
         type: String,
         notify: true,
       },
+      /**
+       * second
+       */
+      sec: {
+        type: String,
+        notify: true,
+      },
+      /**
+       * Suffix for the hour input
+       */
+      hourLabel: {
+        type: String,
+        value: "",
+      },
+      /**
+       * Suffix for the min input
+       */
+      minLabel: {
+        type: String,
+        value: ":",
+      },
+      /**
+       * Suffix for the sec input
+       */
+      secLabel: {
+        type: String,
+        value: "",
+      },
+      /**
+       * show the sec field
+       */
+      enableSecond: {
+        type: Boolean,
+        value: false,
+      },
+      /**
+       * limit hours input
+       */
+      noHoursLimit: {
+        type: Boolean,
+        value: false,
+      },
       /**
        * AM or PM
        */
@@ -223,7 +311,7 @@ export class PaperTimeInput extends PolymerElement {
         type: String,
         notify: true,
         readOnly: true,
-        computed: "_computeTime(min, hour, amPm)",
+        computed: "_computeTime(min, hour, sec, amPm)",
       },
     };
   }
@@ -238,6 +326,10 @@ export class PaperTimeInput extends PolymerElement {
     if (!this.$.hour.validate() | !this.$.min.validate()) {
       valid = false;
     }
+    // Validate second field
+    if (this.enableSecond && !this.$.sec.validate()) {
+      valid = false;
+    }
     // Validate AM PM if 12 hour time
     if (this.format === 12 && !this.$.dropdown.validate()) {
       valid = false;
@@ -248,15 +340,37 @@ export class PaperTimeInput extends PolymerElement {
   /**
    * Create time string
    */
-  _computeTime(min, hour, amPm) {
-    if (hour && min) {
-      // No ampm on 24 hr time
-      if (this.format === 24) {
-        amPm = "";
+  _computeTime(min, hour, sec, amPm) {
+    let str;
+    if (hour || min || (sec && this.enableSecond)) {
+      hour = hour || "00";
+      min = min || "00";
+      sec = sec || "00";
+      str = hour + ":" + min;
+      // add sec field
+      if (this.enableSecond && sec) {
+        str = str + ":" + sec;
+      }
+      // No ampm on 24 hr time
+      if (this.format === 12) {
+        str = str + " " + amPm;
       }
-      return hour + ":" + min + " " + amPm;
     }
-    return undefined;
+
+    return str;
+  }
+
+  _onFocus(ev) {
+    ev.target.inputElement.inputElement.select();
+  }
+
+  /**
+   * Format sec
+   */
+  _formatSec() {
+    if (this.sec.toString().length === 1) {
+      this.sec = this.sec.toString().padStart(2, "0");
+    }
   }
 
   /**
@@ -264,16 +378,16 @@ export class PaperTimeInput extends PolymerElement {
    */
   _formatMin() {
     if (this.min.toString().length === 1) {
-      this.min = this.min < 10 ? "0" + this.min : this.min;
+      this.min = this.min.toString().padStart(2, "0");
     }
   }
 
   /**
-   * Hour needs a leading zero in 24hr format
+   * Format hour
    */
   _shouldFormatHour() {
     if (this.format === 24 && this.hour.toString().length === 1) {
-      this.hour = this.hour < 10 ? "0" + this.hour : this.hour;
+      this.hour = this.hour.toString().padStart(2, "0");
     }
   }
 
@@ -281,6 +395,9 @@ export class PaperTimeInput extends PolymerElement {
    * 24 hour format has a max hr of 23
    */
   _computeHourMax(format) {
+    if (this.noHoursLimit) {
+      return null;
+    }
     if (format === 12) {
       return format;
     }

From 2424376fba12c5070a56aaae063cb6cb951fd8c6 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 21 Oct 2019 21:40:16 +0200
Subject: [PATCH 51/70] Change ha-device-picker to combo box + improve name
 handling + show area (#4089)

* Change ha-device-picker to combo box + improve name handling + show area

* unused import
---
 src/components/device/ha-device-picker.ts | 205 ++++++++++++++++++----
 1 file changed, 168 insertions(+), 37 deletions(-)

diff --git a/src/components/device/ha-device-picker.ts b/src/components/device/ha-device-picker.ts
index edea4378c5..80da813f6b 100644
--- a/src/components/device/ha-device-picker.ts
+++ b/src/components/device/ha-device-picker.ts
@@ -1,7 +1,7 @@
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu-light";
+import "@vaadin/vaadin-combo-box/vaadin-combo-box-light";
 import "@polymer/paper-listbox/paper-listbox";
 import memoizeOne from "memoize-one";
 import {
@@ -23,52 +23,165 @@ import {
   subscribeDeviceRegistry,
 } from "../../data/device_registry";
 import { compare } from "../../common/string/compare";
+import { PolymerChangedEvent } from "../../polymer-types";
+import {
+  AreaRegistryEntry,
+  subscribeAreaRegistry,
+} from "../../data/area_registry";
+import { DeviceEntityLookup } from "../../panels/config/devices/ha-devices-data-table";
+import {
+  EntityRegistryEntry,
+  subscribeEntityRegistry,
+} from "../../data/entity_registry";
+import { computeStateName } from "../../common/entity/compute_state_name";
+
+interface Device {
+  name: string;
+  area: string;
+  id: string;
+}
+
+const rowRenderer = (root: HTMLElement, _owner, model: { item: Device }) => {
+  if (!root.firstElementChild) {
+    root.innerHTML = `
+    <style>
+      paper-item {
+        margin: -10px 0;
+        padding: 0;
+      }
+    </style>
+    <paper-item>
+      <paper-item-body two-line="">    
+        <div class='name'>[[item.name]]</div>
+        <div secondary>[[item.area]]</div>
+      </paper-item-body>
+    </paper-item>
+    `;
+  }
+
+  root.querySelector(".name")!.textContent = model.item.name!;
+  root.querySelector("[secondary]")!.textContent = model.item.area!;
+};
 
 @customElement("ha-device-picker")
 class HaDevicePicker extends SubscribeMixin(LitElement) {
-  @property() public hass?: HomeAssistant;
+  @property() public hass!: HomeAssistant;
   @property() public label?: string;
   @property() public value?: string;
   @property() public devices?: DeviceRegistryEntry[];
+  @property() public areas?: AreaRegistryEntry[];
+  @property() public entities?: EntityRegistryEntry[];
+  @property({ type: Boolean }) private _opened?: boolean;
 
-  private _sortedDevices = memoizeOne((devices?: DeviceRegistryEntry[]) => {
-    if (!devices || devices.length === 1) {
-      return devices || [];
+  private _getDevices = memoizeOne(
+    (
+      devices: DeviceRegistryEntry[],
+      areas: AreaRegistryEntry[],
+      entities: EntityRegistryEntry[]
+    ): Device[] => {
+      if (!devices.length) {
+        return [];
+      }
+
+      const deviceEntityLookup: DeviceEntityLookup = {};
+      for (const entity of entities) {
+        if (!entity.device_id) {
+          continue;
+        }
+        if (!(entity.device_id in deviceEntityLookup)) {
+          deviceEntityLookup[entity.device_id] = [];
+        }
+        deviceEntityLookup[entity.device_id].push(entity);
+      }
+
+      const areaLookup: { [areaId: string]: AreaRegistryEntry } = {};
+      for (const area of areas) {
+        areaLookup[area.area_id] = area;
+      }
+
+      const outputDevices = devices.map((device) => {
+        return {
+          id: device.id,
+          name:
+            device.name_by_user ||
+            device.name ||
+            this._fallbackDeviceName(device.id, deviceEntityLookup) ||
+            "No name",
+          area: device.area_id ? areaLookup[device.area_id].name : "No area",
+        };
+      });
+      if (outputDevices.length === 1) {
+        return outputDevices;
+      }
+      return outputDevices.sort((a, b) => compare(a.name || "", b.name || ""));
     }
-    const sorted = [...devices];
-    sorted.sort((a, b) => compare(a.name || "", b.name || ""));
-    return sorted;
-  });
+  );
 
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
-      subscribeDeviceRegistry(this.hass!.connection!, (devices) => {
+      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
         this.devices = devices;
       }),
+      subscribeAreaRegistry(this.hass.connection!, (areas) => {
+        this.areas = areas;
+      }),
+      subscribeEntityRegistry(this.hass.connection!, (entities) => {
+        this.entities = entities;
+      }),
     ];
   }
 
   protected render(): TemplateResult | void {
+    if (!this.devices || !this.areas || !this.entities) {
+      return;
+    }
+    const devices = this._getDevices(this.devices, this.areas, this.entities);
     return html`
-      <paper-dropdown-menu-light .label=${this.label}>
-        <paper-listbox
-          slot="dropdown-content"
-          .selected=${this._value}
-          attr-for-selected="data-device-id"
-          @iron-select=${this._deviceChanged}
+      <vaadin-combo-box-light
+        item-value-path="id"
+        item-id-path="id"
+        item-label-path="name"
+        .items=${devices}
+        .value=${this._value}
+        .renderer=${rowRenderer}
+        @opened-changed=${this._openedChanged}
+        @value-changed=${this._deviceChanged}
+      >
+        <paper-input
+          .label=${this.label}
+          class="input"
+          autocapitalize="none"
+          autocomplete="off"
+          autocorrect="off"
+          spellcheck="false"
         >
-          <paper-item data-device-id="">
-            No device
-          </paper-item>
-          ${this._sortedDevices(this.devices).map(
-            (device) => html`
-              <paper-item data-device-id=${device.id}>
-                ${device.name_by_user || device.name}
-              </paper-item>
-            `
-          )}
-        </paper-listbox>
-      </paper-dropdown-menu-light>
+          ${this.value
+            ? html`
+                <paper-icon-button
+                  aria-label="Clear"
+                  slot="suffix"
+                  class="clear-button"
+                  icon="hass:close"
+                  no-ripple
+                >
+                  Clear
+                </paper-icon-button>
+              `
+            : ""}
+          ${devices.length > 0
+            ? html`
+                <paper-icon-button
+                  aria-label="Show devices"
+                  slot="suffix"
+                  class="toggle-button"
+                  .icon=${this._opened ? "hass:menu-up" : "hass:menu-down"}
+                >
+                  Toggle
+                </paper-icon-button>
+              `
+            : ""}
+        </paper-input>
+      </vaadin-combo-box-light>
     `;
   }
 
@@ -76,8 +189,12 @@ class HaDevicePicker extends SubscribeMixin(LitElement) {
     return this.value || "";
   }
 
-  private _deviceChanged(ev) {
-    const newValue = ev.detail.item.dataset.deviceId;
+  private _openedChanged(ev: PolymerChangedEvent<boolean>) {
+    this._opened = ev.detail.value;
+  }
+
+  private _deviceChanged(ev: PolymerChangedEvent<string>) {
+    const newValue = ev.detail.value;
 
     if (newValue !== this._value) {
       this.value = newValue;
@@ -88,16 +205,30 @@ class HaDevicePicker extends SubscribeMixin(LitElement) {
     }
   }
 
+  private _fallbackDeviceName(
+    deviceId: string,
+    deviceEntityLookup: DeviceEntityLookup
+  ): string | undefined {
+    for (const entity of deviceEntityLookup[deviceId] || []) {
+      const stateObj = this.hass.states[entity.entity_id];
+      if (stateObj) {
+        return computeStateName(stateObj);
+      }
+    }
+
+    return undefined;
+  }
+
   static get styles(): CSSResult {
     return css`
-      paper-dropdown-menu-light {
-        width: 100%;
+      paper-input > paper-icon-button {
+        width: 24px;
+        height: 24px;
+        padding: 2px;
+        color: var(--secondary-text-color);
       }
-      paper-listbox {
-        min-width: 200px;
-      }
-      paper-item {
-        cursor: pointer;
+      [hidden] {
+        display: none;
       }
     `;
   }

From 0621218e168f41b5a78dae5e82df62e5b609c734 Mon Sep 17 00:00:00 2001
From: Drake Loud <louddrm@gmail.com>
Date: Mon, 21 Oct 2019 14:32:15 -0700
Subject: [PATCH 52/70] Changed button to text (#4067)

* Changed button to text

* Moved styles to hui-edit-view

* prettier updates
---
 .../lovelace/editor/view-editor/hui-edit-view.ts      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
index 9d05bef13d..9524f1e398 100644
--- a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
@@ -133,12 +133,11 @@ export class HuiEditView extends LitElement {
         <div class="paper-dialog-buttons">
           ${this.viewIndex !== undefined
             ? html`
-                <paper-icon-button
-                  class="delete"
-                  title="Delete"
-                  icon="hass:delete"
-                  @click="${this._delete}"
-                ></paper-icon-button>
+                <mwc-button class="delete" @click="${this._delete}">
+                  ${this.hass!.localize(
+                    "ui.panel.lovelace.editor.edit_view.delete"
+                  )}
+                </mwc-button>
               `
             : ""}
           <mwc-button @click="${this._closeDialog}"

From 70d6c6b902407a02c51cff7d6b16488c838d8d7d Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 21 Oct 2019 15:02:54 -0700
Subject: [PATCH 53/70] Refactor Webpack build scripts (#4093)

* Refactor Webpack build scripts

* Add Gallery too

* Fix icons

* Update travis
---
 .travis.yml                          |   7 +-
 build-scripts/env.js                 |   6 +
 build-scripts/gulp/app.js            |   9 +-
 build-scripts/gulp/cast.js           |  10 +-
 build-scripts/gulp/clean.js          |  16 ++
 build-scripts/gulp/compress.js       |   7 +
 build-scripts/gulp/demo.js           |  10 +-
 build-scripts/gulp/entry-html.js     |  46 +++-
 build-scripts/gulp/gallery.js        |  38 +++
 build-scripts/gulp/gather-static.js  |  12 +
 build-scripts/gulp/gen-icons.js      |  58 ++--
 build-scripts/gulp/hassio.js         |  34 +++
 build-scripts/gulp/webpack.js        | 193 +++++++------
 build-scripts/paths.js               |   9 +
 build-scripts/webpack.js             | 397 +++++++++++++--------------
 cast/webpack.config.js               |  11 +
 demo/webpack.config.js               |   7 +-
 gallery/public/index.html            |  18 --
 gallery/script/build_gallery         |  12 +-
 gallery/script/develop_gallery       |   8 +-
 gallery/src/components/demo-cards.js |   8 +-
 gallery/src/html/index.html.template |  22 ++
 gallery/webpack.config.js            | 112 ++++----
 hassio/script/build_hassio           |   9 +-
 hassio/script/develop                |   9 +-
 hassio/script/gen-icons.js           |  20 --
 hassio/webpack.config.js             |  66 +----
 webpack.config.js                    |   4 +-
 28 files changed, 626 insertions(+), 532 deletions(-)
 create mode 100644 build-scripts/env.js
 create mode 100644 build-scripts/gulp/gallery.js
 create mode 100644 build-scripts/gulp/hassio.js
 create mode 100644 cast/webpack.config.js
 delete mode 100644 gallery/public/index.html
 create mode 100644 gallery/src/html/index.html.template
 delete mode 100755 hassio/script/gen-icons.js

diff --git a/.travis.yml b/.travis.yml
index 4b357440b7..24433d2e24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,19 +8,20 @@ install: yarn install
 script:
   - npm run build
   - hassio/script/build_hassio
+  # Because else eslint fails because hassio has cleaned that build
+  - ./node_modules/.bin/gulp gen-icons-app
   - npm run test
   # - xvfb-run wct --module-resolution=node --npm
   # - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct --module-resolution=node --npm --plugin sauce; fi'
 services:
   - docker
 before_deploy:
-  - 'docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21'
+  - "docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21"
 deploy:
   provider: script
   script: script/travis_deploy
-  'on':
+  "on":
     branch: master
 dist: trusty
 addons:
   sauce_connect: true
-
diff --git a/build-scripts/env.js b/build-scripts/env.js
new file mode 100644
index 0000000000..101858a367
--- /dev/null
+++ b/build-scripts/env.js
@@ -0,0 +1,6 @@
+module.exports = {
+  isProdBuild: process.env.NODE_ENV === "production",
+  isStatsBuild: process.env.STATS === "1",
+  isTravis: process.env.TRAVIS === "true",
+  isNetlify: process.env.NETLIFY === "true",
+};
diff --git a/build-scripts/gulp/app.js b/build-scripts/gulp/app.js
index a86e68b527..985067c71f 100644
--- a/build-scripts/gulp/app.js
+++ b/build-scripts/gulp/app.js
@@ -1,6 +1,8 @@
 // Run HA develop mode
 const gulp = require("gulp");
 
+const envVars = require("../env");
+
 require("./clean.js");
 require("./translations.js");
 require("./gen-icons.js");
@@ -19,7 +21,7 @@ gulp.task(
     "clean",
     gulp.parallel(
       "gen-service-worker-dev",
-      "gen-icons",
+      gulp.parallel("gen-icons-app", "gen-icons-mdi"),
       "gen-pages-dev",
       "gen-index-app-dev",
       gulp.series("create-test-translation", "build-translations")
@@ -36,10 +38,11 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean",
-    gulp.parallel("gen-icons", "build-translations"),
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
     "copy-static",
     "webpack-prod-app",
-    ...(process.env.CI === "true" ? [] : ["compress-app"]),
+    ...// Don't compress running tests
+    (envVars.isTravis ? [] : ["compress-app"]),
     gulp.parallel(
       "gen-pages-prod",
       "gen-index-app-prod",
diff --git a/build-scripts/gulp/cast.js b/build-scripts/gulp/cast.js
index 974d2c29cf..34fcbb67a4 100644
--- a/build-scripts/gulp/cast.js
+++ b/build-scripts/gulp/cast.js
@@ -1,4 +1,3 @@
-// Run cast develop mode
 const gulp = require("gulp");
 
 require("./clean.js");
@@ -16,7 +15,12 @@ gulp.task(
       process.env.NODE_ENV = "development";
     },
     "clean-cast",
-    gulp.parallel("gen-icons", "gen-index-cast-dev", "build-translations"),
+    gulp.parallel(
+      "gen-icons-app",
+      "gen-icons-mdi",
+      "gen-index-cast-dev",
+      "build-translations"
+    ),
     "copy-static-cast",
     "webpack-dev-server-cast"
   )
@@ -29,7 +33,7 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean-cast",
-    gulp.parallel("gen-icons", "build-translations"),
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
     "copy-static-cast",
     "webpack-prod-cast",
     "gen-index-cast-prod"
diff --git a/build-scripts/gulp/clean.js b/build-scripts/gulp/clean.js
index f81728fcb3..41fec51e69 100644
--- a/build-scripts/gulp/clean.js
+++ b/build-scripts/gulp/clean.js
@@ -9,15 +9,31 @@ gulp.task(
     return del([config.root, config.build_dir]);
   })
 );
+
 gulp.task(
   "clean-demo",
   gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
     return del([config.demo_root, config.build_dir]);
   })
 );
+
 gulp.task(
   "clean-cast",
   gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
     return del([config.cast_root, config.build_dir]);
   })
 );
+
+gulp.task(
+  "clean-hassio",
+  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
+    return del([config.hassio_root, config.build_dir]);
+  })
+);
+
+gulp.task(
+  "clean-gallery",
+  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
+    return del([config.gallery_root, config.build_dir]);
+  })
+);
diff --git a/build-scripts/gulp/compress.js b/build-scripts/gulp/compress.js
index f41122c55c..de604f7fa3 100644
--- a/build-scripts/gulp/compress.js
+++ b/build-scripts/gulp/compress.js
@@ -29,3 +29,10 @@ gulp.task("compress-app", function compressApp() {
 
   return merge(jsLatest, jsEs5, polyfills, translations);
 });
+
+gulp.task("compress-hassio", function compressApp() {
+  return gulp
+    .src(path.resolve(paths.hassio_root, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.hassio_root));
+});
diff --git a/build-scripts/gulp/demo.js b/build-scripts/gulp/demo.js
index 2c8070962d..de51760281 100644
--- a/build-scripts/gulp/demo.js
+++ b/build-scripts/gulp/demo.js
@@ -17,7 +17,8 @@ gulp.task(
     },
     "clean-demo",
     gulp.parallel(
-      "gen-icons",
+      "gen-icons-app",
+      "gen-icons-mdi",
       "gen-icons-demo",
       "gen-index-demo-dev",
       "build-translations"
@@ -34,7 +35,12 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean-demo",
-    gulp.parallel("gen-icons", "gen-icons-demo", "build-translations"),
+    gulp.parallel(
+      "gen-icons-app",
+      "gen-icons-mdi",
+      "gen-icons-demo",
+      "build-translations"
+    ),
     "copy-static-demo",
     "webpack-prod-demo",
     "gen-index-demo-prod"
diff --git a/build-scripts/gulp/entry-html.js b/build-scripts/gulp/entry-html.js
index 33abdff712..e8ad05e8b4 100644
--- a/build-scripts/gulp/entry-html.js
+++ b/build-scripts/gulp/entry-html.js
@@ -11,12 +11,6 @@ const config = require("../paths.js");
 const templatePath = (tpl) =>
   path.resolve(config.polymer_dir, "src/html/", `${tpl}.html.template`);
 
-const demoTemplatePath = (tpl) =>
-  path.resolve(config.demo_dir, "src/html/", `${tpl}.html.template`);
-
-const castTemplatePath = (tpl) =>
-  path.resolve(config.cast_dir, "src/html/", `${tpl}.html.template`);
-
 const readFile = (pth) => fs.readFileSync(pth).toString();
 
 const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
@@ -25,10 +19,19 @@ const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
 };
 
 const renderDemoTemplate = (pth, data = {}) =>
-  renderTemplate(pth, data, demoTemplatePath);
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(config.demo_dir, "src/html/", `${tpl}.html.template`)
+  );
 
 const renderCastTemplate = (pth, data = {}) =>
-  renderTemplate(pth, data, castTemplatePath);
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(config.cast_dir, "src/html/", `${tpl}.html.template`)
+  );
+
+const renderGalleryTemplate = (pth, data = {}) =>
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(config.gallery_dir, "src/html/", `${tpl}.html.template`)
+  );
 
 const minifyHtml = (content) =>
   minify(content, {
@@ -209,8 +212,33 @@ gulp.task("gen-index-demo-prod", (done) => {
     es5Compatibility: es5Manifest["compatibility.js"],
     es5DemoJS: es5Manifest["main.js"],
   });
-  const minified = minifyHtml(content).replace(/#THEMEC/g, "{{ theme_color }}");
+  const minified = minifyHtml(content);
 
   fs.outputFileSync(path.resolve(config.demo_root, "index.html"), minified);
   done();
 });
+
+gulp.task("gen-index-gallery-dev", (done) => {
+  // In dev mode we don't mangle names, so we hardcode urls. That way we can
+  // run webpack as last in watch mode, which blocks output.
+  const content = renderGalleryTemplate("index", {
+    latestGalleryJS: "./entrypoint.js",
+  });
+
+  fs.outputFileSync(path.resolve(config.gallery_root, "index.html"), content);
+  done();
+});
+
+gulp.task("gen-index-gallery-prod", (done) => {
+  const latestManifest = require(path.resolve(
+    config.gallery_output,
+    "manifest.json"
+  ));
+  const content = renderGalleryTemplate("index", {
+    latestGalleryJS: latestManifest["entrypoint.js"],
+  });
+  const minified = minifyHtml(content);
+
+  fs.outputFileSync(path.resolve(config.gallery_root, "index.html"), minified);
+  done();
+});
diff --git a/build-scripts/gulp/gallery.js b/build-scripts/gulp/gallery.js
new file mode 100644
index 0000000000..a46c6c1939
--- /dev/null
+++ b/build-scripts/gulp/gallery.js
@@ -0,0 +1,38 @@
+// Run demo develop mode
+const gulp = require("gulp");
+
+require("./clean.js");
+require("./translations.js");
+require("./gen-icons.js");
+require("./gather-static.js");
+require("./webpack.js");
+require("./service-worker.js");
+require("./entry-html.js");
+
+gulp.task(
+  "develop-gallery",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "development";
+    },
+    "clean-gallery",
+    gulp.parallel("gen-icons-app", "gen-icons-app", "build-translations"),
+    "copy-static-gallery",
+    "gen-index-gallery-dev",
+    "webpack-dev-server-gallery"
+  )
+);
+
+gulp.task(
+  "build-gallery",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "production";
+    },
+    "clean-gallery",
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
+    "copy-static-gallery",
+    "webpack-prod-gallery",
+    "gen-index-gallery-prod"
+  )
+);
diff --git a/build-scripts/gulp/gather-static.js b/build-scripts/gulp/gather-static.js
index 7b3b9300be..17a1a87ae8 100644
--- a/build-scripts/gulp/gather-static.js
+++ b/build-scripts/gulp/gather-static.js
@@ -111,3 +111,15 @@ gulp.task("copy-static-cast", (done) => {
   copyTranslations(paths.cast_static);
   done();
 });
+
+gulp.task("copy-static-gallery", (done) => {
+  // Copy app static files
+  fs.copySync(polyPath("public/static"), paths.gallery_static);
+  // Copy gallery static files
+  fs.copySync(path.resolve(paths.gallery_dir, "public"), paths.gallery_root);
+
+  copyMapPanel(paths.gallery_static);
+  copyFonts(paths.gallery_static);
+  copyTranslations(paths.gallery_static);
+  done();
+});
diff --git a/build-scripts/gulp/gen-icons.js b/build-scripts/gulp/gen-icons.js
index 11548794c4..b116b8abea 100644
--- a/build-scripts/gulp/gen-icons.js
+++ b/build-scripts/gulp/gen-icons.js
@@ -57,18 +57,6 @@ function generateIconset(iconsetName, iconNames) {
   return `<ha-iconset-svg name="${iconsetName}" size="24"><svg><defs>${iconDefs}</defs></svg></ha-iconset-svg>`;
 }
 
-// Generate the full MDI iconset
-function genMDIIcons() {
-  const meta = JSON.parse(
-    fs.readFileSync(path.resolve(ICON_PACKAGE_PATH, META_PATH), "UTF-8")
-  );
-  const iconNames = meta.map((iconInfo) => iconInfo.name);
-  if (!fs.existsSync(OUTPUT_DIR)) {
-    fs.mkdirSync(OUTPUT_DIR);
-  }
-  fs.writeFileSync(MDI_OUTPUT_PATH, generateIconset("mdi", iconNames));
-}
-
 // Helper function to map recursively over files in a folder and it's subfolders
 function mapFiles(startPath, filter, mapFunc) {
   const files = fs.readdirSync(startPath);
@@ -101,24 +89,27 @@ function findIcons(searchPath, iconsetName) {
   return icons;
 }
 
-function genHassIcons() {
+gulp.task("gen-icons-mdi", (done) => {
+  const meta = JSON.parse(
+    fs.readFileSync(path.resolve(ICON_PACKAGE_PATH, META_PATH), "UTF-8")
+  );
+  const iconNames = meta.map((iconInfo) => iconInfo.name);
+  if (!fs.existsSync(OUTPUT_DIR)) {
+    fs.mkdirSync(OUTPUT_DIR);
+  }
+  fs.writeFileSync(MDI_OUTPUT_PATH, generateIconset("mdi", iconNames));
+  done();
+});
+
+gulp.task("gen-icons-app", (done) => {
   const iconNames = findIcons("./src", "hass");
   BUILT_IN_PANEL_ICONS.forEach((name) => iconNames.add(name));
   if (!fs.existsSync(OUTPUT_DIR)) {
     fs.mkdirSync(OUTPUT_DIR);
   }
   fs.writeFileSync(HASS_OUTPUT_PATH, generateIconset("hass", iconNames));
-}
-
-gulp.task("gen-icons-mdi", (done) => {
-  genMDIIcons();
   done();
 });
-gulp.task("gen-icons-hass", (done) => {
-  genHassIcons();
-  done();
-});
-gulp.task("gen-icons", gulp.series("gen-icons-hass", "gen-icons-mdi"));
 
 gulp.task("gen-icons-demo", (done) => {
   const iconNames = findIcons(path.resolve(paths.demo_dir, "./src"), "hademo");
@@ -129,8 +120,21 @@ gulp.task("gen-icons-demo", (done) => {
   done();
 });
 
-module.exports = {
-  findIcons,
-  generateIconset,
-  genMDIIcons,
-};
+gulp.task("gen-icons-hassio", (done) => {
+  const iconNames = findIcons(
+    path.resolve(paths.hassio_dir, "./src"),
+    "hassio"
+  );
+  // Find hassio icons inside HA main repo.
+  for (const item of findIcons(
+    path.resolve(paths.polymer_dir, "./src"),
+    "hassio"
+  )) {
+    iconNames.add(item);
+  }
+  fs.writeFileSync(
+    path.resolve(paths.hassio_dir, "hassio-icons.html"),
+    generateIconset("hassio", iconNames)
+  );
+  done();
+});
diff --git a/build-scripts/gulp/hassio.js b/build-scripts/gulp/hassio.js
new file mode 100644
index 0000000000..164a5b9deb
--- /dev/null
+++ b/build-scripts/gulp/hassio.js
@@ -0,0 +1,34 @@
+const gulp = require("gulp");
+
+const envVars = require("../env");
+
+require("./clean.js");
+require("./gen-icons.js");
+require("./webpack.js");
+require("./compress.js");
+
+gulp.task(
+  "develop-hassio",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "development";
+    },
+    "clean-hassio",
+    gulp.parallel("gen-icons-hassio", "gen-icons-mdi"),
+    "webpack-watch-hassio"
+  )
+);
+
+gulp.task(
+  "build-hassio",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "production";
+    },
+    "clean-hassio",
+    gulp.parallel("gen-icons-hassio", "gen-icons-mdi"),
+    "webpack-prod-hassio",
+    ...// Don't compress running tests
+    (envVars.isTravis ? [] : ["compress-hassio"])
+  )
+);
diff --git a/build-scripts/gulp/webpack.js b/build-scripts/gulp/webpack.js
index 6015009d2d..9ea304658b 100644
--- a/build-scripts/gulp/webpack.js
+++ b/build-scripts/gulp/webpack.js
@@ -1,6 +1,5 @@
 // Tasks to run webpack.
 const gulp = require("gulp");
-const path = require("path");
 const webpack = require("webpack");
 const WebpackDevServer = require("webpack-dev-server");
 const log = require("fancy-log");
@@ -9,8 +8,33 @@ const {
   createAppConfig,
   createDemoConfig,
   createCastConfig,
+  createHassioConfig,
+  createGalleryConfig,
 } = require("../webpack");
 
+const bothBuilds = (createConfigFunc, params) => [
+  createConfigFunc({ ...params, latestBuild: true }),
+  createConfigFunc({ ...params, latestBuild: false }),
+];
+
+const runDevServer = ({
+  compiler,
+  contentBase,
+  port,
+  listenHost = "localhost",
+}) =>
+  new WebpackDevServer(compiler, {
+    open: true,
+    watchContentBase: true,
+    contentBase,
+  }).listen(port, listenHost, function(err) {
+    if (err) {
+      throw err;
+    }
+    // Server listening
+    log("[webpack-dev-server]", `http://localhost:${port}`);
+  });
+
 const handler = (done) => (err, stats) => {
   if (err) {
     console.log(err.stack || err);
@@ -32,20 +56,11 @@ const handler = (done) => (err, stats) => {
 };
 
 gulp.task("webpack-watch-app", () => {
-  const compiler = webpack([
-    createAppConfig({
-      isProdBuild: false,
-      latestBuild: true,
-      isStatsBuild: false,
-    }),
-    createAppConfig({
-      isProdBuild: false,
-      latestBuild: false,
-      isStatsBuild: false,
-    }),
-  ]);
-  compiler.watch({}, handler());
   // we are not calling done, so this command will run forever
+  webpack([bothBuilds(createAppConfig, { isProdBuild: false })]).watch(
+    {},
+    handler()
+  );
 });
 
 gulp.task(
@@ -53,47 +68,17 @@ gulp.task(
   () =>
     new Promise((resolve) =>
       webpack(
-        [
-          createAppConfig({
-            isProdBuild: true,
-            latestBuild: true,
-            isStatsBuild: false,
-          }),
-          createAppConfig({
-            isProdBuild: true,
-            latestBuild: false,
-            isStatsBuild: false,
-          }),
-        ],
+        bothBuilds(createAppConfig, { isProdBuild: true }),
         handler(resolve)
       )
     )
 );
 
 gulp.task("webpack-dev-server-demo", () => {
-  const compiler = webpack([
-    createDemoConfig({
-      isProdBuild: false,
-      latestBuild: false,
-      isStatsBuild: false,
-    }),
-    createDemoConfig({
-      isProdBuild: false,
-      latestBuild: true,
-      isStatsBuild: false,
-    }),
-  ]);
-
-  new WebpackDevServer(compiler, {
-    open: true,
-    watchContentBase: true,
-    contentBase: path.resolve(paths.demo_dir, "dist"),
-  }).listen(8090, "localhost", function(err) {
-    if (err) {
-      throw err;
-    }
-    // Server listening
-    log("[webpack-dev-server]", "http://localhost:8090");
+  runDevServer({
+    compiler: webpack(bothBuilds(createDemoConfig, { isProdBuild: false })),
+    contentBase: paths.demo_root,
+    port: 8090,
   });
 });
 
@@ -102,51 +87,22 @@ gulp.task(
   () =>
     new Promise((resolve) =>
       webpack(
-        [
-          createDemoConfig({
-            isProdBuild: true,
-            latestBuild: false,
-            isStatsBuild: false,
-          }),
-          createDemoConfig({
-            isProdBuild: true,
-            latestBuild: true,
-            isStatsBuild: false,
-          }),
-        ],
+        bothBuilds(createDemoConfig, {
+          isProdBuild: true,
+        }),
         handler(resolve)
       )
     )
 );
 
 gulp.task("webpack-dev-server-cast", () => {
-  const compiler = webpack([
-    createCastConfig({
-      isProdBuild: false,
-      latestBuild: false,
-    }),
-    createCastConfig({
-      isProdBuild: false,
-      latestBuild: true,
-    }),
-  ]);
-
-  new WebpackDevServer(compiler, {
-    open: true,
-    watchContentBase: true,
-    contentBase: path.resolve(paths.cast_dir, "dist"),
-  }).listen(
-    8080,
+  runDevServer({
+    compiler: webpack(bothBuilds(createCastConfig, { isProdBuild: false })),
+    contentBase: paths.cast_root,
+    port: 8080,
     // Accessible from the network, because that's how Cast hits it.
-    "0.0.0.0",
-    function(err) {
-      if (err) {
-        throw err;
-      }
-      // Server listening
-      log("[webpack-dev-server]", "http://localhost:8080");
-    }
-  );
+    listenHost: "0.0.0.0",
+  });
 });
 
 gulp.task(
@@ -154,16 +110,59 @@ gulp.task(
   () =>
     new Promise((resolve) =>
       webpack(
-        [
-          createCastConfig({
-            isProdBuild: true,
-            latestBuild: false,
-          }),
-          createCastConfig({
-            isProdBuild: true,
-            latestBuild: true,
-          }),
-        ],
+        bothBuilds(createCastConfig, {
+          isProdBuild: true,
+        }),
+
+        handler(resolve)
+      )
+    )
+);
+
+gulp.task("webpack-watch-hassio", () => {
+  // we are not calling done, so this command will run forever
+  webpack(
+    createHassioConfig({
+      isProdBuild: false,
+      latestBuild: false,
+    })
+  ).watch({}, handler());
+});
+
+gulp.task(
+  "webpack-prod-hassio",
+  () =>
+    new Promise((resolve) =>
+      webpack(
+        createHassioConfig({
+          isProdBuild: true,
+          latestBuild: false,
+        }),
+        handler(resolve)
+      )
+    )
+);
+
+gulp.task("webpack-dev-server-gallery", () => {
+  runDevServer({
+    compiler: webpack(
+      createGalleryConfig({ latestBuild: true, isProdBuild: false })
+    ),
+    contentBase: paths.gallery_root,
+    port: 8100,
+  });
+});
+
+gulp.task(
+  "webpack-prod-gallery",
+  () =>
+    new Promise((resolve) =>
+      webpack(
+        createGalleryConfig({
+          isProdBuild: true,
+          latestBuild: true,
+        }),
+
         handler(resolve)
       )
     )
diff --git a/build-scripts/paths.js b/build-scripts/paths.js
index f59dc35399..4a26ab882c 100644
--- a/build-scripts/paths.js
+++ b/build-scripts/paths.js
@@ -20,4 +20,13 @@ module.exports = {
   cast_static: path.resolve(__dirname, "../cast/dist/static"),
   cast_output: path.resolve(__dirname, "../cast/dist/frontend_latest"),
   cast_output_es5: path.resolve(__dirname, "../cast/dist/frontend_es5"),
+
+  gallery_dir: path.resolve(__dirname, "../gallery"),
+  gallery_root: path.resolve(__dirname, "../gallery/dist"),
+  gallery_output: path.resolve(__dirname, "../gallery/dist/frontend_latest"),
+  gallery_static: path.resolve(__dirname, "../gallery/dist/static"),
+
+  hassio_dir: path.resolve(__dirname, "../hassio"),
+  hassio_root: path.resolve(__dirname, "../hassio/build"),
+  hassio_publicPath: "/api/hassio/app",
 };
diff --git a/build-scripts/webpack.js b/build-scripts/webpack.js
index bb69d91948..ac04587333 100644
--- a/build-scripts/webpack.js
+++ b/build-scripts/webpack.js
@@ -15,249 +15,246 @@ if (!version) {
 }
 version = version[0];
 
-const genMode = (isProdBuild) => (isProdBuild ? "production" : "development");
-const genDevTool = (isProdBuild) =>
-  isProdBuild ? "source-map" : "inline-cheap-module-source-map";
-const genFilename = (isProdBuild, dontHash = new Set()) => ({ chunk }) => {
-  if (!isProdBuild || dontHash.has(chunk.name)) {
-    return `${chunk.name}.js`;
-  }
-  return `${chunk.name}.${chunk.hash.substr(0, 8)}.js`;
-};
-const genChunkFilename = (isProdBuild, isStatsBuild) =>
-  isProdBuild && !isStatsBuild ? "chunk.[chunkhash].js" : "[name].chunk.js";
-
-const resolve = {
-  extensions: [".ts", ".js", ".json", ".tsx"],
-  alias: {
-    react: "preact-compat",
-    "react-dom": "preact-compat",
-    // Not necessary unless you consume a module using `createClass`
-    "create-react-class": "preact-compat/lib/create-react-class",
-    // Not necessary unless you consume a module requiring `react-dom-factories`
-    "react-dom-factories": "preact-compat/lib/react-dom-factories",
-  },
-};
-
-const cssLoader = {
-  test: /\.css$/,
-  use: "raw-loader",
-};
-const htmlLoader = {
-  test: /\.(html)$/,
-  use: {
-    loader: "html-loader",
-    options: {
-      exportAsEs6Default: true,
-    },
-  },
-};
-
-const plugins = [
-  // Ignore moment.js locales
-  new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-  // Color.js is bloated, it contains all color definitions for all material color sets.
-  new webpack.NormalModuleReplacementPlugin(
-    /@polymer\/paper-styles\/color\.js$/,
-    path.resolve(paths.polymer_dir, "src/util/empty.js")
-  ),
-  // Ignore roboto pointing at CDN. We use local font-roboto-local.
-  new webpack.NormalModuleReplacementPlugin(
-    /@polymer\/font-roboto\/roboto\.js$/,
-    path.resolve(paths.polymer_dir, "src/util/empty.js")
-  ),
-  // Ignore mwc icons pointing at CDN.
-  new webpack.NormalModuleReplacementPlugin(
-    /@material\/mwc-icon\/mwc-icon-font\.js$/,
-    path.resolve(paths.polymer_dir, "src/util/empty.js")
-  ),
-];
-
-const optimization = (latestBuild) => ({
-  minimizer: [
-    new TerserPlugin({
-      cache: true,
-      parallel: true,
-      extractComments: true,
-      sourceMap: true,
-      terserOptions: {
-        safari10: true,
-        ecma: latestBuild ? undefined : 5,
-      },
-    }),
-  ],
-});
-
-const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  const isCI = process.env.CI === "true";
-
-  // Create an object mapping browser urls to their paths during build
-  const translationMetadata = require("../build-translations/translationMetadata.json");
-  const workBoxTranslationsTemplatedURLs = {};
-  const englishFP = translationMetadata.translations.en.fingerprints;
-  Object.keys(englishFP).forEach((key) => {
-    workBoxTranslationsTemplatedURLs[
-      `/static/translations/${englishFP[key]}`
-    ] = `build-translations/output/${key}.json`;
-  });
-
-  const entry = {
-    app: "./src/entrypoints/app.ts",
-    authorize: "./src/entrypoints/authorize.ts",
-    onboarding: "./src/entrypoints/onboarding.ts",
-    core: "./src/entrypoints/core.ts",
-    compatibility: "./src/entrypoints/compatibility.ts",
-    "custom-panel": "./src/entrypoints/custom-panel.ts",
-    "hass-icons": "./src/entrypoints/hass-icons.ts",
-  };
-
+const createWebpackConfig = ({
+  entry,
+  outputRoot,
+  defineOverlay,
+  isProdBuild,
+  latestBuild,
+  isStatsBuild,
+}) => {
   return {
-    mode: genMode(isProdBuild),
-    devtool: genDevTool(isProdBuild),
+    mode: isProdBuild ? "production" : "development",
+    devtool: isProdBuild ? "source-map" : "inline-cheap-module-source-map",
     entry,
     module: {
-      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
+      rules: [
+        babelLoaderConfig({ latestBuild }),
+        {
+          test: /\.css$/,
+          use: "raw-loader",
+        },
+        {
+          test: /\.(html)$/,
+          use: {
+            loader: "html-loader",
+            options: {
+              exportAsEs6Default: true,
+            },
+          },
+        },
+      ],
+    },
+    optimization: {
+      minimizer: [
+        new TerserPlugin({
+          cache: true,
+          parallel: true,
+          extractComments: true,
+          sourceMap: true,
+          terserOptions: {
+            safari10: true,
+            ecma: latestBuild ? undefined : 5,
+          },
+        }),
+      ],
     },
-    optimization: optimization(latestBuild),
     plugins: [
       new ManifestPlugin(),
       new webpack.DefinePlugin({
-        __DEV__: JSON.stringify(!isProdBuild),
-        __DEMO__: false,
+        __DEV__: !isProdBuild,
         __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
         __VERSION__: JSON.stringify(version),
+        __DEMO__: false,
         __STATIC_PATH__: "/static/",
         "process.env.NODE_ENV": JSON.stringify(
           isProdBuild ? "production" : "development"
         ),
+        ...defineOverlay,
       }),
-      ...plugins,
-      latestBuild &&
-        new WorkboxPlugin.InjectManifest({
-          swSrc: "./src/entrypoints/service-worker-hass.js",
-          swDest: "service_worker.js",
-          importWorkboxFrom: "local",
-          include: [/\.js$/],
-          templatedURLs: {
-            ...workBoxTranslationsTemplatedURLs,
-            "/static/icons/favicon-192x192.png":
-              "public/icons/favicon-192x192.png",
-            "/static/fonts/roboto/Roboto-Light.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2",
-            "/static/fonts/roboto/Roboto-Medium.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2",
-            "/static/fonts/roboto/Roboto-Regular.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2",
-            "/static/fonts/roboto/Roboto-Bold.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2",
-          },
-        }),
+      // Ignore moment.js locales
+      new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+      // Color.js is bloated, it contains all color definitions for all material color sets.
+      new webpack.NormalModuleReplacementPlugin(
+        /@polymer\/paper-styles\/color\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
+      // Ignore roboto pointing at CDN. We use local font-roboto-local.
+      new webpack.NormalModuleReplacementPlugin(
+        /@polymer\/font-roboto\/roboto\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
+      // Ignore mwc icons pointing at CDN.
+      new webpack.NormalModuleReplacementPlugin(
+        /@material\/mwc-icon\/mwc-icon-font\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
     ].filter(Boolean),
+    resolve: {
+      extensions: [".ts", ".js", ".json", ".tsx"],
+      alias: {
+        react: "preact-compat",
+        "react-dom": "preact-compat",
+        // Not necessary unless you consume a module using `createClass`
+        "create-react-class": "preact-compat/lib/create-react-class",
+        // Not necessary unless you consume a module requiring `react-dom-factories`
+        "react-dom-factories": "preact-compat/lib/react-dom-factories",
+      },
+    },
     output: {
-      filename: genFilename(isProdBuild),
-      chunkFilename: genChunkFilename(isProdBuild, isStatsBuild),
-      path: latestBuild ? paths.output : paths.output_es5,
+      filename: ({ chunk }) => {
+        const dontHash = new Set();
+
+        if (!isProdBuild || dontHash.has(chunk.name)) {
+          return `${chunk.name}.js`;
+        }
+        return `${chunk.name}.${chunk.hash.substr(0, 8)}.js`;
+      },
+      chunkFilename:
+        isProdBuild && !isStatsBuild
+          ? "chunk.[chunkhash].js"
+          : "[name].chunk.js",
+      path: path.resolve(
+        outputRoot,
+        latestBuild ? "frontend_latest" : "frontend_es5"
+      ),
       publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
       // For workerize loader
       globalObject: "self",
     },
-    resolve,
   };
 };
 
+const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
+  const config = createWebpackConfig({
+    entry: {
+      app: "./src/entrypoints/app.ts",
+      authorize: "./src/entrypoints/authorize.ts",
+      onboarding: "./src/entrypoints/onboarding.ts",
+      core: "./src/entrypoints/core.ts",
+      compatibility: "./src/entrypoints/compatibility.ts",
+      "custom-panel": "./src/entrypoints/custom-panel.ts",
+      "hass-icons": "./src/entrypoints/hass-icons.ts",
+    },
+    outputRoot: paths.root,
+    isProdBuild,
+    latestBuild,
+    isStatsBuild,
+  });
+
+  if (latestBuild) {
+    // Create an object mapping browser urls to their paths during build
+    const translationMetadata = require("../build-translations/translationMetadata.json");
+    const workBoxTranslationsTemplatedURLs = {};
+    const englishFP = translationMetadata.translations.en.fingerprints;
+    Object.keys(englishFP).forEach((key) => {
+      workBoxTranslationsTemplatedURLs[
+        `/static/translations/${englishFP[key]}`
+      ] = `build-translations/output/${key}.json`;
+    });
+
+    config.plugins.push(
+      new WorkboxPlugin.InjectManifest({
+        swSrc: "./src/entrypoints/service-worker-hass.js",
+        swDest: "service_worker.js",
+        importWorkboxFrom: "local",
+        include: [/\.js$/],
+        templatedURLs: {
+          ...workBoxTranslationsTemplatedURLs,
+          "/static/icons/favicon-192x192.png":
+            "public/icons/favicon-192x192.png",
+          "/static/fonts/roboto/Roboto-Light.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2",
+          "/static/fonts/roboto/Roboto-Medium.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2",
+          "/static/fonts/roboto/Roboto-Regular.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2",
+          "/static/fonts/roboto/Roboto-Bold.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2",
+        },
+      })
+    );
+  }
+
+  return config;
+};
+
 const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  return {
-    mode: genMode(isProdBuild),
-    devtool: genDevTool(isProdBuild),
+  return createWebpackConfig({
     entry: {
-      main: "./demo/src/entrypoint.ts",
-      compatibility: "./src/entrypoints/compatibility.ts",
-    },
-    module: {
-      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
-    },
-    optimization: optimization(latestBuild),
-    plugins: [
-      new ManifestPlugin(),
-      new webpack.DefinePlugin({
-        __DEV__: !isProdBuild,
-        __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-        __VERSION__: JSON.stringify(`DEMO-${version}`),
-        __DEMO__: true,
-        __STATIC_PATH__: "/static/",
-        "process.env.NODE_ENV": JSON.stringify(
-          isProdBuild ? "production" : "development"
-        ),
-      }),
-      ...plugins,
-    ].filter(Boolean),
-    resolve,
-    output: {
-      filename: genFilename(isProdBuild),
-      chunkFilename: genChunkFilename(isProdBuild, isStatsBuild),
-      path: path.resolve(
-        paths.demo_root,
-        latestBuild ? "frontend_latest" : "frontend_es5"
+      main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
+      compatibility: path.resolve(
+        paths.polymer_dir,
+        "src/entrypoints/compatibility.ts"
       ),
-      publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
-      // For workerize loader
-      globalObject: "self",
     },
-  };
+    outputRoot: paths.demo_root,
+    defineOverlay: {
+      __VERSION__: JSON.stringify(`DEMO-${version}`),
+      __DEMO__: true,
+    },
+    isProdBuild,
+    latestBuild,
+    isStatsBuild,
+  });
 };
 
 const createCastConfig = ({ isProdBuild, latestBuild }) => {
-  const isStatsBuild = false;
   const entry = {
-    launcher: "./cast/src/launcher/entrypoint.ts",
+    launcher: path.resolve(paths.cast_dir, "src/launcher/entrypoint.ts"),
   };
 
   if (latestBuild) {
-    entry.receiver = "./cast/src/receiver/entrypoint.ts";
+    entry.receiver = path.resolve(paths.cast_dir, "src/receiver/entrypoint.ts");
   }
 
-  return {
-    mode: genMode(isProdBuild),
-    devtool: genDevTool(isProdBuild),
+  return createWebpackConfig({
     entry,
-    module: {
-      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
+    outputRoot: paths.cast_root,
+    isProdBuild,
+    latestBuild,
+  });
+};
+
+const createHassioConfig = ({ isProdBuild, latestBuild }) => {
+  if (latestBuild) {
+    throw new Error("Hass.io does not support latest build!");
+  }
+  const config = createWebpackConfig({
+    entry: {
+      entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.js"),
     },
-    optimization: optimization(latestBuild),
-    plugins: [
-      new ManifestPlugin(),
-      new webpack.DefinePlugin({
-        __DEV__: !isProdBuild,
-        __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-        __VERSION__: JSON.stringify(version),
-        __DEMO__: false,
-        __STATIC_PATH__: "/static/",
-        "process.env.NODE_ENV": JSON.stringify(
-          isProdBuild ? "production" : "development"
-        ),
-      }),
-      ...plugins,
-    ].filter(Boolean),
-    resolve,
-    output: {
-      filename: genFilename(isProdBuild),
-      chunkFilename: genChunkFilename(isProdBuild, isStatsBuild),
-      path: path.resolve(
-        paths.cast_root,
-        latestBuild ? "frontend_latest" : "frontend_es5"
-      ),
-      publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
-      // For workerize loader
-      globalObject: "self",
+    outputRoot: "",
+    isProdBuild,
+    latestBuild,
+  });
+
+  config.output.path = paths.hassio_root;
+  config.output.publicPath = paths.hassio_publicPath;
+
+  return config;
+};
+
+const createGalleryConfig = ({ isProdBuild, latestBuild }) => {
+  if (!latestBuild) {
+    throw new Error("Gallery only supports latest build!");
+  }
+  const config = createWebpackConfig({
+    entry: {
+      entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),
     },
-  };
+    outputRoot: paths.gallery_root,
+    isProdBuild,
+    latestBuild,
+  });
+
+  return config;
 };
 
 module.exports = {
-  resolve,
-  plugins,
-  optimization,
   createAppConfig,
   createDemoConfig,
   createCastConfig,
+  createHassioConfig,
+  createGalleryConfig,
 };
diff --git a/cast/webpack.config.js b/cast/webpack.config.js
new file mode 100644
index 0000000000..bb9746cd11
--- /dev/null
+++ b/cast/webpack.config.js
@@ -0,0 +1,11 @@
+const { createCastConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild } = require("../build-scripts/env.js");
+
+// File just used for stats builds
+
+const latestBuild = true;
+
+module.exports = createCastConfig({
+  isProdBuild,
+  latestBuild,
+});
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
index 266523cdbe..9ccb790f8b 100644
--- a/demo/webpack.config.js
+++ b/demo/webpack.config.js
@@ -1,10 +1,9 @@
 const { createDemoConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild, isStatsBuild } = require("../build-scripts/env.js");
 
-// This file exists because we haven't migrated the stats script yet
+// File just used for stats builds
 
-const isProdBuild = process.env.NODE_ENV === "production";
-const isStatsBuild = process.env.STATS === "1";
-const latestBuild = false;
+const latestBuild = true;
 
 module.exports = createDemoConfig({
   isProdBuild,
diff --git a/gallery/public/index.html b/gallery/public/index.html
deleted file mode 100644
index 7339634a60..0000000000
--- a/gallery/public/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#2157BC">
-    <title>HAGallery</title>
-    <script src='./main.js' async></script>
-    <style>
-      body {
-        font-family: Roboto, Noto, sans-serif;
-        margin: 0;
-        padding: 0;
-      }
-    </style>
-  </head>
-  <body></body>
-</html>
diff --git a/gallery/script/build_gallery b/gallery/script/build_gallery
index cbf70c6d4e..3a7c77dde7 100755
--- a/gallery/script/build_gallery
+++ b/gallery/script/build_gallery
@@ -4,14 +4,6 @@
 # Stop on errors
 set -e
 
-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."
 
-OUTPUT_DIR=dist
-
-rm -rf $OUTPUT_DIR
-
-cd ..
-./node_modules/.bin/gulp build-translations gen-icons
-cd gallery
-
-NODE_ENV=production ../node_modules/.bin/webpack -p --config webpack.config.js
+./node_modules/.bin/gulp build-gallery
diff --git a/gallery/script/develop_gallery b/gallery/script/develop_gallery
index 56bb2c678b..b346ea60bc 100755
--- a/gallery/script/develop_gallery
+++ b/gallery/script/develop_gallery
@@ -4,10 +4,6 @@
 # Stop on errors
 set -e
 
-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."
 
-cd ..
-./node_modules/.bin/gulp build-translations gen-icons
-cd gallery
-
-../node_modules/.bin/webpack-dev-server
+./node_modules/.bin/gulp develop-gallery
diff --git a/gallery/src/components/demo-cards.js b/gallery/src/components/demo-cards.js
index a73bc53a2f..db01c7fe13 100644
--- a/gallery/src/components/demo-cards.js
+++ b/gallery/src/components/demo-cards.js
@@ -26,7 +26,9 @@ class DemoCards extends PolymerElement {
       </style>
       <app-toolbar>
         <div class="filters">
-          <ha-switch checked="{{_showConfig}}">Show config</ha-switch>
+          <ha-switch checked="[[_showConfig]]" on-change="_showConfigToggled">
+            Show config
+          </ha-switch>
         </div>
       </app-toolbar>
       <div class="cards">
@@ -51,6 +53,10 @@ class DemoCards extends PolymerElement {
       },
     };
   }
+
+  _showConfigToggled(ev) {
+    this._showConfig = ev.target.checked;
+  }
 }
 
 customElements.define("demo-cards", DemoCards);
diff --git a/gallery/src/html/index.html.template b/gallery/src/html/index.html.template
new file mode 100644
index 0000000000..3240e59bb0
--- /dev/null
+++ b/gallery/src/html/index.html.template
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta name="theme-color" content="#2157BC" />
+    <title>HAGallery</title>
+
+    <script type="module" src="<%= latestGalleryJS %>"></script>
+    <style>
+      body {
+        font-family: Roboto, Noto, sans-serif;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body></body>
+</html>
diff --git a/gallery/webpack.config.js b/gallery/webpack.config.js
index dc03993c98..9bc82eedc3 100644
--- a/gallery/webpack.config.js
+++ b/gallery/webpack.config.js
@@ -1,6 +1,6 @@
 const path = require("path");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
-const webpackBase = require("../build-scripts/webpack.js");
+const { createGalleryConfig } = require("../build-scripts/webpack.js");
 const { babelLoaderConfig } = require("../build-scripts/babel.js");
 
 const isProd = process.env.NODE_ENV === "production";
@@ -9,58 +9,64 @@ const buildPath = path.resolve(__dirname, "dist");
 const publicPath = isProd ? "./" : "http://localhost:8080/";
 const latestBuild = true;
 
-module.exports = {
-  mode: isProd ? "production" : "development",
-  // Disabled in prod while we make Home Assistant able to serve the right files.
-  // Was source-map
-  devtool: isProd ? "none" : "inline-source-map",
-  entry: "./src/entrypoint.js",
-  module: {
-    rules: [
-      babelLoaderConfig({ latestBuild }),
-      {
-        test: /\.css$/,
-        use: "raw-loader",
-      },
-      {
-        test: /\.(html)$/,
-        use: {
-          loader: "html-loader",
-          options: {
-            exportAsEs6Default: true,
+module.exports = createGalleryConfig({
+  latestBuild: true,
+});
+
+const bla = () => {
+  const oldExports = {
+    mode: isProd ? "production" : "development",
+    // Disabled in prod while we make Home Assistant able to serve the right files.
+    // Was source-map
+    devtool: isProd ? "none" : "inline-source-map",
+    entry: "./src/entrypoint.js",
+    module: {
+      rules: [
+        babelLoaderConfig({ latestBuild }),
+        {
+          test: /\.css$/,
+          use: "raw-loader",
+        },
+        {
+          test: /\.(html)$/,
+          use: {
+            loader: "html-loader",
+            options: {
+              exportAsEs6Default: true,
+            },
           },
         },
-      },
-    ],
-  },
-  optimization: webpackBase.optimization(latestBuild),
-  plugins: [
-    new CopyWebpackPlugin([
-      "public",
-      { from: "../public", to: "static" },
-      { from: "../build-translations/output", to: "static/translations" },
-      {
-        from: "../node_modules/leaflet/dist/leaflet.css",
-        to: "static/images/leaflet/",
-      },
-      {
-        from: "../node_modules/roboto-fontface/fonts/roboto/*.woff2",
-        to: "static/fonts/roboto/",
-      },
-      {
-        from: "../node_modules/leaflet/dist/images",
-        to: "static/images/leaflet/",
-      },
-    ]),
-  ].filter(Boolean),
-  resolve: webpackBase.resolve,
-  output: {
-    filename: "[name].js",
-    chunkFilename: chunkFilename,
-    path: buildPath,
-    publicPath,
-  },
-  devServer: {
-    contentBase: "./public",
-  },
+      ],
+    },
+    optimization: webpackBase.optimization(latestBuild),
+    plugins: [
+      new CopyWebpackPlugin([
+        "public",
+        { from: "../public", to: "static" },
+        { from: "../build-translations/output", to: "static/translations" },
+        {
+          from: "../node_modules/leaflet/dist/leaflet.css",
+          to: "static/images/leaflet/",
+        },
+        {
+          from: "../node_modules/roboto-fontface/fonts/roboto/*.woff2",
+          to: "static/fonts/roboto/",
+        },
+        {
+          from: "../node_modules/leaflet/dist/images",
+          to: "static/images/leaflet/",
+        },
+      ]),
+    ].filter(Boolean),
+    resolve: webpackBase.resolve,
+    output: {
+      filename: "[name].js",
+      chunkFilename: chunkFilename,
+      path: buildPath,
+      publicPath,
+    },
+    devServer: {
+      contentBase: "./public",
+    },
+  };
 };
diff --git a/hassio/script/build_hassio b/hassio/script/build_hassio
index b8bd6d504e..193cbb0687 100755
--- a/hassio/script/build_hassio
+++ b/hassio/script/build_hassio
@@ -4,11 +4,6 @@
 # Stop on errors
 set -e
 
-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."
 
-OUTPUT_DIR=build
-
-rm -rf $OUTPUT_DIR
-
-node script/gen-icons.js
-NODE_ENV=production CI=false ../node_modules/.bin/webpack -p --config webpack.config.js
+./node_modules/.bin/gulp build-hassio
diff --git a/hassio/script/develop b/hassio/script/develop
index c23fc2ea1f..0b62666b10 100755
--- a/hassio/script/develop
+++ b/hassio/script/develop
@@ -4,11 +4,6 @@
 # Stop on errors
 set -e
 
-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."
 
-OUTPUT_DIR=build
-
-rm -rf $OUTPUT_DIR
-mkdir $OUTPUT_DIR
-node script/gen-icons.js
-../node_modules/.bin/webpack --watch --progress
+./node_modules/.bin/gulp develop-hassio
diff --git a/hassio/script/gen-icons.js b/hassio/script/gen-icons.js
deleted file mode 100755
index b355ef752b..0000000000
--- a/hassio/script/gen-icons.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-const fs = require("fs");
-const {
-  findIcons,
-  generateIconset,
-  genMDIIcons,
-} = require("../../build-scripts/gulp/gen-icons.js");
-
-function genHassioIcons() {
-  const iconNames = findIcons("./src", "hassio");
-
-  for (const item of findIcons("../src", "hassio")) {
-    iconNames.add(item);
-  }
-
-  fs.writeFileSync("./hassio-icons.html", generateIconset("hassio", iconNames));
-}
-
-genMDIIcons();
-genHassioIcons();
diff --git a/hassio/webpack.config.js b/hassio/webpack.config.js
index 630778c69e..02e44c0d74 100644
--- a/hassio/webpack.config.js
+++ b/hassio/webpack.config.js
@@ -1,63 +1,11 @@
-const webpack = require("webpack");
-const CompressionPlugin = require("compression-webpack-plugin");
-const zopfli = require("@gfx/zopfli");
+const { createHassioConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild } = require("../build-scripts/env.js");
 
-const config = require("./config.js");
-const webpackBase = require("../build-scripts/webpack.js");
-const { babelLoaderConfig } = require("../build-scripts/babel.js");
+// File just used for stats builds
 
-const isProdBuild = process.env.NODE_ENV === "production";
-const isCI = process.env.CI === "true";
-const chunkFilename = isProdBuild ? "chunk.[chunkhash].js" : "[name].chunk.js";
 const latestBuild = false;
 
-module.exports = {
-  mode: isProdBuild ? "production" : "development",
-  devtool: isProdBuild ? "source-map" : "inline-source-map",
-  entry: {
-    entrypoint: "./src/entrypoint.js",
-  },
-  module: {
-    rules: [
-      babelLoaderConfig({ latestBuild }),
-      {
-        test: /\.(html)$/,
-        use: {
-          loader: "html-loader",
-          options: {
-            exportAsEs6Default: true,
-          },
-        },
-      },
-    ],
-  },
-  optimization: webpackBase.optimization(latestBuild),
-  plugins: [
-    new webpack.DefinePlugin({
-      __DEV__: JSON.stringify(!isProdBuild),
-      __DEMO__: false,
-      __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-      "process.env.NODE_ENV": JSON.stringify(
-        isProdBuild ? "production" : "development"
-      ),
-    }),
-    isProdBuild &&
-      !isCI &&
-      new CompressionPlugin({
-        cache: true,
-        exclude: [/\.js\.map$/, /\.LICENSE$/, /\.py$/, /\.txt$/],
-        algorithm(input, compressionOptions, callback) {
-          return zopfli.gzip(input, compressionOptions, callback);
-        },
-      }),
-  ].filter(Boolean),
-  resolve: {
-    extensions: [".ts", ".js", ".json"],
-  },
-  output: {
-    filename: "[name].js",
-    chunkFilename,
-    path: config.buildDir,
-    publicPath: `${config.publicPath}/`,
-  },
-};
+module.exports = createHassioConfig({
+  isProdBuild,
+  latestBuild,
+});
diff --git a/webpack.config.js b/webpack.config.js
index 49df18dfec..ff1b7462be 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,10 +1,8 @@
 const { createAppConfig } = require("./build-scripts/webpack.js");
+const { isProdBuild, isStatsBuild } = require("./build-scripts/env.js");
 
 // This file exists because we haven't migrated the stats script yet
 
-const isProdBuild = process.env.NODE_ENV === "production";
-const isStatsBuild = process.env.STATS === "1";
-
 const configs = [
   createAppConfig({
     isProdBuild,

From 8ac278bc59f78bcb667e46537f3e79d9300a3fa8 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 21 Oct 2019 16:33:03 -0700
Subject: [PATCH 54/70] Remove unused deps

---
 package.json |  2 --
 yarn.lock    | 18 +++---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 537235c1af..92e12babb0 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,6 @@
     "@babel/plugin-transform-react-jsx": "^7.3.0",
     "@babel/preset-env": "^7.4.2",
     "@babel/preset-typescript": "^7.4.0",
-    "@gfx/zopfli": "^1.0.11",
     "@types/chai": "^4.1.7",
     "@types/chromecast-caf-receiver": "^3.0.12",
     "@types/chromecast-caf-sender": "^1.0.1",
@@ -125,7 +124,6 @@
     "@types/mocha": "^5.2.6",
     "babel-loader": "^8.0.5",
     "chai": "^4.2.0",
-    "compression-webpack-plugin": "^2.0.0",
     "copy-webpack-plugin": "^5.0.2",
     "del": "^4.0.0",
     "eslint": "^6.3.0",
diff --git a/yarn.lock b/yarn.lock
index 67c20ec468..77ee588941 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -825,7 +825,7 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@gfx/zopfli@^1.0.11", "@gfx/zopfli@^1.0.9":
+"@gfx/zopfli@^1.0.9":
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/@gfx/zopfli/-/zopfli-1.0.11.tgz#6ced06b4566a5feb0036fe6a1e0262ce6cb1d6c5"
   integrity sha512-wW+hi+bqdYCpBIvL8g7RYub9YXf5crhZK9SNk/VZmbF177Em1VwFv488qyh8iBpCo6GptcP1Zam0bJfY3VmMbg==
@@ -3689,7 +3689,7 @@ bytes@3.1.0, bytes@^3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^11.0.2, cacache@^11.2.0, cacache@^11.3.1:
+cacache@^11.0.2, cacache@^11.3.1:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -4309,18 +4309,6 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression-webpack-plugin@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz#46476350c1eb27f783dccc79ac2f709baa2cffbc"
-  integrity sha512-bDgd7oTUZC8EkRx8j0sjyCfeiO+e5sFcfgaFcjVhfQf5lLya7oY2BczxcJ7IUuVjz5m6fy8IECFmVFew3xLk8Q==
-  dependencies:
-    cacache "^11.2.0"
-    find-cache-dir "^2.0.0"
-    neo-async "^2.5.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    webpack-sources "^1.0.1"
-
 compression@^1.6.2, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
@@ -13268,7 +13256,7 @@ webpack-manifest-plugin@^2.0.4:
     lodash ">=3.5 <5"
     tapable "^1.0.0"
 
-webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+webpack-sources@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
   integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==

From a8d0a2293fcb39808b1e0db3bdb8db70166010d3 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 21 Oct 2019 18:45:15 -0500
Subject: [PATCH 55/70] revert lovelace selectable text (#4095)

---
 src/panels/lovelace/hui-root.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 1f099a1364..8c67d10708 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -73,14 +73,6 @@ class HUIRoot extends LitElement {
     );
   }
 
-  protected firstUpdated(changedProperties: PropertyValues): void {
-    super.firstUpdated(changedProperties);
-    this.classList.toggle(
-      "disable-text-select",
-      /Chrome/.test(navigator.userAgent) && /Android/.test(navigator.userAgent)
-    );
-  }
-
   protected render(): TemplateResult | void {
     return html`
     <app-route .route="${this.route}" pattern="/:view" data="${
@@ -321,9 +313,6 @@ class HUIRoot extends LitElement {
         :host {
           --dark-color: #455a64;
           --text-dark-color: #fff;
-        }
-
-        :host(.disable-text-select) {
           -ms-user-select: none;
           -webkit-user-select: none;
           -moz-user-select: none;

From fdbe89e87e593109f407f0478681bfa38dc10da4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 21 Oct 2019 16:49:57 -0700
Subject: [PATCH 56/70] Fix develop build

---
 build-scripts/gulp/webpack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-scripts/gulp/webpack.js b/build-scripts/gulp/webpack.js
index 9ea304658b..46a114540b 100644
--- a/build-scripts/gulp/webpack.js
+++ b/build-scripts/gulp/webpack.js
@@ -57,7 +57,7 @@ const handler = (done) => (err, stats) => {
 
 gulp.task("webpack-watch-app", () => {
   // we are not calling done, so this command will run forever
-  webpack([bothBuilds(createAppConfig, { isProdBuild: false })]).watch(
+  webpack(bothBuilds(createAppConfig, { isProdBuild: false })).watch(
     {},
     handler()
   );

From b0fce93de85df2462be47d5894a7cbf6fa75c3c7 Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Mon, 21 Oct 2019 23:39:37 -0700
Subject: [PATCH 57/70] Fix issue where long states do not wrap (#4101)

---
 src/state-summary/state-card-display.js | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 src/state-summary/state-card-display.js

diff --git a/src/state-summary/state-card-display.js b/src/state-summary/state-card-display.js
old mode 100644
new mode 100755
index ca48fa93eb..76456f4069
--- a/src/state-summary/state-card-display.js
+++ b/src/state-summary/state-card-display.js
@@ -39,6 +39,7 @@ class StateCardDisplay extends LocalizeMixin(PolymerElement) {
           text-align: right;
           max-width: 40%;
           flex: 0 0 auto;
+          overflow-wrap: break-word;
         }
         :host([rtl]) .state {
           margin-right: 16px;

From 731bb176f71af9391c316c4744ea575e1a01560d Mon Sep 17 00:00:00 2001
From: aquarium <peter@vashevko.com>
Date: Tue, 22 Oct 2019 02:43:15 -0400
Subject: [PATCH 58/70] Fix link to translation documentation (#4098)

---
 translations/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translations/README.md b/translations/README.md
index 778fbc249d..8477b66732 100644
--- a/translations/README.md
+++ b/translations/README.md
@@ -1,4 +1,4 @@
 # Translation Resources
-Translations are managed through [Lokalise](https://lokalise.co/). If you'd like to contribute, you can [join the project here](https://lokalise.co/signup/3420425759f6d6d241f598.13594006/all/). For more details, see our [translation guidelines documentation](https://home-assistant.io/developers/frontend_translation/).
+Translations are managed through [Lokalise](https://lokalise.co/). If you'd like to contribute, you can [join the project here](https://lokalise.co/signup/3420425759f6d6d241f598.13594006/all/). For more details, see our [translation guidelines documentation](https://developers.home-assistant.io/docs/en/internationalization_translation.html).
 
 Don't make changes to these files directly. Instead, use `script/translations_download` to fetch the latest translations from Lokalise.

From 11c08e9a69d31f8df1c49532b8cba019ae6f8917 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Tue, 22 Oct 2019 10:24:25 +0200
Subject: [PATCH 59/70] Added view title to heading of Lovelace Add Card picker
 (#4083)

* Added view title to heading of Lovelace Add Card picker

* Fixed building error, cleaned up code

* Changed _view to _viewConfig and added check for undefined _cardConfig

* Added else if for undefined _cardConfig, added else for manual cards

* Used template literal instead of string concatenation
---
 .../editor/card-editor/hui-card-picker.ts     |  3 ---
 .../card-editor/hui-dialog-edit-card.ts       | 19 +++++++++++++++----
 src/translations/en.json                      |  3 ++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
index cef6d82bec..90a17caafe 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
@@ -49,9 +49,6 @@ export class HuiCardPicker extends LitElement {
 
   protected render(): TemplateResult | void {
     return html`
-      <h3>
-        ${this.hass!.localize("ui.panel.lovelace.editor.edit_card.pick_card")}
-      </h3>
       <div class="cards-container">
         ${cards.map((card: string) => {
           return html`
diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
index ab23793448..24c160cc9a 100755
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
@@ -10,7 +10,10 @@ import {
 
 import { HomeAssistant } from "../../../../types";
 import { HASSDomEvent } from "../../../../common/dom/fire_event";
-import { LovelaceCardConfig } from "../../../../data/lovelace";
+import {
+  LovelaceCardConfig,
+  LovelaceViewConfig,
+} from "../../../../data/lovelace";
 import "./hui-card-editor";
 // tslint:disable-next-line
 import { HuiCardEditor } from "./hui-card-editor";
@@ -40,6 +43,7 @@ export class HuiDialogEditCard extends LitElement {
   @property() private _params?: EditCardDialogParams;
 
   @property() private _cardConfig?: LovelaceCardConfig;
+  @property() private _viewConfig!: LovelaceViewConfig;
 
   @property() private _saving: boolean = false;
   @property() private _error?: string;
@@ -47,10 +51,9 @@ export class HuiDialogEditCard extends LitElement {
   public async showDialog(params: EditCardDialogParams): Promise<void> {
     this._params = params;
     const [view, card] = params.path;
+    this._viewConfig = params.lovelace.config.views[view];
     this._cardConfig =
-      card !== undefined
-        ? params.lovelace.config.views[view].cards![card]
-        : undefined;
+      card !== undefined ? this._viewConfig.cards![card] : undefined;
   }
 
   private get _cardEditorEl(): HuiCardEditor | null {
@@ -67,6 +70,14 @@ export class HuiDialogEditCard extends LitElement {
       heading = `${this.hass!.localize(
         `ui.panel.lovelace.editor.card.${this._cardConfig.type}.name`
       )} ${this.hass!.localize("ui.panel.lovelace.editor.edit_card.header")}`;
+    } else if (!this._cardConfig) {
+      heading = this._viewConfig.title
+        ? this.hass!.localize(
+            "ui.panel.lovelace.editor.edit_card.pick_card_view_title",
+            "name",
+            `"${this._viewConfig.title}"`
+          )
+        : this.hass!.localize("ui.panel.lovelace.editor.edit_card.pick_card");
     } else {
       heading = this.hass!.localize(
         "ui.panel.lovelace.editor.edit_card.header"
diff --git a/src/translations/en.json b/src/translations/en.json
index 9c0b16ed55..d705e755e2 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1403,7 +1403,8 @@
           },
           "edit_card": {
             "header": "Card Configuration",
-            "pick_card": "Pick the card you want to add.",
+            "pick_card": "Which card would you like to add?",
+            "pick_card_view_title": "Which card would you like to add to your {name} view?",
             "toggle_editor": "Toggle Editor",
             "show_visual_editor": "Show Visual Editor",
             "show_code_editor": "Show Code Editor",

From 7b5201599d191be593ef64044b1d7e8fa66b9a75 Mon Sep 17 00:00:00 2001
From: Drake Loud <louddrm@gmail.com>
Date: Tue, 22 Oct 2019 01:27:36 -0700
Subject: [PATCH 60/70] added title to view configuation (#4037)

* added title to view configuation

* replacing let with const

* added localization change

* updated view config title

* linter updates

* Prettier updates
---
 .../lovelace/editor/view-editor/hui-edit-view.ts   | 14 +++++++++++++-
 src/translations/en.json                           |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
index 9524f1e398..2ebc70dc70 100644
--- a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
@@ -87,6 +87,18 @@ export class HuiEditView extends LitElement {
     return this.shadowRoot!.querySelector("ha-paper-dialog")!;
   }
 
+  private get _viewConfigTitle(): string {
+    if (!this._config || !this._config.title) {
+      return this.hass!.localize("ui.panel.lovelace.editor.edit_view.header");
+    }
+
+    return this.hass!.localize(
+      "ui.panel.lovelace.editor.edit_view.header_name",
+      "name",
+      this._config.title
+    );
+  }
+
   protected render(): TemplateResult | void {
     let content;
     switch (this._curTab) {
@@ -118,7 +130,7 @@ export class HuiEditView extends LitElement {
     return html`
       <ha-paper-dialog with-backdrop>
         <h2>
-          ${this.hass!.localize("ui.panel.lovelace.editor.edit_view.header")}
+          ${this._viewConfigTitle}
         </h2>
         <paper-tabs
           scrollable
diff --git a/src/translations/en.json b/src/translations/en.json
index d705e755e2..025c286f35 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1397,6 +1397,7 @@
           },
           "edit_view": {
             "header": "View Configuration",
+            "header_name": "{name} View Configuration",
             "add": "Add view",
             "edit": "Edit view",
             "delete": "Delete view"

From d4d6b7e2ce38a42a00befb88482b22cada94c119 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 22 Oct 2019 21:17:55 +0200
Subject: [PATCH 61/70] Fix delete button styling in hui-edit-view (#4102)

---
 src/panels/lovelace/editor/view-editor/hui-edit-view.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
index 2ebc70dc70..6b48245ed2 100644
--- a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
@@ -301,9 +301,9 @@ export class HuiEditView extends LitElement {
           height: 14px;
           margin-right: 20px;
         }
-        paper-icon-button.delete {
+        .delete {
           margin-right: auto;
-          color: var(--secondary-text-color);
+          --mdc-theme-primary: var(--secondary-text-color);
         }
         paper-spinner {
           display: none;
@@ -315,8 +315,8 @@ export class HuiEditView extends LitElement {
           display: none;
         }
         .error {
-          color: #ef5350;
-          border-bottom: 1px solid #ef5350;
+          color: var(--error-color);
+          border-bottom: 1px solid var(--error-color);
         }
       </style>
     `,

From bb7303920558ccdaeec396344f295a3323cb945e Mon Sep 17 00:00:00 2001
From: Timmo <contact@timmo.xyz>
Date: Tue, 22 Oct 2019 20:20:42 +0100
Subject: [PATCH 62/70] Confirmation Dialog (#4053)

* :sparkles: Add confirmation dialog

* :sparkles: Add confirmation dialog to service calls

* :hammer: Change returned value

* :sparkles: Add confirmation dialog to integration remove

* :sparkles: Add to entity registry

* :sparkles: Add to delete card and add translation

* :sparkles: Add to views deletion

* :hammer: Remove async

* :hammer: Fix min-width for smaller screens

* :hammer: Remove async

* Fix wrong merge

* Update ha-config-entry-page.ts
---
 .../buttons/ha-call-service-button.js         |  17 ++-
 .../confirmation/dialog-confirmation.ts       | 107 ++++++++++++++++++
 .../confirmation/show-dialog-confirmation.ts  |  21 ++++
 .../dialog-entity-registry-detail.ts          |  33 +++---
 .../config-entry/ha-config-entry-page.ts      |  22 ++--
 .../lovelace/components/hui-card-options.ts   |   2 +-
 src/panels/lovelace/editor/delete-card.ts     |  22 ++--
 .../editor/view-editor/hui-edit-view.ts       |  26 +++--
 src/translations/en.json                      |  10 ++
 9 files changed, 207 insertions(+), 53 deletions(-)
 create mode 100644 src/dialogs/confirmation/dialog-confirmation.ts
 create mode 100644 src/dialogs/confirmation/show-dialog-confirmation.ts

diff --git a/src/components/buttons/ha-call-service-button.js b/src/components/buttons/ha-call-service-button.js
index 909919c9a1..6c2d6ad9f3 100644
--- a/src/components/buttons/ha-call-service-button.js
+++ b/src/components/buttons/ha-call-service-button.js
@@ -3,6 +3,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "./ha-progress-button";
 import { EventsMixin } from "../../mixins/events-mixin";
+import { showConfirmationDialog } from "../../dialogs/confirmation/show-dialog-confirmation";
 
 /*
  * @appliesMixin EventsMixin
@@ -49,10 +50,7 @@ class HaCallServiceButton extends EventsMixin(PolymerElement) {
     };
   }
 
-  buttonTapped() {
-    if (this.confirmation && !window.confirm(this.confirmation)) {
-      return;
-    }
+  callService() {
     this.progress = true;
     var el = this;
     var eventData = {
@@ -79,6 +77,17 @@ class HaCallServiceButton extends EventsMixin(PolymerElement) {
         el.fire("hass-service-called", eventData);
       });
   }
+
+  buttonTapped() {
+    if (this.confirmation) {
+      showConfirmationDialog(this, {
+        text: this.confirmation,
+        confirm: () => this.callService(),
+      });
+    } else {
+      this.callService();
+    }
+  }
 }
 
 customElements.define("ha-call-service-button", HaCallServiceButton);
diff --git a/src/dialogs/confirmation/dialog-confirmation.ts b/src/dialogs/confirmation/dialog-confirmation.ts
new file mode 100644
index 0000000000..23bc7d312e
--- /dev/null
+++ b/src/dialogs/confirmation/dialog-confirmation.ts
@@ -0,0 +1,107 @@
+import {
+  LitElement,
+  html,
+  css,
+  CSSResult,
+  TemplateResult,
+  customElement,
+  property,
+} from "lit-element";
+import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
+import "@polymer/paper-input/paper-input";
+
+import "../../components/dialog/ha-paper-dialog";
+import "../../components/ha-switch";
+
+import { HomeAssistant } from "../../types";
+import { ConfirmationDialogParams } from "./show-dialog-confirmation";
+import { PolymerChangedEvent } from "../../polymer-types";
+import { haStyleDialog } from "../../resources/styles";
+
+@customElement("dialog-confirmation")
+class DialogConfirmation extends LitElement {
+  @property() public hass!: HomeAssistant;
+  @property() private _params?: ConfirmationDialogParams;
+
+  public async showDialog(params: ConfirmationDialogParams): Promise<void> {
+    this._params = params;
+  }
+
+  protected render(): TemplateResult | void {
+    if (!this._params) {
+      return html``;
+    }
+
+    return html`
+      <ha-paper-dialog
+        with-backdrop
+        opened
+        @opened-changed="${this._openedChanged}"
+      >
+        <h2>
+          ${this._params.title
+            ? this._params.title
+            : this.hass.localize("ui.dialogs.confirmation.title")}
+        </h2>
+        <paper-dialog-scrollable>
+          <p>${this._params.text}</p>
+        </paper-dialog-scrollable>
+        <div class="paper-dialog-buttons">
+          <mwc-button @click="${this._dismiss}">
+            ${this.hass.localize("ui.dialogs.confirmation.cancel")}
+          </mwc-button>
+          <mwc-button @click="${this._confirm}">
+            ${this.hass.localize("ui.dialogs.confirmation.ok")}
+          </mwc-button>
+        </div>
+      </ha-paper-dialog>
+    `;
+  }
+
+  private async _dismiss(): Promise<void> {
+    this._params = undefined;
+  }
+
+  private async _confirm(): Promise<void> {
+    this._params!.confirm();
+    this._dismiss();
+  }
+
+  private _openedChanged(ev: PolymerChangedEvent<boolean>): void {
+    if (!(ev.detail as any).value) {
+      this._params = undefined;
+    }
+  }
+
+  static get styles(): CSSResult[] {
+    return [
+      haStyleDialog,
+      css`
+        ha-paper-dialog {
+          min-width: 400px;
+          max-width: 500px;
+        }
+        @media (max-width: 400px) {
+          ha-paper-dialog {
+            min-width: initial;
+          }
+        }
+        p {
+          margin: 0;
+          padding-top: 6px;
+          padding-bottom: 24px;
+          color: var(--primary-text-color);
+        }
+        .secondary {
+          color: var(--secondary-text-color);
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "dialog-confirmation": DialogConfirmation;
+  }
+}
diff --git a/src/dialogs/confirmation/show-dialog-confirmation.ts b/src/dialogs/confirmation/show-dialog-confirmation.ts
new file mode 100644
index 0000000000..47b3e556b8
--- /dev/null
+++ b/src/dialogs/confirmation/show-dialog-confirmation.ts
@@ -0,0 +1,21 @@
+import { fireEvent } from "../../common/dom/fire_event";
+
+export interface ConfirmationDialogParams {
+  title?: string;
+  text: string;
+  confirm: () => void;
+}
+
+export const loadConfirmationDialog = () =>
+  import(/* webpackChunkName: "confirmation" */ "./dialog-confirmation");
+
+export const showConfirmationDialog = (
+  element: HTMLElement,
+  systemLogDetailParams: ConfirmationDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "dialog-confirmation",
+    dialogImport: loadConfirmationDialog,
+    dialogParams: systemLogDetailParams,
+  });
+};
diff --git a/src/panels/config/entity_registry/dialog-entity-registry-detail.ts b/src/panels/config/entity_registry/dialog-entity-registry-detail.ts
index f29d629909..29d8d9d78a 100644
--- a/src/panels/config/entity_registry/dialog-entity-registry-detail.ts
+++ b/src/panels/config/entity_registry/dialog-entity-registry-detail.ts
@@ -26,6 +26,7 @@ import {
   updateEntityRegistryEntry,
   removeEntityRegistryEntry,
 } from "../../../data/entity_registry";
+import { showConfirmationDialog } from "../../../dialogs/confirmation/show-dialog-confirmation";
 
 class DialogEntityRegistryDetail extends LitElement {
   @property() public hass!: HomeAssistant;
@@ -139,7 +140,7 @@ class DialogEntityRegistryDetail extends LitElement {
         <div class="paper-dialog-buttons">
           <mwc-button
             class="warning"
-            @click="${this._deleteEntry}"
+            @click="${this._confirmDeleteEntry}"
             .disabled=${this._submitting}
           >
             ${this.hass.localize(
@@ -186,22 +187,6 @@ class DialogEntityRegistryDetail extends LitElement {
   }
 
   private async _deleteEntry(): Promise<void> {
-    if (
-      !confirm(
-        `${this.hass.localize(
-          "ui.panel.config.entity_registry.editor.confirm_delete"
-        )}
-
-${this.hass.localize(
-  "ui.panel.config.entity_registry.editor.confirm_delete2",
-  "platform",
-  this._platform
-)}`
-      )
-    ) {
-      return;
-    }
-
     this._submitting = true;
 
     try {
@@ -212,6 +197,20 @@ ${this.hass.localize(
     }
   }
 
+  private _confirmDeleteEntry(): void {
+    showConfirmationDialog(this, {
+      title: this.hass.localize(
+        "ui.panel.config.entity_registry.editor.confirm_delete"
+      ),
+      text: this.hass.localize(
+        "ui.panel.config.entity_registry.editor.confirm_delete2",
+        "platform",
+        this._platform
+      ),
+      confirm: () => this._deleteEntry(),
+    });
+  }
+
   private _openedChanged(ev: PolymerChangedEvent<boolean>): void {
     if (!(ev.detail as any).value) {
       this._params = undefined;
diff --git a/src/panels/config/integrations/config-entry/ha-config-entry-page.ts b/src/panels/config/integrations/config-entry/ha-config-entry-page.ts
index 12d3674bc4..6028d698aa 100755
--- a/src/panels/config/integrations/config-entry/ha-config-entry-page.ts
+++ b/src/panels/config/integrations/config-entry/ha-config-entry-page.ts
@@ -17,6 +17,7 @@ import { DeviceRegistryEntry } from "../../../../data/device_registry";
 import { AreaRegistryEntry } from "../../../../data/area_registry";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { showConfigEntrySystemOptionsDialog } from "../../../../dialogs/config-entry-system-options/show-dialog-config-entry-system-options";
+import { showConfirmationDialog } from "../../../../dialogs/confirmation/show-dialog-confirmation";
 
 class HaConfigEntryPage extends LitElement {
   @property() public hass!: HomeAssistant;
@@ -110,7 +111,7 @@ class HaConfigEntryPage extends LitElement {
             "integration",
             configEntry.title
           )}
-          @click=${this._removeEntry}
+          @click=${this._confirmRemoveEntry}
         ></paper-icon-button>
 
         <div class="content">
@@ -159,17 +160,16 @@ class HaConfigEntryPage extends LitElement {
     });
   }
 
-  private _removeEntry() {
-    if (
-      !confirm(
-        this.hass.localize(
-          "ui.panel.config.integrations.config_entry.delete_confirm"
-        )
-      )
-    ) {
-      return;
-    }
+  private _confirmRemoveEntry() {
+    showConfirmationDialog(this, {
+      text: this.hass.localize(
+        "ui.panel.config.integrations.config_entry.delete_confirm"
+      ),
+      confirm: () => this._removeEntry(),
+    });
+  }
 
+  private _removeEntry() {
     deleteConfigEntry(this.hass, this.configEntryId).then((result) => {
       fireEvent(this, "hass-reload-entries");
       if (result.require_restart) {
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index 53b7e7762e..c325f8d7ac 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -165,7 +165,7 @@ export class HuiCardOptions extends LitElement {
   }
 
   private _deleteCard(): void {
-    confDeleteCard(this.lovelace!, this.path!);
+    confDeleteCard(this, this.hass!, this.lovelace!, this.path!);
   }
 }
 
diff --git a/src/panels/lovelace/editor/delete-card.ts b/src/panels/lovelace/editor/delete-card.ts
index c4afc7e863..0a84fb542a 100644
--- a/src/panels/lovelace/editor/delete-card.ts
+++ b/src/panels/lovelace/editor/delete-card.ts
@@ -1,16 +1,22 @@
 import { Lovelace } from "../types";
 import { deleteCard } from "./config-util";
+import { showConfirmationDialog } from "../../../dialogs/confirmation/show-dialog-confirmation";
+import { HomeAssistant } from "../../../types";
 
 export async function confDeleteCard(
+  element: HTMLElement,
+  hass: HomeAssistant,
   lovelace: Lovelace,
   path: [number, number]
 ): Promise<void> {
-  if (!confirm("Are you sure you want to delete this card?")) {
-    return;
-  }
-  try {
-    await lovelace.saveConfig(deleteCard(lovelace.config, path));
-  } catch (err) {
-    alert(`Deleting failed: ${err.message}`);
-  }
+  showConfirmationDialog(element, {
+    text: hass.localize("ui.panel.lovelace.cards.confirm_delete"),
+    confirm: async () => {
+      try {
+        await lovelace.saveConfig(deleteCard(lovelace.config, path));
+      } catch (err) {
+        alert(`Deleting failed: ${err.message}`);
+      }
+    },
+  });
 }
diff --git a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
index 6b48245ed2..67a4b51529 100644
--- a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts
@@ -34,6 +34,7 @@ import { processEditorEntities } from "../process-editor-entities";
 import { navigate } from "../../../../common/navigate";
 import { Lovelace } from "../../types";
 import { deleteView, addView, replaceView } from "../config-util";
+import { showConfirmationDialog } from "../../../../dialogs/confirmation/show-dialog-confirmation";
 
 @customElement("hui-edit-view")
 export class HuiEditView extends LitElement {
@@ -145,7 +146,7 @@ export class HuiEditView extends LitElement {
         <div class="paper-dialog-buttons">
           ${this.viewIndex !== undefined
             ? html`
-                <mwc-button class="delete" @click="${this._delete}">
+                <mwc-button class="delete" @click="${this._deleteConfirm}">
                   ${this.hass!.localize(
                     "ui.panel.lovelace.editor.edit_view.delete"
                   )}
@@ -171,17 +172,6 @@ export class HuiEditView extends LitElement {
   }
 
   private async _delete(): Promise<void> {
-    if (this._cards && this._cards.length > 0) {
-      alert(
-        "You can't delete a view that has cards in it. Remove the cards first."
-      );
-      return;
-    }
-
-    if (!confirm("Are you sure you want to delete this view?")) {
-      return;
-    }
-
     try {
       await this.lovelace!.saveConfig(
         deleteView(this.lovelace!.config, this.viewIndex!)
@@ -193,6 +183,18 @@ export class HuiEditView extends LitElement {
     }
   }
 
+  private _deleteConfirm(): void {
+    if (this._cards && this._cards.length > 0) {
+      alert(this.hass!.localize("ui.panel.lovelace.views.existing_cards"));
+      return;
+    }
+
+    showConfirmationDialog(this, {
+      text: this.hass!.localize("ui.panel.lovelace.views.confirm_delete"),
+      confirm: () => this._delete(),
+    });
+  }
+
   private async _resizeDialog(): Promise<void> {
     await this.updateComplete;
     fireEvent(this._dialog as HTMLElement, "iron-resize");
diff --git a/src/translations/en.json b/src/translations/en.json
index 025c286f35..222645ba6f 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -546,6 +546,11 @@
       }
     },
     "dialogs": {
+      "confirmation": {
+        "cancel": "Cancel",
+        "ok": "OK",
+        "title": "Are you sure?"
+      },
       "more_info_control": {
         "script": {
           "last_action": "Last Action"
@@ -1354,6 +1359,7 @@
       },
       "lovelace": {
         "cards": {
+          "confirm_delete": "Are you sure you want to delete this card?",
           "empty_state": {
             "title": "Welcome Home",
             "no_devices": "This page allows you to control your devices, however it looks like you have no devices set up yet. Head to the integrations page to get started.",
@@ -1374,6 +1380,10 @@
             "more_info": "Show more-info: {name}"
           }
         },
+        "views": {
+          "confirm_delete": "Are you sure you want to delete this view?",
+          "existing_cards": "You can't delete a view that has cards in it. Remove the cards first."
+        },
         "menu": {
           "configure_ui": "Configure UI",
           "unused_entities": "Unused entities",

From 49d0f2359b31b3553f64f4fca0bd65857297d8c6 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Tue, 22 Oct 2019 14:43:34 -0500
Subject: [PATCH 63/70] add sensor card to first demo (#4035)

* add sensor card to first demo

* Change to temperature sensor
---
 demo/src/configs/arsaboo/entities.ts | 12 ++++++++++++
 demo/src/configs/arsaboo/lovelace.ts |  5 +++++
 src/translations/en.json             |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/demo/src/configs/arsaboo/entities.ts b/demo/src/configs/arsaboo/entities.ts
index 77a4d1c16a..fcae1bc846 100644
--- a/demo/src/configs/arsaboo/entities.ts
+++ b/demo/src/configs/arsaboo/entities.ts
@@ -217,6 +217,18 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         icon: "hademo:currency-usd",
       },
     },
+    "sensor.study_temp": {
+      entity_id: "sensor.study_temp",
+      state: "20.9",
+      attributes: {
+        unit_of_measurement: "°C",
+        device_class: "temperature",
+        friendly_name: localize(
+          "ui.panel.page-demo.config.arsaboo.names.temperature_study"
+        ),
+        icon: "hademo:thermometer",
+      },
+    },
     "cover.garagedoor": {
       entity_id: "cover.garagedoor",
       state: "closed",
diff --git a/demo/src/configs/arsaboo/lovelace.ts b/demo/src/configs/arsaboo/lovelace.ts
index ddb95ad98b..79a275c578 100644
--- a/demo/src/configs/arsaboo/lovelace.ts
+++ b/demo/src/configs/arsaboo/lovelace.ts
@@ -446,6 +446,11 @@ export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({
             "script.tv_off",
           ],
         },
+        {
+          type: "sensor",
+          entity: "sensor.study_temp",
+          graph: "line",
+        },
         {
           type: "entities",
           title: "Doorbell",
diff --git a/src/translations/en.json b/src/translations/en.json
index 222645ba6f..03fab1fae2 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1782,7 +1782,8 @@
               "master_bedroom": "Master Bedroom",
               "left": "Left",
               "right": "Right",
-              "mirror": "Mirror"
+              "mirror": "Mirror",
+              "temperature_study": "Temperature Study"
             },
             "labels": {
               "lights": "Lights",

From 1e7497ad33b7377745cb33b4fdff0c88a24f6e72 Mon Sep 17 00:00:00 2001
From: Josh McCarty <josh@joshmccarty.com>
Date: Tue, 22 Oct 2019 14:06:18 -0700
Subject: [PATCH 64/70] Revise hassio update card design (#4041)

* Revise hassio update card design

See https://github.com/home-assistant/home-assistant-polymer/issues/3916

* Remove available text; use secondary text color instead of yellow/orange

* Less bold text for update header
---
 hassio/src/dashboard/hassio-update.ts | 65 +++++++++++++++++++++------
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/hassio/src/dashboard/hassio-update.ts b/hassio/src/dashboard/hassio-update.ts
index 07b532cbae..3414c5fdf7 100644
--- a/hassio/src/dashboard/hassio-update.ts
+++ b/hassio/src/dashboard/hassio-update.ts
@@ -7,6 +7,7 @@ import {
   property,
   customElement,
 } from "lit-element";
+import "@polymer/iron-icon/iron-icon";
 
 import { HomeAssistant } from "../../../src/types";
 import {
@@ -33,12 +34,15 @@ export class HassioUpdate extends LitElement {
   @property() public error?: string;
 
   protected render(): TemplateResult | void {
-    if (
-      this.hassInfo.version === this.hassInfo.last_version &&
-      this.supervisorInfo.version === this.supervisorInfo.last_version &&
-      (!this.hassOsInfo ||
-        this.hassOsInfo.version === this.hassOsInfo.version_latest)
-    ) {
+    const updatesAvailable: number = [
+      this.hassInfo,
+      this.supervisorInfo,
+      this.hassOsInfo,
+    ].filter((value) => {
+      return !!value && value.version !== value.last_version;
+    }).length;
+
+    if (!updatesAvailable) {
       return html``;
     }
 
@@ -50,6 +54,11 @@ export class HassioUpdate extends LitElement {
             `
           : ""}
         <div class="card-group">
+          <div class="title">
+            ${updatesAvailable > 1
+              ? "Updates Available 🎉"
+              : "Update Available 🎉"}
+          </div>
           ${this._renderUpdateCard(
             "Home Assistant",
             this.hassInfo.version,
@@ -57,7 +66,8 @@ export class HassioUpdate extends LitElement {
             "hassio/homeassistant/update",
             `https://${
               this.hassInfo.last_version.includes("b") ? "rc" : "www"
-            }.home-assistant.io/latest-release-notes/`
+            }.home-assistant.io/latest-release-notes/`,
+            "hassio:home-assistant"
           )}
           ${this._renderUpdateCard(
             "Hass.io Supervisor",
@@ -89,18 +99,31 @@ export class HassioUpdate extends LitElement {
     curVersion: string,
     lastVersion: string,
     apiPath: string,
-    releaseNotesUrl: string
+    releaseNotesUrl: string,
+    icon?: string
   ): TemplateResult {
     if (lastVersion === curVersion) {
       return html``;
     }
     return html`
-      <paper-card heading="${name} update available! 🎉">
+      <paper-card>
         <div class="card-content">
-          ${name} ${lastVersion} is available and you are currently running
-          ${name} ${curVersion}.
+          ${icon
+            ? html`
+                <div class="icon">
+                  <iron-icon .icon="${icon}" />
+                </div>
+              `
+            : ""}
+          <div class="update-heading">${name} ${lastVersion}</div>
+          <div class="warning">
+            You are currently running version ${curVersion}
+          </div>
         </div>
         <div class="card-actions">
+          <a href="${releaseNotesUrl}" target="_blank">
+            <mwc-button>Release notes</mwc-button>
+          </a>
           <ha-call-api-button
             .hass=${this.hass}
             .path=${apiPath}
@@ -108,9 +131,6 @@ export class HassioUpdate extends LitElement {
           >
             Update
           </ha-call-api-button>
-          <a href="${releaseNotesUrl}" target="_blank">
-            <mwc-button>Release notes</mwc-button>
-          </a>
         </div>
       </paper-card>
     `;
@@ -140,6 +160,23 @@ export class HassioUpdate extends LitElement {
           display: inline-block;
           margin-bottom: 32px;
         }
+        .icon {
+          --iron-icon-height: 48px;
+          --iron-icon-width: 48px;
+          float: right;
+          margin: 0 0 2px 10px;
+        }
+        .update-heading {
+          font-size: var(--paper-font-subhead_-_font-size);
+          font-weight: 500;
+          margin-bottom: 0.5em;
+        }
+        .warning {
+          color: var(--secondary-text-color);
+        }
+        .card-actions {
+          text-align: right;
+        }
         .errors {
           color: var(--google-red-500);
           padding: 16px;

From 06d59b3cdec07d6e2e6af6f3c50c6d3ce513db72 Mon Sep 17 00:00:00 2001
From: Josh McCarty <josh@joshmccarty.com>
Date: Tue, 22 Oct 2019 15:04:09 -0700
Subject: [PATCH 65/70] Adds a white background to the QR code for MFA (#4107)

---
 src/panels/profile/ha-mfa-module-setup-flow.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panels/profile/ha-mfa-module-setup-flow.js b/src/panels/profile/ha-mfa-module-setup-flow.js
index 79394d8196..1e5450bc90 100644
--- a/src/panels/profile/ha-mfa-module-setup-flow.js
+++ b/src/panels/profile/ha-mfa-module-setup-flow.js
@@ -30,6 +30,7 @@ class HaMfaModuleSetupFlow extends LocalizeMixin(EventsMixin(PolymerElement)) {
         }
         ha-markdown img:first-child:last-child,
         ha-markdown svg:first-child:last-child {
+          background-color: white;
           display: block;
           margin: 0 auto;
         }

From 0792278927d3d854f254ccb3cc038b40f72e8327 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 23 Oct 2019 01:10:42 +0200
Subject: [PATCH 66/70] Fix more integrations message (#4106)

* Fix more integrations message

* Period outside link
---
 .../config-flow/dialog-data-entry-flow.ts     |  1 +
 .../show-dialog-data-entry-flow.ts            |  1 +
 .../config-flow/step-flow-pick-handler.ts     | 36 ++++++++++++-------
 .../ha-config-entries-dashboard.ts            |  2 ++
 .../integrations/ha-config-integrations.ts    |  4 ++-
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/dialogs/config-flow/dialog-data-entry-flow.ts b/src/dialogs/config-flow/dialog-data-entry-flow.ts
index a85f3b11bd..d51838a682 100644
--- a/src/dialogs/config-flow/dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts
@@ -141,6 +141,7 @@ class DataEntryFlowDialog extends LitElement {
                 .flowConfig=${this._params.flowConfig}
                 .hass=${this.hass}
                 .handlers=${this._handlers}
+                .showAdvanced=${this._params.showAdvanced}
               ></step-flow-pick-handler>
             `
           : this._step.type === "form"
diff --git a/src/dialogs/config-flow/show-dialog-data-entry-flow.ts b/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
index a3609a733f..3d34834335 100644
--- a/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
@@ -75,6 +75,7 @@ export interface DataEntryFlowDialogParams {
   continueFlowId?: string;
   dialogClosedCallback?: (params: { flowFinished: boolean }) => void;
   flowConfig: FlowConfig;
+  showAdvanced?: boolean;
 }
 
 export const loadDataEntryFlowDialog = () =>
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index 6eaa5a5b01..ef410f7529 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -31,6 +31,7 @@ class StepFlowPickHandler extends LitElement {
 
   @property() public hass!: HomeAssistant;
   @property() public handlers!: string[];
+  @property() public showAdvanced?: boolean;
   @property() private filter?: string;
   private _width?: number;
 
@@ -79,18 +80,24 @@ class StepFlowPickHandler extends LitElement {
             `
         )}
       </div>
-      <p>
-        ${this.hass.localize(
-          "ui.panel.config.integrations.note_about_integrations"
-        )}<br />
-        ${this.hass.localize(
-          "ui.panel.config.integrations.note_about_website_reference"
-        )}<a href="https://www.home-assistant.io/integrations/"
-          >${this.hass.localize(
-            "ui.panel.config.integrations.home_assistant_website"
-          )}.</a
-        >
-      </p>
+      ${this.showAdvanced
+        ? html`
+            <p>
+              ${this.hass.localize(
+                "ui.panel.config.integrations.note_about_integrations"
+              )}<br />
+              ${this.hass.localize(
+                "ui.panel.config.integrations.note_about_website_reference"
+              )}<a
+                href="https://www.home-assistant.io/integrations/"
+                target="_blank"
+                >${this.hass.localize(
+                  "ui.panel.config.integrations.home_assistant_website"
+                )}</a
+              >.
+            </p>
+          `
+        : ""}
     `;
   }
 
@@ -133,6 +140,11 @@ class StepFlowPickHandler extends LitElement {
       }
       p {
         text-align: center;
+        padding: 16px;
+        margin: 0;
+      }
+      p > a {
+        color: var(--primary-color);
       }
     `;
   }
diff --git a/src/panels/config/integrations/ha-config-entries-dashboard.ts b/src/panels/config/integrations/ha-config-entries-dashboard.ts
index 03a420d37a..4c31ee2966 100644
--- a/src/panels/config/integrations/ha-config-entries-dashboard.ts
+++ b/src/panels/config/integrations/ha-config-entries-dashboard.ts
@@ -42,6 +42,7 @@ import { DataEntryFlowProgress } from "../../../data/data_entry_flow";
 @customElement("ha-config-entries-dashboard")
 export class HaConfigManagerDashboard extends LitElement {
   @property() public hass!: HomeAssistant;
+  @property() public showAdvanced!: boolean;
 
   @property() private configEntries!: ConfigEntry[];
 
@@ -164,6 +165,7 @@ export class HaConfigManagerDashboard extends LitElement {
   private _createFlow() {
     showConfigFlowDialog(this, {
       dialogClosedCallback: () => fireEvent(this, "hass-reload-entries"),
+      showAdvanced: this.showAdvanced,
     });
   }
 
diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts
index c471288ca4..8e97de6e37 100644
--- a/src/panels/config/integrations/ha-config-integrations.ts
+++ b/src/panels/config/integrations/ha-config-integrations.ts
@@ -39,6 +39,7 @@ declare global {
 class HaConfigIntegrations extends HassRouterPage {
   @property() public hass!: HomeAssistant;
   @property() public narrow!: boolean;
+  @property() public showAdvanced!: boolean;
 
   protected routerOptions: RouterOptions = {
     defaultPage: "dashboard",
@@ -99,6 +100,8 @@ class HaConfigIntegrations extends HassRouterPage {
 
     pageEl.entityRegistryEntries = this._entityRegistryEntries;
     pageEl.configEntries = this._configEntries;
+    pageEl.narrow = this.narrow;
+    pageEl.showAdvanced = this.showAdvanced;
 
     if (this._currentPage === "dashboard") {
       pageEl.configEntriesInProgress = this._configEntriesInProgress;
@@ -108,7 +111,6 @@ class HaConfigIntegrations extends HassRouterPage {
     pageEl.configEntryId = this.routeTail.path.substr(1);
     pageEl.deviceRegistryEntries = this._deviceRegistryEntries;
     pageEl.areas = this._areas;
-    pageEl.narrow = this.narrow;
   }
 
   private _loadData() {

From e435b9153b35650f76018e621e1ef0039bab0bfd Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 23 Oct 2019 01:11:56 +0200
Subject: [PATCH 67/70] Clean up device card (#4108)

---
 .../devices/device-detail/ha-device-card.js   | 157 ------------------
 .../devices/device-detail/ha-device-card.ts   | 132 +++++++++++++++
 .../device-detail/ha-device-entities-card.ts  |   9 +-
 src/translations/en.json                      |   1 +
 4 files changed, 141 insertions(+), 158 deletions(-)
 delete mode 100644 src/panels/config/devices/device-detail/ha-device-card.js
 create mode 100644 src/panels/config/devices/device-detail/ha-device-card.ts

diff --git a/src/panels/config/devices/device-detail/ha-device-card.js b/src/panels/config/devices/device-detail/ha-device-card.js
deleted file mode 100644
index 94ee330e7e..0000000000
--- a/src/panels/config/devices/device-detail/ha-device-card.js
+++ /dev/null
@@ -1,157 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../../../../components/ha-card";
-
-import { EventsMixin } from "../../../../mixins/events-mixin";
-import LocalizeMixin from "../../../../mixins/localize-mixin";
-import { compare } from "../../../../common/string/compare";
-import { updateDeviceRegistryEntry } from "../../../../data/device_registry";
-import {
-  loadDeviceRegistryDetailDialog,
-  showDeviceRegistryDetailDialog,
-} from "../../../../dialogs/device-registry-detail/show-dialog-device-registry-detail";
-
-/*
- * @appliesMixin EventsMixin
- */
-class HaDeviceCard extends EventsMixin(LocalizeMixin(PolymerElement)) {
-  static get template() {
-    return html`
-      <style>
-        ha-card {
-          flex: 1 0 100%;
-          padding-bottom: 10px;
-          min-width: 0;
-        }
-        .card-header {
-          display: flex;
-          justify-content: space-between;
-        }
-        .card-header .name {
-          width: 90%;
-        }
-        .device {
-          width: 30%;
-        }
-        .device .name {
-          font-weight: bold;
-        }
-        .device .model,
-        .device .manuf,
-        .device .area {
-          color: var(--secondary-text-color);
-        }
-        .area .extra-info .name {
-          color: var(--primary-text-color);
-        }
-        .extra-info {
-          margin-top: 8px;
-        }
-        .manuf,
-        .entity-id,
-        .area {
-          color: var(--secondary-text-color);
-        }
-      </style>
-      <ha-card>
-        <div class="card-content">
-          <div class="info">
-            <div class="model">[[device.model]]</div>
-            <div class="manuf">
-              [[localize('ui.panel.config.integrations.config_entry.manuf',
-              'manufacturer', device.manufacturer)]]
-            </div>
-            <template is="dom-if" if="[[device.area_id]]">
-              <div class="area">
-                <div class="extra-info">
-                  [[localize('ui.panel.config.integrations.device_registry.area')]]
-                  <span class="name">{{_computeArea(areas, device)}}</span>
-                </div>
-              </div>
-            </template>
-          </div>
-          <template is="dom-if" if="[[device.via_device_id]]">
-            <div class="extra-info">
-              [[localize('ui.panel.config.integrations.config_entry.via')]]
-              <span class="hub"
-                >[[_computeDeviceName(devices, device.via_device_id)]]</span
-              >
-            </div>
-          </template>
-          <template is="dom-if" if="[[device.sw_version]]">
-            <div class="extra-info">
-              [[localize('ui.panel.config.integrations.config_entry.firmware',
-              'version', device.sw_version)]]
-            </div>
-          </template>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  static get properties() {
-    return {
-      device: Object,
-      devices: Array,
-      areas: Array,
-      hass: Object,
-      narrow: {
-        type: Boolean,
-        reflectToAttribute: true,
-      },
-      _childDevices: {
-        type: Array,
-        computed: "_computeChildDevices(device, devices)",
-      },
-    };
-  }
-
-  firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-    loadDeviceRegistryDetailDialog();
-  }
-
-  _computeArea(areas, device) {
-    if (!areas || !device || !device.area_id) {
-      return "No Area";
-    }
-    // +1 because of "No Area" entry
-    return areas.find((area) => area.area_id === device.area_id).name;
-  }
-
-  _computeChildDevices(device, devices) {
-    return devices
-      .filter((dev) => dev.via_device_id === device.id)
-      .sort((dev1, dev2) => compare(dev1.name, dev2.name));
-  }
-
-  _deviceName(device) {
-    return device.name_by_user || device.name;
-  }
-
-  _computeDeviceName(devices, deviceId) {
-    const device = devices.find((dev) => dev.id === deviceId);
-    return device
-      ? this._deviceName(device)
-      : `(${this.localize(
-          "ui.panel.config.integrations.config_entry.device_unavailable"
-        )})`;
-  }
-
-  _gotoSettings() {
-    const device = this.device;
-    showDeviceRegistryDetailDialog(this, {
-      device,
-      updateEntry: async (updates) => {
-        await updateDeviceRegistryEntry(this.hass, device.id, updates);
-      },
-    });
-  }
-
-  _openMoreInfo(ev) {
-    this.fire("hass-more-info", { entityId: ev.model.entity.entity_id });
-  }
-}
-
-customElements.define("ha-device-card", HaDeviceCard);
diff --git a/src/panels/config/devices/device-detail/ha-device-card.ts b/src/panels/config/devices/device-detail/ha-device-card.ts
new file mode 100644
index 0000000000..86e3109793
--- /dev/null
+++ b/src/panels/config/devices/device-detail/ha-device-card.ts
@@ -0,0 +1,132 @@
+import "../../../../components/ha-card";
+
+import { DeviceRegistryEntry } from "../../../../data/device_registry";
+import { loadDeviceRegistryDetailDialog } from "../../../../dialogs/device-registry-detail/show-dialog-device-registry-detail";
+import {
+  LitElement,
+  html,
+  customElement,
+  property,
+  TemplateResult,
+  CSSResult,
+  css,
+} from "lit-element";
+import { HomeAssistant } from "../../../../types";
+import { AreaRegistryEntry } from "../../../../data/area_registry";
+
+@customElement("ha-device-card")
+export class HaDeviceCard extends LitElement {
+  @property() public hass!: HomeAssistant;
+  @property() public device!: DeviceRegistryEntry;
+  @property() public devices!: DeviceRegistryEntry[];
+  @property() public areas!: AreaRegistryEntry[];
+  @property() public narrow!: boolean;
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-card>
+        <div class="card-content">
+          <div class="info">
+            <div class="model">${this.device.model}</div>
+            <div class="manuf">
+              ${this.hass.localize(
+                "ui.panel.config.integrations.config_entry.manuf",
+                "manufacturer",
+                this.device.manufacturer
+              )}
+            </div>
+            ${this.device.area_id
+              ? html`
+                  <div class="area">
+                    <div class="extra-info">
+                      ${this.hass.localize(
+                        "ui.panel.config.integrations.config_entry.area",
+                        "area",
+                        this._computeArea(this.areas, this.device)
+                      )}
+                    </div>
+                  </div>
+                `
+              : ""}
+          </div>
+          ${this.device.via_device_id
+            ? html`
+                <div class="extra-info">
+                  ${this.hass.localize(
+                    "ui.panel.config.integrations.config_entry.via"
+                  )}
+                  <span class="hub"
+                    >${this._computeDeviceName(
+                      this.devices,
+                      this.device.via_device_id
+                    )}</span
+                  >
+                </div>
+              `
+            : ""}
+          ${this.device.sw_version
+            ? html`
+                <div class="extra-info">
+                  ${this.hass.localize(
+                    "ui.panel.config.integrations.config_entry.firmware",
+                    "version",
+                    this.device.sw_version
+                  )}
+                </div>
+              `
+            : ""}
+        </div>
+      </ha-card>
+    `;
+  }
+
+  protected firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+    loadDeviceRegistryDetailDialog();
+  }
+
+  private _computeArea(areas, device) {
+    if (!areas || !device || !device.area_id) {
+      return "No Area";
+    }
+    // +1 because of "No Area" entry
+    return areas.find((area) => area.area_id === device.area_id).name;
+  }
+
+  private _deviceName(device) {
+    return device.name_by_user || device.name;
+  }
+
+  private _computeDeviceName(devices, deviceId) {
+    const device = devices.find((dev) => dev.id === deviceId);
+    return device
+      ? this._deviceName(device)
+      : `(${this.hass.localize(
+          "ui.panel.config.integrations.config_entry.device_unavailable"
+        )})`;
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      ha-card {
+        flex: 1 0 100%;
+        padding-bottom: 10px;
+        min-width: 0;
+      }
+      .device {
+        width: 30%;
+      }
+      .area {
+        color: var(--primary-text-color);
+      }
+      .extra-info {
+        margin-top: 8px;
+      }
+      .manuf,
+      .entity-id,
+      .model {
+        color: var(--secondary-text-color);
+      }
+    `;
+  }
+}
diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index 686d840e49..3b19563b86 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -62,6 +62,7 @@ export class HaDeviceEntitiesCard extends LitElement {
                   ${stateObj
                     ? html`
                         <state-badge
+                          @click=${this._openMoreInfo}
                           .stateObj=${stateObj}
                           slot="item-icon"
                         ></state-badge>
@@ -72,7 +73,7 @@ export class HaDeviceEntitiesCard extends LitElement {
                           .icon=${domainIcon(computeDomain(entry.entity_id))}
                         ></ha-icon>
                       `}
-                  <paper-item-body two-line>
+                  <paper-item-body two-line @click=${this._openMoreInfo}>
                     <div class="name">${entry.stateName}</div>
                     <div class="secondary entity-id">${entry.entity_id}</div>
                   </paper-item-body>
@@ -139,6 +140,12 @@ export class HaDeviceEntitiesCard extends LitElement {
       .disabled-entry {
         color: var(--secondary-text-color);
       }
+      state-badge {
+        cursor: pointer;
+      }
+      paper-icon-item:not(.disabled-entry) paper-item-body {
+        cursor: pointer;
+      }
     `;
   }
 }
diff --git a/src/translations/en.json b/src/translations/en.json
index 03fab1fae2..984a9ffa1d 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1204,6 +1204,7 @@
             "firmware": "Firmware: {version}",
             "device_unavailable": "device unavailable",
             "entity_unavailable": "entity unavailable",
+            "area": "In {area}",
             "no_area": "No Area"
           },
           "config_flow": {

From 39d052273d0a1b084197b0c61e8e57ce1ccfa2f8 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 23 Oct 2019 12:30:09 -0500
Subject: [PATCH 68/70] support actions on rows (#4023)

* support actions on rows

* address comments

* add type

* pointer events

* move action area to row name to avoid handler competition

* add action to state-badge as well

* correct type

* address comments

* handle 'enter' in long-press and make entities state-badge selecatable
---
 .../lovelace/cards/hui-entities-card.ts       | 20 ------
 src/panels/lovelace/cards/types.ts            |  3 +
 .../common/directives/long-press-directive.ts |  7 +++
 .../components/hui-generic-entity-row.ts      | 61 ++++++++++++++++++-
 .../hui-input-select-entity-row.ts            | 47 ++++++++++++--
 5 files changed, 112 insertions(+), 26 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index ce5a2df85b..3b7d1de39e 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -12,16 +12,12 @@ import {
 import "../../../components/ha-card";
 import "../components/hui-entities-toggle";
 
-import { fireEvent } from "../../../common/dom/fire_event";
-import { DOMAINS_HIDE_MORE_INFO } from "../../../common/const";
 import { HomeAssistant } from "../../../types";
 import { EntityRow } from "../entity-rows/types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
 import { processConfigEntities } from "../common/process-config-entities";
 import { createRowElement } from "../common/create-row-element";
 import { EntitiesCardConfig, EntitiesCardEntityConfig } from "./types";
-
-import { computeDomain } from "../../../common/entity/compute_domain";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-entities-card")
@@ -161,10 +157,6 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
         overflow: hidden;
       }
 
-      .state-card-dialog {
-        cursor: pointer;
-      }
-
       .icon {
         padding: 0px 18px 0px 8px;
       }
@@ -176,23 +168,11 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
     if (this._hass) {
       element.hass = this._hass;
     }
-    if (
-      entityConf.entity &&
-      !DOMAINS_HIDE_MORE_INFO.includes(computeDomain(entityConf.entity))
-    ) {
-      element.classList.add("state-card-dialog");
-      element.addEventListener("click", () => this._handleClick(entityConf));
-    }
 
     return html`
       <div>${element}</div>
     `;
   }
-
-  private _handleClick(entityConf: EntitiesCardEntityConfig): void {
-    const entityId = entityConf.entity;
-    fireEvent(this, "hass-more-info", { entityId });
-  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index 7b0d74c5e5..95f84d030e 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -28,6 +28,9 @@ export interface EntitiesCardEntityConfig extends EntityConfig {
   service?: string;
   service_data?: object;
   url?: string;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
 }
 
 export interface EntitiesCardConfig extends LovelaceCardConfig {
diff --git a/src/panels/lovelace/common/directives/long-press-directive.ts b/src/panels/lovelace/common/directives/long-press-directive.ts
index b4402add08..832721068b 100644
--- a/src/panels/lovelace/common/directives/long-press-directive.ts
+++ b/src/panels/lovelace/common/directives/long-press-directive.ts
@@ -138,9 +138,16 @@ class LongPress extends HTMLElement implements LongPress {
       window.setTimeout(() => (this.cooldownEnd = false), 100);
     };
 
+    const handleEnter = (ev: Event) => {
+      if ((ev as KeyboardEvent).keyCode === 13) {
+        return clickEnd(ev);
+      }
+    };
+
     element.addEventListener("touchstart", clickStart, { passive: true });
     element.addEventListener("touchend", clickEnd);
     element.addEventListener("touchcancel", clickEnd);
+    element.addEventListener("keyup", handleEnter);
 
     // iOS 13 sends a complete normal touchstart-touchend series of events followed by a mousedown-click series.
     // That might be a bug, but until it's fixed, this should make long-press work.
diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts
index 9ec024dc0f..c710b1acb3 100644
--- a/src/panels/lovelace/components/hui-generic-entity-row.ts
+++ b/src/panels/lovelace/components/hui-generic-entity-row.ts
@@ -16,8 +16,14 @@ import "../components/hui-warning";
 
 import { HomeAssistant } from "../../../types";
 import { computeRTL } from "../../../common/util/compute_rtl";
-import { EntitiesCardEntityConfig } from "../cards/types";
 import { toggleAttribute } from "../../../common/dom/toggle_attribute";
+import { longPress } from "../common/directives/long-press-directive";
+import { hasDoubleClick } from "../common/has-double-click";
+import { handleClick } from "../common/handle-click";
+import { DOMAINS_HIDE_MORE_INFO } from "../../../common/const";
+import { computeDomain } from "../../../common/entity/compute_domain";
+import { classMap } from "lit-html/directives/class-map";
+import { EntitiesCardEntityConfig } from "../cards/types";
 
 class HuiGenericEntityRow extends LitElement {
   @property() public hass?: HomeAssistant;
@@ -46,15 +52,45 @@ class HuiGenericEntityRow extends LitElement {
       `;
     }
 
+    const pointer =
+      (this.config.tap_action && this.config.tap_action.action !== "none") ||
+      (this.config.entity &&
+        !DOMAINS_HIDE_MORE_INFO.includes(computeDomain(this.config.entity)));
+
     return html`
       <state-badge
+        class=${classMap({
+          pointer,
+        })}
         .hass=${this.hass}
         .stateObj=${stateObj}
         .overrideIcon=${this.config.icon}
         .overrideImage=${this.config.image}
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this.config.double_tap_action),
+        })}
+        tabindex="0"
       ></state-badge>
       <div class="flex">
-        <div class="info">
+        <div
+          class=${classMap({
+            info: true,
+            pointer,
+            padName: this.showSecondary && !this.config.secondary_info,
+            padSecondary: Boolean(
+              !this.showSecondary || this.config.secondary_info
+            ),
+          })}
+          @ha-click=${this._handleClick}
+          @ha-hold=${this._handleHold}
+          @ha-dblclick=${this._handleDblClick}
+          .longPress=${longPress({
+            hasDoubleClick: hasDoubleClick(this.config.double_tap_action),
+          })}
+        >
           ${this.config.name || computeStateName(stateObj)}
           <div class="secondary">
             ${!this.showSecondary
@@ -86,6 +122,18 @@ class HuiGenericEntityRow extends LitElement {
     }
   }
 
+  private _handleClick(): void {
+    handleClick(this, this.hass!, this.config!, false, false);
+  }
+
+  private _handleHold(): void {
+    handleClick(this, this.hass!, this.config!, true, false);
+  }
+
+  private _handleDblClick(): void {
+    handleClick(this, this.hass!, this.config!, false, true);
+  }
+
   static get styles(): CSSResult {
     return css`
       :host {
@@ -132,6 +180,15 @@ class HuiGenericEntityRow extends LitElement {
         margin-left: 0;
         margin-right: 8px;
       }
+      .pointer {
+        cursor: pointer;
+      }
+      .padName {
+        padding: 12px 0px;
+      }
+      .padSecondary {
+        padding: 4px 0px;
+      }
     `;
   }
 }
diff --git a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
index 12abfa60ad..e116c6e0d5 100644
--- a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
@@ -18,19 +18,26 @@ import "../components/hui-warning";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { HomeAssistant, InputSelectEntity } from "../../../types";
-import { EntityRow, EntityConfig } from "./types";
+import { EntityRow } from "./types";
 import { setInputSelectOption } from "../../../data/input-select";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { forwardHaptic } from "../../../data/haptics";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
+import { longPress } from "../common/directives/long-press-directive";
+import { hasDoubleClick } from "../common/has-double-click";
+import { handleClick } from "../common/handle-click";
+import { classMap } from "lit-html/directives/class-map";
+import { DOMAINS_HIDE_MORE_INFO } from "../../../common/const";
+import { computeDomain } from "../../../common/entity/compute_domain";
+import { EntitiesCardEntityConfig } from "../cards/types";
 
 @customElement("hui-input-select-entity-row")
 class HuiInputSelectEntityRow extends LitElement implements EntityRow {
   @property() public hass?: HomeAssistant;
 
-  @property() private _config?: EntityConfig;
+  @property() private _config?: EntitiesCardEntityConfig;
 
-  public setConfig(config: EntityConfig): void {
+  public setConfig(config: EntitiesCardEntityConfig): void {
     if (!config || !config.entity) {
       throw new Error("Invalid Configuration: 'entity' required");
     }
@@ -63,8 +70,25 @@ class HuiInputSelectEntityRow extends LitElement implements EntityRow {
       `;
     }
 
+    const pointer =
+      (this._config.tap_action && this._config.tap_action.action !== "none") ||
+      (this._config.entity &&
+        !DOMAINS_HIDE_MORE_INFO.includes(computeDomain(this._config.entity)));
+
     return html`
-      <state-badge .stateObj="${stateObj}"></state-badge>
+      <state-badge
+        .stateObj=${stateObj}
+        class=${classMap({
+          pointer,
+        })}
+        @ha-click=${this._handleClick}
+        @ha-hold=${this._handleHold}
+        @ha-dblclick=${this._handleDblClick}
+        .longPress=${longPress({
+          hasDoubleClick: hasDoubleClick(this._config.double_tap_action),
+        })}
+        tabindex="0"
+      ></state-badge>
       <ha-paper-dropdown-menu
         .label=${this._config.name || computeStateName(stateObj)}
         .value=${stateObj.state}
@@ -103,6 +127,18 @@ class HuiInputSelectEntityRow extends LitElement implements EntityRow {
     )!.selected = stateObj.attributes.options.indexOf(stateObj.state);
   }
 
+  private _handleClick(): void {
+    handleClick(this, this.hass!, this._config!, false, false);
+  }
+
+  private _handleHold(): void {
+    handleClick(this, this.hass!, this._config!, true, false);
+  }
+
+  private _handleDblClick(): void {
+    handleClick(this, this.hass!, this._config!, false, true);
+  }
+
   static get styles(): CSSResult {
     return css`
       :host {
@@ -118,6 +154,9 @@ class HuiInputSelectEntityRow extends LitElement implements EntityRow {
         cursor: pointer;
         min-width: 200px;
       }
+      .pointer {
+        cursor: pointer;
+      }
     `;
   }
 

From b34b52f30583a8761db02b85862d9c4256698ccd Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 23 Oct 2019 21:16:03 +0200
Subject: [PATCH 69/70] Update translations

---
 translations/ca.json      | 421 ++++++++++++++++++++++++++++++++++----
 translations/cs.json      | 108 +++++++++-
 translations/cy.json      | 113 +++++++++-
 translations/da.json      | 314 ++++++++++++++++++++++++++--
 translations/de.json      | 371 +++++++++++++++++++++++++++++++--
 translations/el.json      | 258 +++++++++++++++++++++--
 translations/en.json      | 373 +++++++++++++++++++++++++++++++--
 translations/es.json      | 371 +++++++++++++++++++++++++++++++--
 translations/et.json      | 318 ++++++++++++++++++++++++++--
 translations/fa.json      |  50 ++++-
 translations/fi.json      | 355 ++++++++++++++++++++++++++++++--
 translations/fr.json      | 399 +++++++++++++++++++++++++++++++++---
 translations/he.json      | 122 +++++++++--
 translations/hu.json      | 331 ++++++++++++++++++++++++++++--
 translations/is.json      | 228 +++++++++++++++++++--
 translations/it.json      | 371 +++++++++++++++++++++++++++++++--
 translations/ko.json      | 393 ++++++++++++++++++++++++++++++++---
 translations/lb.json      | 371 +++++++++++++++++++++++++++++++--
 translations/nb.json      | 371 +++++++++++++++++++++++++++++++--
 translations/nl.json      | 223 ++++++++++++++++++--
 translations/pl.json      | 409 ++++++++++++++++++++++++++++++++----
 translations/pt.json      | 284 +++++++++++++++++++++++--
 translations/ru.json      | 324 +++++++++++++++++++++++++++--
 translations/sk.json      |  74 ++++++-
 translations/sl.json      | 373 +++++++++++++++++++++++++++++++--
 translations/uk.json      |  26 +++
 translations/zh-Hant.json | 371 +++++++++++++++++++++++++++++++--
 27 files changed, 7224 insertions(+), 498 deletions(-)

diff --git a/translations/ca.json b/translations/ca.json
index 06b1157f84..58de1711b0 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -387,7 +387,7 @@
                                 "introduction": "Algunes parts de la configuració de Home Assistant es poden recarregar sense necessitat de reiniciar-les. Les opcions de sota esborraran la configuració antiga i carregaran la nova.",
                                 "core": "Recarrega el nucli",
                                 "group": "Recarrega grups",
-                                "automation": "Recarrega automatismes",
+                                "automation": "Recarrega automatitzacions",
                                 "script": "Recarrega programes"
                             },
                             "server_management": {
@@ -409,24 +409,24 @@
                 },
                 "automation": {
                     "caption": "Automatització",
-                    "description": "Crea i edita automatismes",
+                    "description": "Crea i edita automatitzacions",
                     "picker": {
-                        "header": "Editor d'automatismes",
-                        "introduction": "L'editor d'automatismes permet crear i editar automatismes. Vés a l'enllaç de sota per llegir les instruccions i assegurar-te que has configurat el Home Assistant correctament.",
-                        "pick_automation": "Selecciona l'automatisme a editar",
-                        "no_automations": "No s'ha pogut trobar cap automatisme editable",
-                        "add_automation": "Afegir automatisme",
-                        "learn_more": "Més informació sobre els automatismes"
+                        "header": "Editor d'automatitzacions",
+                        "introduction": "L'editor d'automatitzacions et permet crear i editar automatitzacions. Vés a l'enllaç de sota per veure'n les instruccions i assegurar-te que has configurat el Home Assistant correctament.",
+                        "pick_automation": "Tria l'automatització a editar",
+                        "no_automations": "No s'ha pogut trobar cap automatització editable",
+                        "add_automation": "Afegeix automatització",
+                        "learn_more": "Més informació sobre les automatitzacions"
                     },
                     "editor": {
-                        "introduction": "Utilitza els automatismes per donar més vida a la teva casa",
-                        "default_name": "Nou automatisme",
+                        "introduction": "Utilitza les automatitzacions per donar més vida a la teva casa",
+                        "default_name": "Nova automatització",
                         "save": "Desa",
                         "unsaved_confirm": "Hi ha canvis no desats. Segur que vols sortir?",
                         "alias": "Nom",
                         "triggers": {
                             "header": "Activadors",
-                            "introduction": "Els activadors són les regles que fan que es dispari un automatisme. Pots definir més d'un activador per a cada automatisme. Una vegada s'iniciï un activador, el Home Assistant validarà les condicions (si n'hi ha) i finalment cridarà l'acció.",
+                            "introduction": "Els activadors són les regles que fan que es dispari una automatització. Pots definir més d'un activador per a cada automatització. Una vegada s'iniciï un activador, el Home Assistant validarà les condicions (si n'hi ha) i finalment cridarà l'acció.",
                             "add": "Afegir activador",
                             "duplicate": "Duplicar",
                             "delete": "Elimina",
@@ -516,7 +516,7 @@
                         },
                         "conditions": {
                             "header": "Condicions",
-                            "introduction": "Les condicions són una part opcional d'un automatisme i es poden utilitzar per permetre o evitar que es produeixi l'acció quan s'activa l'automatisme. Les condicions són similars als activadors però funcionen de forma diferent: un activador analitza els esdeveniments que ocorren en el sistema mentre que una condició només observa com està el sistema en un moment determinat, per exemple, un activador se n'adonarà de quan s'està activant un interruptor mentre que una condició només pot veure si un interruptor està activat o desactivat.",
+                            "introduction": "Les condicions són part opcional d'una automatització i es poden utilitzar per permetre o evitar que es produeixi una acció quan es dispari l'automatització. Les condicions són similars als activadors però funcionen de forma diferent: un activador analitza els esdeveniments que ocorren en el sistema mentre que una condició només observa com està el sistema en un moment determinat, per exemple, un activador se n'adonarà de quan s'està activant un interruptor mentre que una condició només pot veure si un interruptor està activat o desactivat.",
                             "add": "Afegir condició",
                             "duplicate": "Duplicar",
                             "delete": "Elimina",
@@ -558,20 +558,25 @@
                                     "zone": "Zona"
                                 },
                                 "device": {
-                                    "label": "Dispositiu"
+                                    "label": "Dispositiu",
+                                    "extra_fields": {
+                                        "above": "A sobre",
+                                        "below": "A sota",
+                                        "for": "Durada"
+                                    }
                                 },
                                 "and": {
-                                    "label": "I"
+                                    "label": "I (AND lògic)"
                                 },
                                 "or": {
-                                    "label": "O"
+                                    "label": "O (OR lògic)"
                                 }
                             },
                             "learn_more": "Més informació sobre les condicions"
                         },
                         "actions": {
                             "header": "Accions",
-                            "introduction": "Les accions són allò que farà Home Assistant quan s'activi l'automatisme i es compleixin totes les condicions (si n'hi ha).",
+                            "introduction": "Les accions són allò que farà Home Assistant quan es dispari l'automatització i es compleixin totes les condicions (si n'hi ha).",
                             "add": "Afegir acció",
                             "duplicate": "Duplicar",
                             "delete": "Elimina",
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Dispositiu"
+                                },
+                                "scene": {
+                                    "label": "Activa escena"
                                 }
                             },
                             "learn_more": "Més informació sobre les accions"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Programació",
-                    "description": "Crea i edita programes (scripts)"
+                    "description": "Crea i edita programes (scripts)",
+                    "picker": {
+                        "header": "Editor de scripts",
+                        "introduction": "L'editor de scripts et permet crear i editar scripts. Vés a l'enllaç de sota per veure'n les instruccions i assegurar-te que has configurat el Home Assistant correctament.",
+                        "learn_more": "Més informació sobre els scripts",
+                        "no_scripts": "No hem trobat cap script editable",
+                        "add_script": "Afegeix script"
+                    },
+                    "editor": {
+                        "header": "Script: {name}",
+                        "default_name": "Nou script",
+                        "load_error_not_editable": "Només es poden editar els scripts dins de l'arxiu scripts.yaml.",
+                        "delete_confirm": "Estàs segur que vols eliminar aquest script?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Cert",
                         "false": "Fals",
                         "set_config_parameter": "Defineix el paràmetre de configuració"
+                    },
+                    "learn_more": "Més informació sobre Z-Wave",
+                    "ozw_log": {
+                        "header": "Registre d'OZW",
+                        "introduction": "Consulta el registre. 0 és el mínim (carrega el registre complet) i 1000 és el màxim. La càrrega mostrarà un registre estàtic i la cua s’actualitzarà automàticament amb l’últim número de línies especificat."
                     }
                 },
                 "users": {
                     "caption": "Usuaris",
                     "description": "Gestiona els usuaris",
                     "picker": {
-                        "title": "Usuaris"
+                        "title": "Usuaris",
+                        "system_generated": "Generat pel sistema"
                     },
                     "editor": {
                         "rename_user": "Canviar el nom d'usuari",
@@ -678,7 +705,18 @@
                         "activate_user": "Activar usuari",
                         "deactivate_user": "Desactivar usuari",
                         "delete_user": "Eliminar usuari",
-                        "caption": "Mostrar usuari"
+                        "caption": "Mostrar usuari",
+                        "id": "ID",
+                        "owner": "Propietari",
+                        "group": "Grup",
+                        "active": "Actiu",
+                        "system_generated": "Generat pel sistema",
+                        "system_generated_users_not_removable": "No es poden eliminar usuaris generats pel sistema.",
+                        "unnamed_user": "Usuari sense nom",
+                        "enter_new_name": "Introdueix nou nom",
+                        "user_rename_failed": "El canvi de nom d'usuari ha fallat:",
+                        "group_update_failed": "L'actualització del grup ha fallat:",
+                        "confirm_user_deletion": "Estàs segur que vols eliminar {name}?"
                     },
                     "add_user": {
                         "caption": "Afegir usuari",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Sessió iniciada com a {email}",
                     "description_not_login": "No has iniciat sessió",
-                    "description_features": "Controla la casa des de fora, pots integrar Alexa i Google Assistant."
+                    "description_features": "Controla la casa des de fora, pots integrar Alexa i Google Assistant.",
+                    "login": {
+                        "title": "Inici de sessió des del núvol (Cloud)",
+                        "introduction": "Home Assistant Cloud t'ofereix una connexió remota i segura amb la teva instància mentre siguis fora de casa. També et permet connectar-te amb els serveis només disponibles al núvol: Amazon Alexa i Google Assistant.",
+                        "introduction2": "Aquest servei està gestionat pel nostre soci ",
+                        "introduction2a": ", una empresa fundada pels creadors de Home Assistant i Hass.io.",
+                        "introduction3": "Home Assistant Cloud és un servei de subscripció amb una prova gratuïta d’un mes. No és necessària la informació de pagament.",
+                        "learn_more_link": "Més informació sobre Home Assistant Cloud",
+                        "dismiss": "Desestimar",
+                        "sign_in": "Inicia sessió",
+                        "email": "Correu electrònic",
+                        "email_error_msg": "Correu electrònic invàlid",
+                        "password": "Contrasenya",
+                        "password_error_msg": "La contrasenya han de tenir un mínim de 8 caràcters",
+                        "forgot_password": "has oblidat la contrasenya?",
+                        "start_trial": "Inicia la prova gratuïta d'1 mes",
+                        "trial_info": "No és necessària la informació de pagament",
+                        "alert_password_change_required": "Has de canviar la teva contrasenya abans d’iniciar sessió.",
+                        "alert_email_confirm_necessary": "Has de confirmar el teu correu electrònic abans d’iniciar sessió."
+                    },
+                    "forgot_password": {
+                        "title": "Oblit de la contrasenya",
+                        "subtitle": "Has oblidat la teva contrasenya",
+                        "instructions": "Introdueix el teu correu electrònic i t'enviarem un enllaç per restablir la contrasenya.",
+                        "email": "Correu electrònic",
+                        "email_error_msg": "Correu electrònic invàlid",
+                        "send_reset_email": "Envia correu electrònic de restabliment",
+                        "check_your_email": "Consulta el correu electrònic per obtenir instruccions sobre com restablir la teva contrasenya."
+                    },
+                    "register": {
+                        "title": "Registre del compte",
+                        "headline": "Inicia la prova gratuïta",
+                        "information": "Crea un compte per iniciar la prova gratuïta d’un mes amb Home Assistant Cloud. No és necessària la informació de pagament.",
+                        "information2": "La prova et donarà accés a tots els avantatges de Home Assistant Cloud, inclosos:",
+                        "feature_remote_control": "Control de Home Assistant fora de casa",
+                        "feature_google_home": "Integració amb Google Assistant",
+                        "feature_amazon_alexa": "Integració amb Amazon Alexa",
+                        "feature_webhook_apps": "Fàcil integració amb aplicacions basades an webhook com OwnTracks",
+                        "information3": "Aquest servei està gestionat pel nostre soci ",
+                        "information3a": ", una empresa fundada pels creadors de Home Assistant i Hass.io.",
+                        "information4": "En registrar un compte, acceptes els termes i condicions següents.",
+                        "link_terms_conditions": "Termes i condicions",
+                        "link_privacy_policy": "Política de privacitat",
+                        "create_account": "Crear compte",
+                        "email_address": "Correu electrònic",
+                        "email_error_msg": "Correu electrònic invàlid",
+                        "password": "Contrasenya",
+                        "password_error_msg": "La contrasenya han de tenir un mínim de 8 caràcters",
+                        "start_trial": "Inicia la prova",
+                        "resend_confirm_email": "Reenvia el correu de confirmació",
+                        "account_created": "Compte creat! Consulta el correu electrònic per obtenir instruccions sobre com activar el compte."
+                    },
+                    "account": {
+                        "thank_you_note": "Gràcies per formar part de Home Assistant Cloud. És gràcies a persones com tu que podem oferir una experiència domòtica excel·lent per a tothom.",
+                        "nabu_casa_account": "Compte Nabu Casa",
+                        "connection_status": "Estat de connexió amb Cloud",
+                        "manage_account": "Gestió del compte",
+                        "sign_out": "Tanca sessió",
+                        "integrations": "Integracions",
+                        "integrations_introduction": "Les integracions per Home Assistant Cloud et permeten connectar-vos a d'altres serveis al núvol sense haver d’exposar la teva instància de Home Assistant públicament a Internet.",
+                        "integrations_introduction2": "Consulta el lloc web per ",
+                        "integrations_link_all_features": "totes les funcions disponibles",
+                        "connected": "Connectat",
+                        "not_connected": "No connectat",
+                        "fetching_subscription": "Obtenint la subscripció...",
+                        "remote": {
+                            "title": "Control remot",
+                            "access_is_being_prepared": "S’està preparant l’accés remot. T’avisarem quan estigui a punt.",
+                            "info": "Home Assistant Cloud t'ofereix una connexió remota i segura amb la teva instància mentre siguis fora de casa",
+                            "instance_is_available": "La teva instància està disponible a",
+                            "instance_will_be_available": "La teva instància estarà disponible a",
+                            "link_learn_how_it_works": "Informació sobre com funciona",
+                            "certificate_info": "Informació del certificat"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Amb la integració d'Alexa per Home Assistant Cloud podràs controlar tots els dispositius de Home Assistant a través dels dispositius compatibles amb Alexa.",
+                            "enable_ha_skill": "Activa l'auxiliar de Home Assistant per Alexa",
+                            "config_documentation": "Documentació de configuració",
+                            "enable_state_reporting": "Activa els informes d’estat",
+                            "info_state_reporting": "Si actives els informes d'estat, Home Assistant enviarà a Amazon tots els canvis d’estat de les entitats exposades. Això et permetrà veure els últims estats a l’aplicació Alexa i utilitzar-los per crear rutines.",
+                            "sync_entities": "Sincronitza les entitats",
+                            "manage_entities": "Gestió d'entitats",
+                            "sync_entities_error": "No s'han pogut sincronitzar les entitats:",
+                            "state_reporting_error": "No s'ha pogut {enable_disable} l'informe d'estat.",
+                            "enable": "activa",
+                            "disable": "desactiva"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "Amb la integració de Google Assistant per Home Assistant Cloud podràs controlar tots els dispositius de Home Assistant a través dels dispositius compatibles amb Google Assistant.",
+                            "enable_ha_skill": "Activa l'auxiliar de Home Assistant per Google Assistant",
+                            "config_documentation": "Documentació de configuració",
+                            "enable_state_reporting": "Activa els informes d’estat",
+                            "info_state_reporting": "Si actives els informes d'estat, Home Assistant enviarà a Google tots els canvis d’estat de les entitats exposades. Això et permetrà veure els últims estats a l’aplicació de Google.",
+                            "security_devices": "Dispositius de seguretat",
+                            "enter_pin_info": "Introdueix un codi PIN per interactuar amb dispositius de seguretat. Aquests dispositius són portes, garatges o panys, per exemple. Se't demanarà que introdueixis (o diguis) aquest PIN quan interactuïs amb aquests dispositius mitjançant Google Assistant.",
+                            "devices_pin": "PIN dels dispositius de seguretat",
+                            "enter_pin_hint": "Introdueix un PIN per utilitzar dispositius de seguretat",
+                            "sync_entities": "Sincronitza les entitats amb Google",
+                            "manage_entities": "Gestió d'entitats",
+                            "enter_pin_error": "No s'ha pogut desar el pin:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Qualsevol cosa que estigui configurada per disparar-se a través d'un webhook pot disposar d'un URL accessible públicament que permet retornar-li dades a Home Assistant des de qualsevol lloc i sense exposar la teva instància a Internet.",
+                            "no_hooks_yet": "Sembla que encara no tens cap webhook. Comença configurant una ",
+                            "no_hooks_yet_link_integration": "integració basada en webhook",
+                            "no_hooks_yet2": " o bé creant una ",
+                            "no_hooks_yet_link_automation": "automatització de webhook",
+                            "link_learn_more": "Més informació sobre la creació d'automatizacions basats en webhook.",
+                            "loading": "Carregant ...",
+                            "manage": "Gestiona",
+                            "disable_hook_error_msg": "No s'ha pogut desactivar el webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "L'edició de quines entitats estan exposades a través de la UI està desactivada perquè hi ha filtres d'entitats configurats a configuration.yaml.",
+                        "exposed_entities": "Entitats exposades",
+                        "not_exposed_entities": "Entitats No exposades",
+                        "expose": "Exposa a Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Informació del certificat",
+                        "certificate_expiration_date": "Data de caducitat del certificat",
+                        "will_be_auto_renewed": "Es renovarà automàticament",
+                        "fingerprint": "Empremta del certificat:",
+                        "close": "Tanca"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Exposa a Google Assistant",
+                        "disable_2FA": "Desactiva l'autenticació en dos passos",
+                        "banner": "L'edició de quines entitats estan exposades a través de la UI està desactivada perquè hi ha filtres d'entitats configurats a configuration.yaml.",
+                        "exposed_entities": "Entitats exposades",
+                        "not_exposed_entities": "Entitats No exposades",
+                        "sync_to_google": "Sincronitzant els canvis amb Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook per {name}",
+                        "available_at": "El webhook està disponible a l’URL següent:",
+                        "managed_by_integration": "Aquest webhook està gestionat per una integració i no es pot desactivar.",
+                        "info_disable_webhook": "Si ja no vols fer servir aquest webhook, pots",
+                        "link_disable_webhook": "desactiva-lo",
+                        "view_documentation": "Veure documentació",
+                        "close": "Tanca",
+                        "confirm_disable": "Estàs segur que vols desactivar aquest webhook?",
+                        "copied_to_clipboard": "Copiat al porta-retalls"
+                    }
                 },
                 "integrations": {
                     "caption": "Integracions",
@@ -705,7 +892,7 @@
                     "config_entry": {
                         "no_devices": "Aquesta integració no té dispositius.",
                         "no_device": "Entitats sense dispositius",
-                        "delete_confirm": "Estas segur que vols eliminar aquesta integració?",
+                        "delete_confirm": "Estàs segur que vols eliminar aquesta integració?",
                         "restart_confirm": "Reinicia el Home Assistant per acabar d'eliminar aquesta integració",
                         "manuf": "de {manufacturer}",
                         "via": "Connectat a través de",
@@ -720,7 +907,10 @@
                             "description": "Aquest pas requereix que visitis un lloc web extern per completar-lo.",
                             "open_site": "Vés al lloc web"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Encara no es poden configurar totes les integracions a través de la UI.",
+                    "note_about_website_reference": "N'hi ha més disponible a ",
+                    "home_assistant_website": "Lloc web de Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Domòtica amb Zigbee - Afegir dispositius",
                         "spinner": "S'estan cercant dispositius ZHA Zigbee...",
-                        "discovery_text": "Els dispositius descoberts apareixeran aquí. Segueix les instruccions del teu dispositiu\/s i posa el dispositiu\/s en mode d’emparellament."
+                        "discovery_text": "Els dispositius descoberts apareixeran aquí. Segueix les instruccions del teu dispositiu\/s i posa el dispositiu\/s en mode d’emparellament.",
+                        "search_again": "Torna a cercar"
+                    },
+                    "common": {
+                        "add_devices": "Afegeix dispositius",
+                        "clusters": "Clústers",
+                        "devices": "Dispositius",
+                        "manufacturer_code_override": "Substitució del codi de fabricant",
+                        "value": "Valor"
+                    },
+                    "network_management": {
+                        "header": "Gestió de la xarxa",
+                        "introduction": "Comandes que afecten tota la xarxa"
+                    },
+                    "node_management": {
+                        "header": "Gestió del dispositiu",
+                        "introduction": "Executa comandes ZHA que afecten un sol dispositiu. Tria un dispositiu per veure el seu llistat de comandes disponibles.",
+                        "hint_battery_devices": "Nota: cal que els dispositius adormits (amb bateria) estiguin desperts quan els hi enviïs comandes. Normalment pots despertar un dispositiu adormit disparant-lo.",
+                        "hint_wakeup": "Alguns dispositius com els sensors Xiaomi tenen un botó per despertar-los que pots prémer a intervals de 5 segons per mantenir-los desperts mentre hi interactues.",
+                        "help_node_dropdown": "Selecciona un dispositiu per visualitzar-ne les opcions (per dispositiu)."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Selecciona un clúster per visualitzar-ne els atributs i comandes."
+                    },
+                    "cluster_attributes": {
+                        "header": "Atributs clúster",
+                        "introduction": "Consulta i edita els atributs del clúster.",
+                        "attributes_of_cluster": "Atributs del clúster seleccionat",
+                        "get_zigbee_attribute": "Obtenir l'atribut Zigbee",
+                        "set_zigbee_attribute": "Estableix l'atribut Zigbee",
+                        "help_attribute_dropdown": "Selecciona un atribut per visualitzar-ne o definiu-ne el valor.",
+                        "help_get_zigbee_attribute": "Obté el valor de l’atribut seleccionat.",
+                        "help_set_zigbee_attribute": "Estableix el valor d'atribut pel clúster especificat a l'entitat especificada."
+                    },
+                    "cluster_commands": {
+                        "header": "Comandes clúster",
+                        "introduction": "Veure i emetre comandes clúster.",
+                        "commands_of_cluster": "Comandes del clúster seleccionat",
+                        "issue_zigbee_command": "Emet la comanda Zigbee",
+                        "help_command_dropdown": "Selecciona una comanda per interactuar-hi."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant manté un registre de totes les entitats que ha detectat alguna vegada les quals tenen una identificació única. Cadascuna d'aquestes entitats té un identificador (ID) assignat que està reservat només per a ella.",
                         "introduction2": "Utilitza el registre d'entitats per canviar el nom, canviar l'ID o eliminar l'entrada de Home Assistant de les entitats. Tingues en compte que eliminar-les del registre d'entitats no eliminarà l'entitat. Per fer-ho, segueix l'enllaç següent i elimineu-la dins la pàgina d'integracions.",
                         "integrations_page": "Pàgina d'integracions",
-                        "show_disabled": "Mostra entitats desactivades"
+                        "show_disabled": "Mostra entitats desactivades",
+                        "headers": {
+                            "name": "Nom",
+                            "entity_id": "ID de l'entitat",
+                            "integration": "Integració",
+                            "enabled": "Habilitat"
+                        }
                     },
                     "editor": {
                         "unavailable": "Aquesta entitat no està disponible actualment.",
@@ -780,7 +1015,7 @@
                         "enabled_label": "Activa l’entitat",
                         "enabled_cause": "Desactivat per {cause}.",
                         "enabled_description": "Les entitats desactivades no s’afegiran a Home Assistant.",
-                        "confirm_delete": "Estas segur que vols eliminar aquesta entitat?",
+                        "confirm_delete": "Estàs segur que vols eliminar aquesta entitat?",
                         "confirm_delete2": "Si suprimeixes una entrada, no suprimiras l'entitat de Home Assistant. Per fer-ho, has de suprimir la integració '{plataform}' de Home Assistant."
                     }
                 },
@@ -791,8 +1026,24 @@
                         "name": "Nom",
                         "device_tracker_intro": "Selecciona els dispositius que pertanyen a aquesta persona.",
                         "device_tracker_picked": "Seguint dispositiu",
-                        "device_tracker_pick": "Tria un dispositiu per fer-li el seguiment"
-                    }
+                        "device_tracker_pick": "Tria un dispositiu per fer-li el seguiment",
+                        "new_person": "Persona nova",
+                        "name_error_msg": "El nom és necessari",
+                        "linked_user": "Usuari enllaçat",
+                        "no_device_tracker_available_intro": "Quan tinguis dispositius que indiquen presència de persones, podràs assignar-los a una persona. Pots afegir el primer dispositiu afegint una integració de detecció de presència des de la pàgina d'integracions.",
+                        "link_presence_detection_integrations": "Integracions de detecció de presència",
+                        "link_integrations_page": "Pàgina d'integracions",
+                        "delete": "Suprimeix",
+                        "create": "Crea",
+                        "update": "Actualitza"
+                    },
+                    "introduction": "Aquí pots definir cada persona d'interès en Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Nota: les persones configurades mitjançant configuration.yaml no es poden editar a la UI.",
+                    "no_persons_created_yet": "Sembla que encara no has creat cap persona.",
+                    "create_person": "Crea persona",
+                    "add_person": "Afegeix persona",
+                    "confirm_delete": "Estàs segur que vols eliminar aquesta persona?",
+                    "confirm_delete2": "Tots els dispositius vinculats a aquesta persona quedaran sense assignar."
                 },
                 "server_control": {
                     "caption": "Control del servidor",
@@ -810,7 +1061,7 @@
                             "introduction": "Algunes parts de la configuració de Home Assistant es poden recarregar sense necessitat de reiniciar. Els botons de sota esborraran la configuració antiga i en carregaran la nova.",
                             "core": "Actualitza el nucli",
                             "group": "Actualitza grups",
-                            "automation": "Actualitza automatismes",
+                            "automation": "Actualitza automatitzacions",
                             "script": "Actualitza programes",
                             "scene": "Actualitza escenes"
                         },
@@ -838,6 +1089,11 @@
                             "caption": "Quan es dispara alguna cosa..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Hi han canvis no desats. Segur que vols sortir?"
+                    }
                 }
             },
             "profile": {
@@ -863,9 +1119,9 @@
                 "refresh_tokens": {
                     "header": "Refresca els testimonis d'autenticació",
                     "description": "Cada testimoni d'autenticació d'actualització representa un inici de sessió diferent. Els testimonis d'autenticació d'actualització s'eliminaran automàticament quan tanquis la sessió. A sota hi ha una llista de testimonis d'autenticació d'actualització que estan actius actualment al teu compte.",
-                    "token_title": "Refresca el testimoni d'autenticació del {clientId}",
+                    "token_title": "Testimoni d'actualització de {clientId}",
                     "created_at": "Creat el {date}",
-                    "confirm_delete": "Estas segur que vols eliminar el testimoni d'autenticació d'actualització per {name}?",
+                    "confirm_delete": "Estàs segur que vols eliminar el testimoni d'actualització per a {name}?",
                     "delete_failed": "No s'ha pogut eliminar el testimoni d'autenticació d'actualització.",
                     "last_used": "Darrer ús el {date} des de {location}",
                     "not_used": "Mai no s'ha utilitzat",
@@ -909,14 +1165,18 @@
                     "close": "Tanca",
                     "submit": "Envia"
                 },
-                "logout": "Tanca la sessió",
+                "logout": "Tanca sessió",
                 "force_narrow": {
                     "header": "Amaga sempre la barra lateral",
-                    "description": "Això ocultarà la barra lateral per defecte, de manera similar als mòbils i tablets."
+                    "description": "Això ocultarà la barra lateral de manera similar als mòbils i tablets."
                 },
                 "vibrate": {
                     "header": "Vibra",
-                    "description": "Activa o desactiva la vibració d’aquest dispositiu mentre controlis dispositius."
+                    "description": "Activa o desactiva la vibració en d’aquest dispositiu."
+                },
+                "advanced_mode": {
+                    "title": "Mode avançat",
+                    "description": "Home Assistant oculta de manera predeterminada les funcions i opcions avançades. Pots accedir a aquestes funcions commutant aquest interruptor. Aquesta és una configuració específica per a usuari i no afecta altres usuaris que utilitzin Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Afegir targeta",
                         "edit": "Editar",
                         "delete": "Elimina",
-                        "move": "Mou"
+                        "move": "Mou",
+                        "show_visual_editor": "Mostra l'editor visual",
+                        "show_code_editor": "Mostra l'editor de codi"
                     },
                     "migrate": {
                         "header": "Configuració incompatible",
@@ -1121,7 +1383,8 @@
                             "optional": "Opcional"
                         },
                         "entities": {
-                            "show_header_toggle": "Mostrar commutació a la capçalera?"
+                            "show_header_toggle": "Mostrar commutació a la capçalera?",
+                            "name": "Entitats"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Verd",
                                 "red": "Vermell",
                                 "yellow": "Groc"
-                            }
+                            },
+                            "name": "Galga"
                         },
                         "glance": {
-                            "columns": "Columnes"
+                            "columns": "Columnes",
+                            "name": "Visualització"
                         },
                         "generic": {
                             "aspect_ratio": "Relació d'aspecte",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Fonts de geolocalització",
                             "dark_mode": "Mode fosc?",
                             "default_zoom": "Zoom predeterminat",
-                            "source": "Font"
+                            "source": "Font",
+                            "name": "Mapa"
                         },
                         "markdown": {
-                            "content": "Contingut"
+                            "content": "Contingut",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Detall del gràfic",
-                            "graph_type": "Tipus de gràfic"
+                            "graph_type": "Tipus de gràfic",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Panell d'alarma",
+                            "available_states": "Estats disponibles"
+                        },
+                        "conditional": {
+                            "name": "Condicional"
+                        },
+                        "entity-button": {
+                            "name": "Botó d'entitat"
+                        },
+                        "entity-filter": {
+                            "name": "Filtre d'entitats"
+                        },
+                        "history-graph": {
+                            "name": "Gràfic d'històric"
+                        },
+                        "horizontal-stack": {
+                            "name": "Pila horitzontal"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Llum"
+                        },
+                        "media-control": {
+                            "name": "Control multimèdia"
+                        },
+                        "picture": {
+                            "name": "Imatge"
+                        },
+                        "picture-elements": {
+                            "name": "Imatge amb elements"
+                        },
+                        "picture-entity": {
+                            "name": "Entitat d'imatge"
+                        },
+                        "picture-glance": {
+                            "name": "Visualització d'imatge"
+                        },
+                        "plant-status": {
+                            "name": "Estat de la planta"
+                        },
+                        "shopping-list": {
+                            "name": "Llista de la compra"
+                        },
+                        "thermostat": {
+                            "name": "Termòstat"
+                        },
+                        "vertical-stack": {
+                            "name": "Pila vertical"
+                        },
+                        "weather-forecast": {
+                            "name": "Previsió meteorològica"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "S'ha apagat {entity}.",
             "service_called": "S'ha cridat el servei {service}.",
             "service_call_failed": "Ha fallat la crida al servei {service}.",
-            "connection_lost": "Connexió perduda. Tornant a connectar..."
+            "connection_lost": "Connexió perduda. Tornant a connectar...",
+            "triggered": "{name} disparat\/ada"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,11 +1775,20 @@
                     "device_name_placeholder": "Nom donat per l'usuari",
                     "area_picker_label": "Àrea",
                     "update_name_button": "Actualitzar Nom"
-                }
+                },
+                "buttons": {
+                    "add": "Afegir dispositius",
+                    "remove": "Eliminar dispositiu",
+                    "reconfigure": "Reconfigurar dispositiu"
+                },
+                "quirk": "Quirk",
+                "last_seen": "Vist per últim cop",
+                "power_source": "Font d'alimentació",
+                "unknown": "Desconeguda"
             }
         },
         "auth_store": {
-            "ask": "Voleu desar aquest inici de sessió?",
+            "ask": "Vols desar aquest inici de sessió?",
             "decline": "No, gràcies",
             "confirm": "Desa inici de sessió"
         },
@@ -1467,7 +1800,7 @@
     },
     "domain": {
         "alarm_control_panel": "Panell de control d'alarma",
-        "automation": "Automatismes",
+        "automation": "Automatització",
         "binary_sensor": "Sensor binari",
         "calendar": "Calendari",
         "camera": "Càmera",
diff --git a/translations/cs.json b/translations/cs.json
index e33678349d..cde3e9308b 100644
--- a/translations/cs.json
+++ b/translations/cs.json
@@ -659,13 +659,15 @@
                         "true": "True",
                         "false": "False",
                         "set_config_parameter": "Nastavte konfigurační parametr"
-                    }
+                    },
+                    "learn_more": "Další informace o Z-Wave"
                 },
                 "users": {
                     "caption": "Uživatelé",
                     "description": "Správa uživatelů",
                     "picker": {
-                        "title": "Uživatelé"
+                        "title": "Uživatelé",
+                        "system_generated": "Generovaný systémem"
                     },
                     "editor": {
                         "rename_user": "Přejmenovat uživatele",
@@ -673,7 +675,18 @@
                         "activate_user": "Aktivovat uživatele",
                         "deactivate_user": "Deaktivovat uživatele",
                         "delete_user": "Odstranit uživatele",
-                        "caption": "Zobrazit uživatele"
+                        "caption": "Zobrazit uživatele",
+                        "id": "ID",
+                        "owner": "Vlastník",
+                        "group": "Skupina",
+                        "active": "Aktivní",
+                        "system_generated": "Generovaný systémem",
+                        "system_generated_users_not_removable": "Nelze odebrat uživatele generované systémem.",
+                        "unnamed_user": "Nepojmenovaný uživatel",
+                        "enter_new_name": "Zadejte nové jméno",
+                        "user_rename_failed": "Přejmenování uživatele se nezdařilo:",
+                        "group_update_failed": "Aktualizace skupiny se nezdařila:",
+                        "confirm_user_deletion": "Opravdu chcete smazat {name} ?"
                     },
                     "add_user": {
                         "caption": "Přidat uživatele",
@@ -715,7 +728,9 @@
                             "description": "K dokončení tohoto kroku je nutné navštívit externí webovou stránku.",
                             "open_site": "Otevřít webové stránky"
                         }
-                    }
+                    },
+                    "note_about_website_reference": "Další jsou k dispozici na ",
+                    "home_assistant_website": "stránky Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -734,6 +749,18 @@
                         "header": "Zigbee Home Automation - Přidat zařízení",
                         "spinner": "Hledání zařízení ZHA Zigbee ...",
                         "discovery_text": "Zde se objeví nalezená zařízení. Postupujte dle pokynů pro vaše zařízení a uveďte je do režimu párování."
+                    },
+                    "common": {
+                        "add_devices": "Přidat zařízení",
+                        "clusters": "Clustery"
+                    },
+                    "cluster_attributes": {
+                        "attributes_of_cluster": "Atribut vybraného klastru",
+                        "get_zigbee_attribute": "Získat atribut Zigbee",
+                        "set_zigbee_attribute": "Nastavit atribut Zigbee"
+                    },
+                    "cluster_commands": {
+                        "help_command_dropdown": "Vyberte příkaz, se kterým chcete pracovat."
                     }
                 },
                 "area_registry": {
@@ -786,7 +813,12 @@
                         "name": "Jméno",
                         "device_tracker_intro": "Vyberte zařízení, která patří této osobě.",
                         "device_tracker_picked": "Sledovat zařízení",
-                        "device_tracker_pick": "Vyberte zařízení, které chcete sledovat"
+                        "device_tracker_pick": "Vyberte zařízení, které chcete sledovat",
+                        "link_presence_detection_integrations": "Integrace detekce přítomnosti",
+                        "link_integrations_page": "Stránka integrací",
+                        "delete": "Smazat",
+                        "create": "Vytvořit",
+                        "update": "Aktualizace"
                     }
                 },
                 "server_control": {
@@ -912,6 +944,10 @@
                 "vibrate": {
                     "header": "Vibrovat",
                     "description": "Povolit nebo zakázat vibrace na tomto zařízení při ovládání ostatních zařízení."
+                },
+                "advanced_mode": {
+                    "title": "Pokročilý režim",
+                    "description": "Home Assistant standardně skrývá pokročilé funkce a předvolby. Zapnutím této funkce je můžete zpřístupnit. Toto nastavení je specifické pro každého uživatele a neovlivňuje ostatní uživatele Home Assistantu."
                 }
             },
             "page-authorize": {
@@ -1072,7 +1108,9 @@
                         "add": "Přidat kartu",
                         "edit": "Upravit",
                         "delete": "Odstranit",
-                        "move": "Přesunout"
+                        "move": "Přesunout",
+                        "show_visual_editor": "Zobrazit vizuální editor",
+                        "show_code_editor": "Zobrazit editor kódu"
                     },
                     "migrate": {
                         "header": "Konfigurace není kompatibilní",
@@ -1116,7 +1154,8 @@
                             "optional": "Volitelné"
                         },
                         "entities": {
-                            "show_header_toggle": "Zobrazit přepínač záhlaví?"
+                            "show_header_toggle": "Zobrazit přepínač záhlaví?",
+                            "name": "Entity"
                         },
                         "gauge": {
                             "severity": {
@@ -1124,7 +1163,8 @@
                                 "green": "Zelená",
                                 "red": "Červaná",
                                 "yellow": "Žlutá"
-                            }
+                            },
+                            "name": "Měřidlo"
                         },
                         "glance": {
                             "columns": "Sloupce"
@@ -1157,14 +1197,60 @@
                             "geo_location_sources": "Zdroje geolokace",
                             "dark_mode": "Tmavý režim?",
                             "default_zoom": "Výchozí zvětšení",
-                            "source": "Zdroj"
+                            "source": "Zdroj",
+                            "name": "Mapa"
                         },
                         "markdown": {
-                            "content": "Obsah"
+                            "content": "Obsah",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Detail grafu",
-                            "graph_type": "Typ grafu"
+                            "graph_type": "Typ grafu",
+                            "name": "Senzor"
+                        },
+                        "alarm-panel": {
+                            "name": "Ovládací panel alarmu",
+                            "available_states": "Dostupné stavy"
+                        },
+                        "conditional": {
+                            "name": "Podmínka"
+                        },
+                        "entity-button": {
+                            "name": "Tlačítko entity"
+                        },
+                        "entity-filter": {
+                            "name": "Filtr entit"
+                        },
+                        "history-graph": {
+                            "name": "Graf historie"
+                        },
+                        "light": {
+                            "name": "Světlo"
+                        },
+                        "media-control": {
+                            "name": "Řízení médií"
+                        },
+                        "picture": {
+                            "name": "Obrázek"
+                        },
+                        "picture-entity": {
+                            "name": "Obrazková entita"
+                        },
+                        "plant-status": {
+                            "name": "Stav rostliny"
+                        },
+                        "shopping-list": {
+                            "name": "Nákupní seznam"
+                        },
+                        "thermostat": {
+                            "name": "Termostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Svislá sada"
+                        },
+                        "weather-forecast": {
+                            "name": "Předpověď počasí"
                         }
                     }
                 },
diff --git a/translations/cy.json b/translations/cy.json
index 8565caf6ca..71a7a96dfe 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -578,6 +578,11 @@
                     "description": "Rheoli eich rhwydwaith Z-Wave",
                     "node_config": {
                         "set_config_parameter": "Gosod Paramedr Ffurfweddu"
+                    },
+                    "learn_more": "Dysgu mwy am Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW Log",
+                        "introduction": "Gweld y log. 0 yn y lleiaf (llwyth cyfan log) a 1000 yn yr uchafswm. Llwyth yn dangos sefydlog o log ac yn y gynffon, bydd yn diweddariad automatig gyda nifer penodol diwethaf o linellau o log."
                     }
                 },
                 "cloud": {
@@ -631,6 +636,29 @@
                         "header": "Awtomeiddiad Cartref Zigbee - Ychwanegwch Dyfeisiadau",
                         "spinner": "Chwilio am ddyfeisiau ZHA Zigbee ...",
                         "discovery_text": "Bydd dyfeisiau a ddarganfuwyd yn ymddangos yma. Dilynwch y cyfarwyddiadau ar gyfer eich dyfais \/ dyfaisiau a rhowch y ddyfais \/ dyfeisiau yn y modd paru."
+                    },
+                    "node_management": {
+                        "help_node_dropdown": "Dewiswch ddyfais i weld yr opsiynau fesul dyfais."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Dewiswch clwstwr i weld priodoleddau a gorchmynion."
+                    },
+                    "cluster_attributes": {
+                        "header": "Priodoleddau clwstwr",
+                        "introduction": "Gweld a golygu priodoleddau clwstwr.",
+                        "attributes_of_cluster": "Priodoleddau'r clwstwr a ddewiswyd",
+                        "get_zigbee_attribute": "Cael Priodoledd Zigbee",
+                        "set_zigbee_attribute": "Gosod priodoledd Zigbee",
+                        "help_attribute_dropdown": "Dewisiwch y priodoledd i weld neu osod ei werth",
+                        "help_get_zigbee_attribute": "Cael y gwerth ar gyfer y priodoledd a ddewiswyd.",
+                        "help_set_zigbee_attribute": "Gosod gwerth priodwedd ar gyfer y clwstwr penodedig ar yr endid penodedig."
+                    },
+                    "cluster_commands": {
+                        "header": "Gorchmynion clwstwr",
+                        "introduction": "Gweld a chyhoeddi gorchmynion clwstwr.",
+                        "commands_of_cluster": "Gorchmynion y clwstwr a ddewiswyd",
+                        "issue_zigbee_command": "Cyhoeddi Gorchymyn Zigbee",
+                        "help_command_dropdown": "Dewiswch orchymyn i ryngweithio ag ef."
                     }
                 },
                 "area_registry": {
@@ -747,7 +775,9 @@
                         "add": "Ychwanegu Cerdyn",
                         "edit": "Golygu",
                         "delete": "Dileu",
-                        "move": "Symud"
+                        "move": "Symud",
+                        "show_visual_editor": "Dangos Golygydd Gweledol",
+                        "show_code_editor": "Dangos Golygydd Cod"
                     },
                     "migrate": {
                         "header": "Ffurfweddiad anghydnaws",
@@ -777,6 +807,81 @@
                         "save": "Arbed",
                         "unsaved_changes": "Newidiadau heb eu cadw",
                         "saved": "Arbed"
+                    },
+                    "card": {
+                        "alarm-panel": {
+                            "name": "Panel Larwm",
+                            "available_states": "Cyflerau posib"
+                        },
+                        "conditional": {
+                            "name": "Amodol"
+                        },
+                        "entities": {
+                            "name": "Endidau"
+                        },
+                        "entity-button": {
+                            "name": "Botwm Endid"
+                        },
+                        "entity-filter": {
+                            "name": "Hidlo Endid"
+                        },
+                        "gauge": {
+                            "name": "Medrydd"
+                        },
+                        "glance": {
+                            "name": "Cipolwg"
+                        },
+                        "history-graph": {
+                            "name": "Graff Hanes"
+                        },
+                        "horizontal-stack": {
+                            "name": "Stac Fertigol"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Golau"
+                        },
+                        "map": {
+                            "name": "Map"
+                        },
+                        "markdown": {
+                            "name": "Marclawr"
+                        },
+                        "media-control": {
+                            "name": "Rheoli cyfryngau"
+                        },
+                        "picture": {
+                            "name": "Llun"
+                        },
+                        "picture-elements": {
+                            "name": "Elfennau'r Llun"
+                        },
+                        "picture-entity": {
+                            "name": "Endid Llun"
+                        },
+                        "picture-glance": {
+                            "name": "Cipolwg ar lun"
+                        },
+                        "plant-status": {
+                            "name": "Statws planhigyn"
+                        },
+                        "sensor": {
+                            "name": "Synhwyrydd"
+                        },
+                        "shopping-list": {
+                            "name": "Rhestr siopa"
+                        },
+                        "thermostat": {
+                            "name": "Thermostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Stac Fertigol"
+                        },
+                        "weather-forecast": {
+                            "name": "Rhagolwg tywydd"
+                        }
                     }
                 },
                 "menu": {
@@ -888,6 +993,12 @@
                         }
                     }
                 }
+            },
+            "profile": {
+                "advanced_mode": {
+                    "title": "Modd Uwch",
+                    "description": "Mae Home Assistant yn cuddio nodweddion uwch ac opsiynau yn ddiofyn. Gallwch wneud y nodweddion hyn yn hygyrch trwy ticio'r toggle hwn. Mae hwn yn leoliad penodol i ddefnyddwyr ac nid yw'n effeithio ar ddefnyddwyr eraill sy'n defnyddio Home Assistant."
+                }
             }
         },
         "sidebar": {
diff --git a/translations/da.json b/translations/da.json
index ede19810cf..45d99a5d59 100644
--- a/translations/da.json
+++ b/translations/da.json
@@ -558,7 +558,12 @@
                                     "zone": "Zone"
                                 },
                                 "device": {
-                                    "label": "Enhed"
+                                    "label": "Enhed",
+                                    "extra_fields": {
+                                        "above": "Over",
+                                        "below": "Under",
+                                        "for": "Varighed"
+                                    }
                                 },
                                 "and": {
                                     "label": "Og"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Enhed"
+                                },
+                                "scene": {
+                                    "label": "Aktivér scene"
                                 }
                             },
                             "learn_more": "Lær om handlinger"
@@ -616,7 +624,19 @@
                 },
                 "script": {
                     "caption": "Script",
-                    "description": "Opret og rediger scripts"
+                    "description": "Opret og rediger scripts",
+                    "picker": {
+                        "header": "Script editor",
+                        "learn_more": "Lær mere om scripts",
+                        "no_scripts": "Vi kunne ikke finde nogen redigerbare scripts",
+                        "add_script": "Tilføj script"
+                    },
+                    "editor": {
+                        "header": "Script: {name}",
+                        "default_name": "Ny script",
+                        "load_error_not_editable": "Kun scripts i scripts.yaml kan redigeres.",
+                        "delete_confirm": "Er du sikker på, at du vil slette dette script?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +684,18 @@
                         "true": "Sandt",
                         "false": "Falsk",
                         "set_config_parameter": "Indstil konfigurationsparameter"
+                    },
+                    "learn_more": "Lær mere om Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW log"
                     }
                 },
                 "users": {
                     "caption": "Brugere",
                     "description": "Administrer brugere",
                     "picker": {
-                        "title": "Brugere"
+                        "title": "Brugere",
+                        "system_generated": "System genereret"
                     },
                     "editor": {
                         "rename_user": "Omdøb bruger",
@@ -678,7 +703,18 @@
                         "activate_user": "Aktivér bruger",
                         "deactivate_user": "Deaktiver bruger",
                         "delete_user": "Slet bruger",
-                        "caption": "Vis bruger"
+                        "caption": "Vis bruger",
+                        "id": "ID",
+                        "owner": "Ejer",
+                        "group": "Gruppe",
+                        "active": "Aktiv",
+                        "system_generated": "System genereret",
+                        "system_generated_users_not_removable": "Kan ikke fjerne systemgenererede brugere.",
+                        "unnamed_user": "Unavngivet bruger",
+                        "enter_new_name": "Indtast nyt navn",
+                        "user_rename_failed": "Omdøbning af bruger mislykkedes:",
+                        "group_update_failed": "Gruppe opdatering mislykkedes:",
+                        "confirm_user_deletion": "Er du sikker på, at du vil slette {name}?"
                     },
                     "add_user": {
                         "caption": "Tilføj bruger",
@@ -692,7 +728,122 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Logget ind som {email}",
                     "description_not_login": "Ikke logget ind",
-                    "description_features": "Betjen væk fra hjemmet, integrer med Alexa og Google Assistant."
+                    "description_features": "Betjen væk fra hjemmet, integrer med Alexa og Google Assistant.",
+                    "login": {
+                        "title": "Cloud-login",
+                        "learn_more_link": "Lær mere om Home Assistant Cloud",
+                        "dismiss": "Afvis",
+                        "sign_in": "Log ind",
+                        "email": "E-mail",
+                        "email_error_msg": "Ugyldig email",
+                        "password": "Adgangskode",
+                        "password_error_msg": "Adgangskoder er mindst 8 tegn",
+                        "forgot_password": "glemt kodeord?",
+                        "start_trial": "Start din gratis prøveperiode på 1 måned",
+                        "trial_info": "Betalingsoplysninger er ikke nødvendige",
+                        "alert_password_change_required": "Du skal ændre din adgangskode, før du logger ind."
+                    },
+                    "forgot_password": {
+                        "title": "Glemt kodeord",
+                        "instructions": "Indtast din e-mail-adresse, så sender vi dig et link for at nulstille din adgangskode.",
+                        "email": "E-mail",
+                        "email_error_msg": "Ugyldig email",
+                        "check_your_email": "Tjek din e-mail for instruktioner om, hvordan du nulstiller din adgangskode."
+                    },
+                    "register": {
+                        "title": "Registrer konto",
+                        "headline": "Start din gratis prøveperiode",
+                        "feature_remote_control": "Styring af Home Assistant væk fra hjemmet",
+                        "feature_google_home": "Integration med Google Assistant",
+                        "feature_amazon_alexa": "Integration med Amazon Alexa",
+                        "feature_webhook_apps": "Nem integration med webhook-baserede apps som OwnTracks",
+                        "information3": "Denne service drives af vores partner",
+                        "information4": "Ved at registrere en konto accepterer du følgende vilkår og betingelser.",
+                        "link_terms_conditions": "Betingelser og vilkår",
+                        "link_privacy_policy": "Fortrolighedspolitik",
+                        "create_account": "Opret konto",
+                        "email_address": "Email adresse",
+                        "email_error_msg": "Ugyldig email",
+                        "password": "Adgangskode",
+                        "password_error_msg": "Adgangskoder er mindst 8 tegn",
+                        "start_trial": "Start prøveperiode",
+                        "resend_confirm_email": "Gensend bekræftelsesmail",
+                        "account_created": "Konto oprettet! Tjek din e-mail for instruktioner om, hvordan du aktiverer din konto."
+                    },
+                    "account": {
+                        "nabu_casa_account": "Nabu Casa-konto",
+                        "connection_status": "Cloud-forbindelsesstatus",
+                        "manage_account": "Administrer konto",
+                        "sign_out": "Log ud",
+                        "integrations": "Integrationer",
+                        "integrations_introduction2": "Tjek hjemmesiden for",
+                        "integrations_link_all_features": "alle tilgængelige funktioner",
+                        "connected": "Forbundet",
+                        "not_connected": "Ikke forbundet",
+                        "fetching_subscription": "Henter abonnement...",
+                        "remote": {
+                            "certificate_info": "Certifikatoplysninger"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "enable_state_reporting": "Aktivér tilstandsrapportering",
+                            "sync_entities": "Synkroniser enheder",
+                            "manage_entities": "Administrer enheder",
+                            "sync_entities_error": "Kunne ikke synkronisere enheder:",
+                            "state_reporting_error": "Kan ikke {enable_disable} rapport tilstand.",
+                            "enable": "aktivere",
+                            "disable": "deaktivere"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "enable_state_reporting": "Aktivér tilstandsrapportering",
+                            "security_devices": "Sikkerhedsenheder",
+                            "devices_pin": "Pinkode til sikkerhedsenheder",
+                            "enter_pin_hint": "Indtast en pinkode for at bruge sikkerhedsenheder",
+                            "sync_entities": "Synkroniser enheder med Google",
+                            "manage_entities": "Administrer enheder",
+                            "enter_pin_error": "Pinkoden kan ikke gemmes:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "no_hooks_yet_link_integration": "webhook-baseret integration",
+                            "no_hooks_yet2": "eller ved at oprette en",
+                            "no_hooks_yet_link_automation": "webhook automatisering",
+                            "link_learn_more": "Lær mere om at oprette webhook-drevne automatiseringer.",
+                            "loading": "Indlæser ...",
+                            "disable_hook_error_msg": "Webhook kunne ikke deaktiveres:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "exposed_entities": "Eksponerede enheder",
+                        "not_exposed_entities": "Ikke eksponerede enheder"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Certifikatoplysninger",
+                        "certificate_expiration_date": "Udløbsdato for certifikat",
+                        "will_be_auto_renewed": "Vil automatisk blive fornyet",
+                        "fingerprint": "Certifikat fingeraftryk:",
+                        "close": "Luk"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "disable_2FA": "Deaktiver to-faktor godkendelse",
+                        "exposed_entities": "Eksponerede enheder",
+                        "not_exposed_entities": "Ikke eksponerede enheder",
+                        "sync_to_google": "Synkroniserer ændringer med Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook til {name}",
+                        "available_at": "Webhook er tilgængelig på følgende webadresse:",
+                        "managed_by_integration": "Denne webhook administreres af en integration og kan ikke deaktiveres.",
+                        "info_disable_webhook": "Hvis du ikke længere vil bruge denne webhook, kan du",
+                        "link_disable_webhook": "deaktivere den",
+                        "view_documentation": "Se dokumentation",
+                        "close": "Luk",
+                        "confirm_disable": "Er du sikker på, at du vil deaktivere denne webhook?",
+                        "copied_to_clipboard": "Kopieret til udklipsholder"
+                    }
                 },
                 "integrations": {
                     "caption": "Integrationer",
@@ -720,7 +871,10 @@
                             "description": "Dette trin kræver, at du besøger et eksternt websted.",
                             "open_site": "Åbn websted"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Ikke alle integrationer kan konfigureres via brugergrænsefladen endnu.",
+                    "note_about_website_reference": "Flere er tilgængelige på",
+                    "home_assistant_website": "Home Assistant hjemmeside"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +892,41 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Tilføj enheder",
                         "spinner": "Søger efter ZHA Zigbee-enheder...",
-                        "discovery_text": "Fundne enheder vil dukke op her. Følg instruktionerne for din enhed(er) og sæt enhed(erne) i parringstilstand."
+                        "discovery_text": "Fundne enheder vil dukke op her. Følg instruktionerne for din enhed(er) og sæt enhed(erne) i parringstilstand.",
+                        "search_again": "Søg igen"
+                    },
+                    "common": {
+                        "add_devices": "Tilføj enheder",
+                        "clusters": "Klynger",
+                        "devices": "Enheder",
+                        "value": "Værdi"
+                    },
+                    "network_management": {
+                        "header": "Netværksstyring",
+                        "introduction": "Kommandoer, der påvirker hele netværket"
+                    },
+                    "node_management": {
+                        "header": "Enhedshåndtering"
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Vælg en klynge for at se attributter og kommandoer."
+                    },
+                    "cluster_attributes": {
+                        "header": "Klynge attributter",
+                        "introduction": "Se og rediger klynge attributter.",
+                        "attributes_of_cluster": "Attributter for den valgte klynge",
+                        "get_zigbee_attribute": "Hent Zigbee-attribut",
+                        "set_zigbee_attribute": "Angiv Zigbee-attribut",
+                        "help_attribute_dropdown": "Vælg en attribut for at se eller indstille dens værdi.",
+                        "help_get_zigbee_attribute": "Hent værdien for den valgte attribut.",
+                        "help_set_zigbee_attribute": "Indstil attributværdi for den specificerede klynge på den specificerede enhed."
+                    },
+                    "cluster_commands": {
+                        "header": "Klyngekommandoer",
+                        "introduction": "Se og send klyngekommandoer.",
+                        "commands_of_cluster": "Kommandoer for den valgte klynge",
+                        "issue_zigbee_command": "Send ZigBee kommando",
+                        "help_command_dropdown": "Vælg en kommando, du vil interagere med."
                     }
                 },
                 "area_registry": {
@@ -770,7 +958,13 @@
                         "introduction": "Home Assistant opbevarer en registrering over hver unikke enhed det nogensinde har set. Hver af disse enheder vil have et registrerings ID tildelt som er forbeholdt netop denne enhed.",
                         "introduction2": "Brug enhedsregistrering til at overskrive navnet, ændre enheds ID eller fjerne enheden fra Home Assistant. Bemærk at fjernelse af enhedens registrering ikke fjerner enheden. For at gøre det skal du følge linket herunder og fjerne det fra integrationssiden.",
                         "integrations_page": "Integrationsside",
-                        "show_disabled": "Vis deaktiverede enheder"
+                        "show_disabled": "Vis deaktiverede enheder",
+                        "headers": {
+                            "name": "Navn",
+                            "entity_id": "Enheds ID",
+                            "integration": "Integration",
+                            "enabled": "Aktiveret"
+                        }
                     },
                     "editor": {
                         "unavailable": "Denne enhed er ikke tilgængelig i øjeblikket.",
@@ -791,8 +985,19 @@
                         "name": "Navn",
                         "device_tracker_intro": "Vælg de enheder, der tilhører denne person.",
                         "device_tracker_picked": "Spor enhed",
-                        "device_tracker_pick": "Vælg en enhed, der skal spores"
-                    }
+                        "device_tracker_pick": "Vælg en enhed, der skal spores",
+                        "new_person": "Ny person",
+                        "name_error_msg": "Navn er påkrævet",
+                        "linked_user": "Tilknyttet bruger",
+                        "link_integrations_page": "Integrationsside",
+                        "delete": "Slet",
+                        "create": "Opret",
+                        "update": "Opdatering"
+                    },
+                    "no_persons_created_yet": "Det ser ud til, at du endnu ikke har oprettet nogen personer endnu.",
+                    "create_person": "Opret person",
+                    "add_person": "Tilføj person",
+                    "confirm_delete": "Er du sikker på, at du vil slette denne person?"
                 },
                 "server_control": {
                     "caption": "Serveradministration",
@@ -838,6 +1043,11 @@
                             "caption": "Når noget påvirkes ..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Du har ikke-gemte ændringer. Er du sikker på, at du vil forlade?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1127,9 @@
                 "vibrate": {
                     "header": "Vibrer",
                     "description": "Aktivér eller deaktiver vibrationer på denne enhed, når du styrer enheder."
+                },
+                "advanced_mode": {
+                    "title": "Avanceret tilstand"
                 }
             },
             "page-authorize": {
@@ -1077,7 +1290,9 @@
                         "add": "Tilføj kort",
                         "edit": "Rediger",
                         "delete": "Slet",
-                        "move": "Flyt"
+                        "move": "Flyt",
+                        "show_visual_editor": "Vis visuel editor",
+                        "show_code_editor": "Vis kode editor"
                     },
                     "migrate": {
                         "header": "Konfiguration ikke færdiggjort",
@@ -1121,7 +1336,8 @@
                             "optional": "Valgfri"
                         },
                         "entities": {
-                            "show_header_toggle": "Vis omskifter ved overskrift?"
+                            "show_header_toggle": "Vis omskifter ved overskrift?",
+                            "name": "Enheder"
                         },
                         "gauge": {
                             "severity": {
@@ -1132,7 +1348,8 @@
                             }
                         },
                         "glance": {
-                            "columns": "Kolonner"
+                            "columns": "Kolonner",
+                            "name": "Blik"
                         },
                         "generic": {
                             "aspect_ratio": "Billedproportion",
@@ -1162,14 +1379,71 @@
                             "geo_location_sources": "Geolokationskilder",
                             "dark_mode": "Mørk tilstand?",
                             "default_zoom": "Standard zoom",
-                            "source": "Kilde"
+                            "source": "Kilde",
+                            "name": "Kort"
                         },
                         "markdown": {
                             "content": "Indhold"
                         },
                         "sensor": {
                             "graph_detail": "Graf detaljer",
-                            "graph_type": "Graf type"
+                            "graph_type": "Graf type",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Alarmpanel",
+                            "available_states": "Tilgængelige tilstande"
+                        },
+                        "conditional": {
+                            "name": "Betinget"
+                        },
+                        "entity-button": {
+                            "name": "Enhedsknap"
+                        },
+                        "entity-filter": {
+                            "name": "Enhedsfilter"
+                        },
+                        "history-graph": {
+                            "name": "Historik graf"
+                        },
+                        "horizontal-stack": {
+                            "name": "Vandret stak"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Lys"
+                        },
+                        "media-control": {
+                            "name": "Mediekontrol"
+                        },
+                        "picture": {
+                            "name": "Billede"
+                        },
+                        "picture-elements": {
+                            "name": "Billedelementer"
+                        },
+                        "picture-entity": {
+                            "name": "Billedenhed"
+                        },
+                        "picture-glance": {
+                            "name": "Billedblik"
+                        },
+                        "plant-status": {
+                            "name": "Plantestatus"
+                        },
+                        "shopping-list": {
+                            "name": "Indkøbsliste"
+                        },
+                        "thermostat": {
+                            "name": "Termostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Lodret stak"
+                        },
+                        "weather-forecast": {
+                            "name": "Vejrudsigt"
                         }
                     }
                 },
@@ -1451,7 +1725,15 @@
                     "device_name_placeholder": "Bruger tildelt navn",
                     "area_picker_label": "Område",
                     "update_name_button": "Opdater navn"
-                }
+                },
+                "buttons": {
+                    "add": "Tilføj enheder",
+                    "remove": "Fjern enhed",
+                    "reconfigure": "Genkonfigurer enhed"
+                },
+                "last_seen": "Sidst set",
+                "power_source": "Strømkilde",
+                "unknown": "Ukendt"
             }
         },
         "auth_store": {
diff --git a/translations/de.json b/translations/de.json
index 50469f9ce8..ccff6f45b2 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -558,7 +558,12 @@
                                     "zone": "Zone"
                                 },
                                 "device": {
-                                    "label": "Gerät"
+                                    "label": "Gerät",
+                                    "extra_fields": {
+                                        "above": "Über",
+                                        "below": "Unter",
+                                        "for": "Dauer"
+                                    }
                                 },
                                 "and": {
                                     "label": "Und"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Gerät"
+                                },
+                                "scene": {
+                                    "label": "Szene aktivieren"
                                 }
                             },
                             "learn_more": "Erfahre mehr über Aktionen"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Skript",
-                    "description": "Skripte erstellen und bearbeiten"
+                    "description": "Skripte erstellen und bearbeiten",
+                    "picker": {
+                        "header": "Skript-Editor",
+                        "introduction": "Mit dem Skript-Editor können Skripte erstellt und bearbeitet werden. Bitte folge Sie dem untenstehenden Link, um die Anleitung zu finden. Das stellt sicher, dass Home Assistant richtig konfiguriert ist.",
+                        "learn_more": "Weitere Informationen zu Skripten",
+                        "no_scripts": "Wir konnten keine bearbeitbaren Skripte finden",
+                        "add_script": "Skript hinzufügen"
+                    },
+                    "editor": {
+                        "header": "Skript: {name}",
+                        "default_name": "Neues Skript",
+                        "load_error_not_editable": "Nur Skripte in scripts.yaml können bearbeitet werden.",
+                        "delete_confirm": "Möchten Sie dieses Skript wirklich löschen?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Richtig",
                         "false": "Falsch",
                         "set_config_parameter": "Konfiguration speichern"
+                    },
+                    "learn_more": "Erfahre mehr über Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW Log",
+                        "introduction": "Zeigen Sie das Protokoll an. 0 ist das Minimum (lädt das gesamte Protokoll) und 1000 ist das Maximum. Beim Laden wird ein statisches Protokoll angezeigt, und das Ende wird automatisch mit der zuletzt angegebenen Anzahl von Zeilen des Protokolls aktualisiert."
                     }
                 },
                 "users": {
                     "caption": "Benutzer",
                     "description": "Benutzer verwalten",
                     "picker": {
-                        "title": "Benutzer"
+                        "title": "Benutzer",
+                        "system_generated": "System generiert"
                     },
                     "editor": {
                         "rename_user": "Benutzer umbenennen",
@@ -678,7 +705,18 @@
                         "activate_user": "Benutzer aktivieren",
                         "deactivate_user": "Benutzer deaktivieren",
                         "delete_user": "Benutzer löschen",
-                        "caption": "Benutzer anzeigen"
+                        "caption": "Benutzer anzeigen",
+                        "id": "ID",
+                        "owner": "Besitzer",
+                        "group": "Gruppe",
+                        "active": "Aktiv",
+                        "system_generated": "System generiert",
+                        "system_generated_users_not_removable": "Vom System generierte Benutzer können nicht entfernt werden.",
+                        "unnamed_user": "Unbenannter Benutzer",
+                        "enter_new_name": "Neuen Namen eingeben",
+                        "user_rename_failed": "Umbenennen des Benutzers fehlgeschlagen:",
+                        "group_update_failed": "Gruppenaktualisierung fehlgeschlagen:",
+                        "confirm_user_deletion": "Möchten Sie {name} wirklich löschen?"
                     },
                     "add_user": {
                         "caption": "Benutzer hinzufügen",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Angemeldet als {email}",
                     "description_not_login": "Nicht angemeldet",
-                    "description_features": "Fernsteuerung und Integration mit Alexa und Google Assistant."
+                    "description_features": "Fernsteuerung und Integration mit Alexa und Google Assistant.",
+                    "login": {
+                        "title": "Cloud-Anmeldung",
+                        "introduction": "Home Assistant Cloud bietet eine sichere Remote-Verbindung zu Ihrer Instanz, wenn Sie nicht zu Hause sind. Es erlaubt auch die Verbindung zu Amazon Alexa und Google Assistant.",
+                        "introduction2": "Diesen Service betreibt unser Partner ",
+                        "introduction2a": ", ein Unternehmen, das von den Gründern von Home Assistant und Hass.io gegründet wurde.",
+                        "introduction3": "Home Assistant Cloud ist ein Abonnementdienst mit einer kostenlosen einmonatigen Testperiode. Keine Zahlungsinformationen erforderlich.",
+                        "learn_more_link": "Erfahre mehr über Home Assistant Cloud",
+                        "dismiss": "Ausblenden",
+                        "sign_in": "Anmelden",
+                        "email": "E-Mail",
+                        "email_error_msg": "Ungültige E-Mail",
+                        "password": "Passwort",
+                        "password_error_msg": "Passwörter bestehen aus mindestens 8 Zeichen",
+                        "forgot_password": "Passwort vergessen?",
+                        "start_trial": "Starten Sie Ihre kostenlose 1-monatige Testperiode",
+                        "trial_info": "Keine Zahlungsinformationen erforderlich",
+                        "alert_password_change_required": "Sie müssen Ihr Passwort ändern, bevor Sie sich anmelden können.",
+                        "alert_email_confirm_necessary": "Sie müssen Ihre E-Mail-Adresse bestätigen, bevor Sie sich anmelden können."
+                    },
+                    "forgot_password": {
+                        "title": "Passwort vergessen",
+                        "subtitle": "Passwort vergessen",
+                        "instructions": "Geben Sie Ihre E-Mail-Adresse ein und wir senden Ihnen einen Link zum Zurücksetzen Ihres Passworts.",
+                        "email": "E-Mail",
+                        "email_error_msg": "Ungültige E-Mail",
+                        "send_reset_email": "Reset-E-Mail senden",
+                        "check_your_email": "In Ihrer E-Mail finden Sie Anweisungen zum Zurücksetzen Ihres Passworts."
+                    },
+                    "register": {
+                        "title": "Konto registrieren",
+                        "headline": "Testperiode starten",
+                        "information": "Erstellen ein Konto, um eine kostenlose einmonatige Testperiode mit Home Assistant Cloud zu starten. Keine Zahlungsinformationen sind erforderlich.",
+                        "information2": "Die Testperiode gibt Ihnen Zugriff auf alle Vorteile von Home Assistant Cloud, einschließlich:",
+                        "feature_remote_control": "Steuere Home Assistant aus der Ferne",
+                        "feature_google_home": "Integration mit Google Assistant",
+                        "feature_amazon_alexa": "Integration mit Amazon Alexa",
+                        "feature_webhook_apps": "Einfache Integration mit Webhook-basierten Apps wie OwnTracks",
+                        "information3": "Dieser Service wird von unserem Partner betrieben. ",
+                        "information3a": ", ein Unternehmen, das von den Gründern von Home Assistant und Hass.io gegründet wurde.",
+                        "information4": "Durch die Registrierung eines Kontos erklären Sie sich mit den folgenden Bedingungen einverstanden.",
+                        "link_terms_conditions": "Allgemeine Geschäftsbedingungen",
+                        "link_privacy_policy": "Datenschutz-Bestimmungen",
+                        "create_account": "Benutzerkonto anlegen",
+                        "email_address": "E-Mail-Addresse",
+                        "email_error_msg": "Ungültige E-Mail",
+                        "password": "Passwort",
+                        "password_error_msg": "Passwörter bestehen aus mindestens 8 Zeichen.",
+                        "start_trial": "Testperiode starten",
+                        "resend_confirm_email": "Bestätigungsmail erneut senden",
+                        "account_created": "Account erstellt! Schau in deiner E-Mail nach, wie du dein Konto aktivieren kannst."
+                    },
+                    "account": {
+                        "thank_you_note": "Vielen Dank, dass Sie Teil der Home Assistant Cloud sind. Es ist wegen Menschen wie Ihnen, dass wir in der Lage sind, eine großartige Home Automation Erfahrung für alle zu machen. Danke!",
+                        "nabu_casa_account": "Nabu Casa Konto",
+                        "connection_status": "Cloud-Verbindungsstatus",
+                        "manage_account": "Konto verwalten",
+                        "sign_out": "Abmelden",
+                        "integrations": "Integrationen",
+                        "integrations_introduction": "Mit den Integrationen der Home Assistant Cloud können Diensten in der Cloud verbunden werden, ohne dass die Home Assistant Instalation öffentlich im Internet erreichbar sein muss.",
+                        "integrations_introduction2": "Überprüfe die Website für ",
+                        "integrations_link_all_features": " alle verfügbaren Funktionen",
+                        "connected": "Verbunden",
+                        "not_connected": "Nicht verbunden",
+                        "fetching_subscription": "Abo wird abgerufen ...",
+                        "remote": {
+                            "title": "Fernsteuerung",
+                            "access_is_being_prepared": "Der Fernzugriff wird vorbereitet. Wir werden Sie benachrichtigen, wenn alles fertig ist.",
+                            "info": "Home Assistant Cloud bietet eine sichere Remote-Verbindung zu Ihrer Instanz, wenn Sie nicht zu Hause sind.",
+                            "instance_is_available": "Ihre Instanz ist verfügbar unter",
+                            "instance_will_be_available": "Ihre Instanz wird verfügbar sein unter",
+                            "link_learn_how_it_works": "Lerne, wie es funktioniert",
+                            "certificate_info": "Zertifikatsinformationen"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Mit der Alexa-Integration für Home Assistant Cloud können Sie alle Ihre Home Assistant-Geräte über jedes Alexa-fähige Gerät steuern.",
+                            "enable_ha_skill": "Aktiviere den Home Assistant-Skill für Alexa",
+                            "config_documentation": "Konfigurationsdokumentation",
+                            "enable_state_reporting": "Statusberichterstattung aktivieren",
+                            "info_state_reporting": "Wenn die Statusberichterstellung aktiviert wird, sendet Home Assistant alle Statusänderungen exponierter Entitäten an Amazon. So wird in der Alexa-App immer der neueste Status angezeigt.",
+                            "sync_entities": "Entitäten synchronisieren",
+                            "manage_entities": "Entitäten verwalten",
+                            "sync_entities_error": "Fehler beim Synchronisieren von Entitäten:",
+                            "state_reporting_error": "Der Berichtsstatus kann nicht {enable_disable} werden.",
+                            "enable": "aktiviert",
+                            "disable": "deaktiviert"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "Mit der Google Assistant-Integration für Home Assistant Cloud können Sie alle Ihre Home Assistant-Geräte über jedes Google Assistant-fähige Gerät steuern.",
+                            "enable_ha_skill": "Aktivieren Sie den Home Assistant-Skill für Google Assistant",
+                            "config_documentation": "Konfigurationsdokumentation",
+                            "enable_state_reporting": "Statusberichterstattung aktivieren",
+                            "info_state_reporting": "Wenn die Statusberichterstellung aktiviert wird, sendet Home Assistant alle Statusänderungen exponierter Entitäten an Google. So wird in der Google-App immer der neueste Status angezeigt.",
+                            "security_devices": "Sicherheitsgeräte",
+                            "enter_pin_info": "Bitte geben Sie eine PIN ein, um mit Sicherheitsgeräten zu interagieren. Sicherheitsgeräte sind Türen, Garagentore und Schlösser. Sie werden aufgefordert, diese PIN zu sagen \/ einzugeben, wenn Sie mit solchen Geräten über Google Assistant interagieren.",
+                            "devices_pin": "Sicherheitsgeräte PIN",
+                            "enter_pin_hint": "Geben Sie eine PIN ein, um Sicherheitsgeräte zu verwenden",
+                            "sync_entities": "Entitäten mit Google synchronisieren",
+                            "manage_entities": "Entitäten verwalten",
+                            "enter_pin_error": "PIN kann nicht gespeichert werden:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Alles, was so konfiguriert ist, dass es durch einen Webhook ausgelöst wird, kann mit einer öffentlich zugänglichen URL versehen werden, damit Daten von überall an Home Assistant gesenden werden können, ohne deine Installation dem Internet zu öffnen.",
+                            "no_hooks_yet": "Sieht so aus, als gäbe es noch keine Webhooks. Beginne mit der Konfiguration eines ",
+                            "no_hooks_yet_link_integration": "Webhook-basierte Integration",
+                            "no_hooks_yet2": "oder durch Erstellen eines",
+                            "no_hooks_yet_link_automation": "Webhook-Automatisierung",
+                            "link_learn_more": "Weitere Informationen zum Erstellen webhookgestützter Automatisierungen.",
+                            "loading": "Wird geladen ...",
+                            "manage": "Verwalten",
+                            "disable_hook_error_msg": "Fehler beim Deaktivieren des Webhooks:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "Das Bearbeiten der Entitäten, die über diese Benutzeroberfläche verfügbar gemacht werden, ist deaktiviert, da in configuration.yaml Entitätsfilter konfiguriert sind.",
+                        "exposed_entities": "Exponierte Entitäten",
+                        "not_exposed_entities": "Nicht exponierte Entitäten",
+                        "expose": "In Alexa anzeigen"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Zertifikatsinformationen",
+                        "certificate_expiration_date": "Ablaufdatum des Zertifikats",
+                        "will_be_auto_renewed": "Wird automatisch erneuert",
+                        "fingerprint": "Zertifikat Fingerabdruck:",
+                        "close": "Schließen"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Im Google Assistenten anzeigen",
+                        "disable_2FA": "Zweifaktor-Authentifizierung deaktivieren",
+                        "banner": "Das Bearbeiten der Entitäten, die über diese Benutzeroberfläche verfügbar gemacht werden, ist deaktiviert, da in configuration.yaml Entitätsfilter konfiguriert sind.",
+                        "exposed_entities": "Exponierte Entitäten",
+                        "not_exposed_entities": "Nicht exponierte Entitäten",
+                        "sync_to_google": "Änderungen mit Google synchronisieren."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook für {name}",
+                        "available_at": "Der Webhook ist unter der folgenden URL verfügbar:",
+                        "managed_by_integration": "Dieser Webhook wird von einer Integration verwaltet und kann nicht deaktiviert werden.",
+                        "info_disable_webhook": "Wenn Sie diesen Webhook nicht mehr nutzen wollen, können Sie",
+                        "link_disable_webhook": "deaktiviere es",
+                        "view_documentation": "Dokumentation anzeigen",
+                        "close": "Schließen",
+                        "confirm_disable": "Möchten Sie diesen Webhook wirklich deaktivieren?",
+                        "copied_to_clipboard": "In die Zwischenablage kopiert"
+                    }
                 },
                 "integrations": {
                     "caption": "Integrationen",
@@ -720,7 +907,10 @@
                             "description": "Für diesen Schritt musst du eine externe Website besuchen, um den Vorgang abzuschließen.",
                             "open_site": "Website öffnen"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Nicht alle Integrationen können über die Benutzeroberfläche konfiguriert werden.",
+                    "note_about_website_reference": "Weitere Informationen finden Sie auf der ",
+                    "home_assistant_website": "Home Assistant Website"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Geräte hinzufügen",
                         "spinner": "Suche nach ZHA Zigbee Geräten...",
-                        "discovery_text": "Erkannte Geräte werden hier angezeigt. Befolgen Sie die Anweisungen für Ihr Gerät und versetzen Sie das Gerät in den Pairing-Modus."
+                        "discovery_text": "Erkannte Geräte werden hier angezeigt. Befolgen Sie die Anweisungen für Ihr Gerät und versetzen Sie das Gerät in den Pairing-Modus.",
+                        "search_again": "Erneut suchen"
+                    },
+                    "common": {
+                        "add_devices": "Geräte hinzufügen",
+                        "clusters": "Cluster",
+                        "devices": "Geräte",
+                        "manufacturer_code_override": "Hersteller-Code Überschreiben",
+                        "value": "Wert"
+                    },
+                    "network_management": {
+                        "header": "Netzwerkverwaltung",
+                        "introduction": "Befehle, die das gesamte Netzwerk betreffen"
+                    },
+                    "node_management": {
+                        "header": "Geräteverwaltung",
+                        "introduction": "Führe ZHA-Befehle aus, die sich auf ein einzelnes Gerät auswirken. Wähle ein Gerät aus, um eine Liste der verfügbaren Befehle anzuzeigen.",
+                        "hint_battery_devices": "Hinweis: Schlafende (batteriebetriebene) Geräte müssen wach sein, wenn Befehle für sie ausgeführt werden. Ein schlafendes Gerät kann meist durch eine Aktion am Gerät aufgeweckt werden.",
+                        "hint_wakeup": "Einige Geräte, z. B. Xiaomi-Sensoren, verfügen über eine Wecktaste, die in Intervallen von ~5 Sekunden gedrückt werden können, um die Geräte wach zu halten, während mit ihnen interagiert wird.",
+                        "help_node_dropdown": "Wähle ein Gerät aus, um die Geräteoptionen anzuzeigen."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Wähle einen Cluster aus, um Attribute und Befehle anzuzeigen."
+                    },
+                    "cluster_attributes": {
+                        "header": "Cluster-Attribute",
+                        "introduction": "Anzeigen und Bearbeiten von Clusterattributen.",
+                        "attributes_of_cluster": "Attribute des ausgewählten Clusters",
+                        "get_zigbee_attribute": "Zigbee-Attribut abrufen",
+                        "set_zigbee_attribute": "Zigbee-Attribut setzen",
+                        "help_attribute_dropdown": "Wählen Sie ein Attribut aus, um dessen Wert anzuzeigen oder festzulegen.",
+                        "help_get_zigbee_attribute": "Ruft den Wert für das ausgewählte Attribut ab.",
+                        "help_set_zigbee_attribute": "Setzt den Attributwert für den angegebenen Cluster auf der angegebenen Entität."
+                    },
+                    "cluster_commands": {
+                        "header": "Cluster-Befehle",
+                        "introduction": "Anzeigen und Ausgeben von Clusterbefehlen.",
+                        "commands_of_cluster": "Befehle des ausgewählten Clusters",
+                        "issue_zigbee_command": "Zigbee-Kommando absetzen",
+                        "help_command_dropdown": "Wähle einen Befehl zur Interaktion aus."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Der Home Assistant führt eine Registrierung aller Entitäten, die er je gesehen hat und die eindeutig identifiziert werden können. Jeder dieser Entitäten wird eine Entitäts-ID zugewiesen, die nur für diese Entität reserviert ist.",
                         "introduction2": "Verwende die Entitätsregistrierung, um den Namen zu überschreiben, die Entität-ID zu ändern oder den Eintrag aus dem Home Assistant zu entfernen. Beachte, dass das Entfernen des Entitätsregistrierungseintrags die Entität nicht löscht. Folge dazu dem Link unten und entferne ihn in der Integrationsseite.",
                         "integrations_page": "Integrationsseite",
-                        "show_disabled": "Anzeigen deaktivierter Entitäten"
+                        "show_disabled": "Anzeigen deaktivierter Entitäten",
+                        "headers": {
+                            "name": "Name",
+                            "entity_id": "Entitäts-ID",
+                            "integration": "Integration",
+                            "enabled": "Aktiviert"
+                        }
                     },
                     "editor": {
                         "unavailable": "Diese Entität ist derzeit nicht verfügbar.",
@@ -791,8 +1026,24 @@
                         "name": "Name",
                         "device_tracker_intro": "Wähle die Geräte, die dieser Person gehören.",
                         "device_tracker_picked": "Verfolge Gerät",
-                        "device_tracker_pick": "Wähle zu verfolgendes Gerät"
-                    }
+                        "device_tracker_pick": "Wähle zu verfolgendes Gerät",
+                        "new_person": "Neue Person",
+                        "name_error_msg": "Name erforderlich",
+                        "linked_user": "Verknüpfter Benutzer",
+                        "no_device_tracker_available_intro": "Wenn Sie Geräte haben, die die Anwesenheit einer Person anzeigen, können Sie diese hier einer Person zuordnen. Sie können Ihr erstes Gerät hinzufügen, indem Sie eine Integration zur Anwesenheitserkennung auf der Integrationsseite hinzufügen.",
+                        "link_presence_detection_integrations": "Integrationen zur Anwesenheitserkennung",
+                        "link_integrations_page": "Integrationsseite",
+                        "delete": "Löschen",
+                        "create": "Erstellen",
+                        "update": "Aktualisieren"
+                    },
+                    "introduction": "Hier können Sie jede Person von Interesse in Home Assistant definieren.",
+                    "note_about_persons_configured_in_yaml": "Hinweis: Personen, die über configuration.yaml konfiguriert wurden, können nicht über die Benutzeroberfläche bearbeitet werden.",
+                    "no_persons_created_yet": "Sieht so aus, als hättest du noch keine Personen angelegt.",
+                    "create_person": "Person erstellen",
+                    "add_person": "Person hinzufügen",
+                    "confirm_delete": "Möchten Sie diese Person wirklich löschen?",
+                    "confirm_delete2": "Alle Geräte, die zu dieser Person gehören, werden nicht mehr zugeordnet."
                 },
                 "server_control": {
                     "caption": "Serversteuerung",
@@ -838,6 +1089,11 @@
                             "caption": "Wenn etwas ausgelöst wird ..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Du hast ungespeicherte Änderungen. Bist du dir sicher, dass du den Editor verlassen möchtest?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Vibrieren",
                     "description": "Aktivieren oder deaktivieren Sie die Vibration an diesem Gerät, wenn Sie Geräte steuern."
+                },
+                "advanced_mode": {
+                    "title": "Erweiterter Modus",
+                    "description": "Home-Assistent verbirgt standardmäßig erweiterte Funktionen und Optionen. Mache diese Funktionen zugänglich, indem diese Option aktiviert wird. Dies ist eine benutzerspezifische Einstellung, die sich nicht auf andere Benutzer auswirkt, die Home Assistant verwenden."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Karte hinzufügen",
                         "edit": "Bearbeiten",
                         "delete": "Löschen",
-                        "move": "Bewegen"
+                        "move": "Bewegen",
+                        "show_visual_editor": "Visuellen Editor anzeigen",
+                        "show_code_editor": "Code-Editor anzeigen"
                     },
                     "migrate": {
                         "header": "Konfiguration inkompatibel",
@@ -1121,7 +1383,8 @@
                             "optional": "Optional"
                         },
                         "entities": {
-                            "show_header_toggle": "Namen anzeigen?"
+                            "show_header_toggle": "Namen anzeigen?",
+                            "name": "Elemente"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Grün",
                                 "red": "Rot",
                                 "yellow": "Gelb"
-                            }
+                            },
+                            "name": "Gauge"
                         },
                         "glance": {
-                            "columns": "Spalten"
+                            "columns": "Spalten",
+                            "name": "Glance"
                         },
                         "generic": {
                             "aspect_ratio": "Seitenverhältnis",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Geolocation-Quellen",
                             "dark_mode": "Dunkler Modus?",
                             "default_zoom": "Standard-Zoom",
-                            "source": "Quelle"
+                            "source": "Quelle",
+                            "name": "Karte"
                         },
                         "markdown": {
-                            "content": "Inhalt"
+                            "content": "Inhalt",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Diagrammdetail",
-                            "graph_type": "Typ"
+                            "graph_type": "Typ",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Alarmpanel",
+                            "available_states": "Verfügbare Zustände"
+                        },
+                        "conditional": {
+                            "name": "Bedingte Elemente"
+                        },
+                        "entity-button": {
+                            "name": "Entity Button"
+                        },
+                        "entity-filter": {
+                            "name": "Entity Filter"
+                        },
+                        "history-graph": {
+                            "name": "History Graph"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horizontaler Stapel"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Licht"
+                        },
+                        "media-control": {
+                            "name": "Mediensteuerung"
+                        },
+                        "picture": {
+                            "name": "Picture"
+                        },
+                        "picture-elements": {
+                            "name": "Picture Elements"
+                        },
+                        "picture-entity": {
+                            "name": "Picture Entity"
+                        },
+                        "picture-glance": {
+                            "name": "Picture Glance"
+                        },
+                        "plant-status": {
+                            "name": "Planzen Status"
+                        },
+                        "shopping-list": {
+                            "name": "Einkaufsliste"
+                        },
+                        "thermostat": {
+                            "name": "Thermostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Vertikaler Stapel"
+                        },
+                        "weather-forecast": {
+                            "name": "Wettervorhersage"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "{entity} ausgeschaltet.",
             "service_called": "Dienst {service} aufgerufen.",
             "service_call_failed": "Fehler beim Aufrufen des Service {service}.",
-            "connection_lost": "Verbindung getrennt. Verbinde erneut..."
+            "connection_lost": "Verbindung getrennt. Verbinde erneut...",
+            "triggered": "{name} ausgelöst"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "Vorname des Benutzers",
                     "area_picker_label": "Bereich",
                     "update_name_button": "Aktualisierung Name"
-                }
+                },
+                "buttons": {
+                    "add": "Geräte hinzufügen",
+                    "remove": "Gerät entfernen",
+                    "reconfigure": "Gerät neu konfigurieren"
+                },
+                "quirk": "Eigenart",
+                "last_seen": "Zuletzt gesehen",
+                "power_source": "Energiequelle",
+                "unknown": "Unbekannt"
             }
         },
         "auth_store": {
diff --git a/translations/el.json b/translations/el.json
index 1e72f52742..43ed0d60b3 100644
--- a/translations/el.json
+++ b/translations/el.json
@@ -504,7 +504,12 @@
                                     "leave": "Αποχώρηση"
                                 },
                                 "device": {
-                                    "label": "Συσκευή"
+                                    "label": "Συσκευή",
+                                    "extra_fields": {
+                                        "above": "Πάνω από",
+                                        "below": "Κάτω από",
+                                        "for": "Διάρκεια"
+                                    }
                                 }
                             },
                             "learn_more": "Μάθετε περισσότερα σχετικά με τα εναύσματα"
@@ -553,7 +558,18 @@
                                     "zone": "Ζώνη"
                                 },
                                 "device": {
-                                    "label": "Συσκευή"
+                                    "label": "Συσκευή",
+                                    "extra_fields": {
+                                        "above": "Πάνω από",
+                                        "below": "Κάτω από",
+                                        "for": "Διάρκεια"
+                                    }
+                                },
+                                "and": {
+                                    "label": "Και"
+                                },
+                                "or": {
+                                    "label": "Ή"
                                 }
                             },
                             "learn_more": "Μάθετε περισσότερα σχετικά με τις συνθήκες"
@@ -591,17 +607,27 @@
                                 },
                                 "device_id": {
                                     "label": "Συσκευή"
+                                },
+                                "scene": {
+                                    "label": "Ενεργοποίηση σκηνής"
                                 }
                             },
                             "learn_more": "Μάθετε περισσότερα σχετικά με τις ενέργειες"
                         },
                         "load_error_not_editable": "Μόνο οι αυτοματισμοί στο automations.yaml είναι επεξεργάσιμοι.",
-                        "load_error_unknown": "Σφάλμα κατά τη φόρτωση αυτοματισμού ({err_no})."
+                        "load_error_unknown": "Σφάλμα κατά τη φόρτωση αυτοματισμού ({err_no}).",
+                        "description": {
+                            "label": "Περιγραφή",
+                            "placeholder": "Προαιρετική περιγραφή"
+                        }
                     }
                 },
                 "script": {
                     "caption": "Δέσμη ενεργειών",
-                    "description": "Δημιουργήσετε και να επεξεργαστείτε δέσμες ενεργειών"
+                    "description": "Δημιουργήσετε και να επεξεργαστείτε δέσμες ενεργειών",
+                    "picker": {
+                        "learn_more": "Μάθετε περισσότερα σχετικά με τα σενάρια"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -649,13 +675,15 @@
                         "true": "Αληθής",
                         "false": "Ψευδής",
                         "set_config_parameter": "Ορίστε την παράμετρο διαμόρφωσης"
-                    }
+                    },
+                    "learn_more": "Μάθετε περισσότερα σχετικά με το Z-wave"
                 },
                 "users": {
                     "caption": "Χρήστες",
                     "description": "Διαχείριση χρηστών",
                     "picker": {
-                        "title": "Χρήστες"
+                        "title": "Χρήστες",
+                        "system_generated": "Δημιουργήθηκε από το σύστημα"
                     },
                     "editor": {
                         "rename_user": "Μετονομασία χρήστη",
@@ -663,7 +691,18 @@
                         "activate_user": "Ενεργοποίηση χρήστη",
                         "deactivate_user": "Απενεργοποίηση χρήστη",
                         "delete_user": "Διαγραφή χρήστη",
-                        "caption": "Προβολή χρήστη"
+                        "caption": "Προβολή χρήστη",
+                        "id": "Αναγνωριστικό",
+                        "owner": "Ιδιοκτήτης",
+                        "group": "Ομάδα",
+                        "active": "Ενεργό",
+                        "system_generated": "Δημιουργήθηκε από το σύστημα",
+                        "system_generated_users_not_removable": "Δεν είναι δυνατή η διαγραφή χρηστών που δημιουργήθηκαν από το σύστημα",
+                        "unnamed_user": "Χρήστης χωρίς όνομα",
+                        "enter_new_name": "Εισαγάγετε ένα νέο όνομα",
+                        "user_rename_failed": "Η μετονομασία του χρήστη απέτυχε:",
+                        "group_update_failed": "Η ενημέρωση της ομάδας απέτυχε:",
+                        "confirm_user_deletion": "Είστε σίγουροι ότι θέλετε να διαγράψετε το χρήστη {name};"
                     },
                     "add_user": {
                         "caption": "Προσθήκη χρήστη",
@@ -677,7 +716,39 @@
                     "caption": "Σύννεφο Home Assistant",
                     "description_login": "Συνδεδεμένος ως {email}",
                     "description_not_login": "Μη συνδεδεμένος",
-                    "description_features": "Έλεγχος εκτός σπιτιού, ενσωμάτωση με τα Alexa και Google Assistant"
+                    "description_features": "Έλεγχος εκτός σπιτιού, ενσωμάτωση με τα Alexa και Google Assistant",
+                    "account": {
+                        "google": {
+                            "sync_entities": "Συγχρονισμός οντοτήτων στο Google",
+                            "manage_entities": "Διαχείριση Οντοτήτων"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "loading": "Φόρτωση …"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Πληροφορίες Πιστοποιητικού",
+                        "certificate_expiration_date": "Ημερομηνία λήξης πιστοποιητικού",
+                        "will_be_auto_renewed": "Θα ανανεωθεί αυτόματα",
+                        "fingerprint": "Αποτύπωμα πιστοποιητικού:"
+                    },
+                    "google": {
+                        "title": "Google Assistant"
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook για {name}",
+                        "available_at": "Το webhook είναι διαθέσιμο στον ακόλουθο σύνδεσμο:",
+                        "info_disable_webhook": "Αν δεν θέλετε πλέον να χρησιμοποιείτε αυτό το webhook, μπορείτε να",
+                        "link_disable_webhook": "απενεργοποιήστε το",
+                        "view_documentation": "Δείτε τα έγγραφα",
+                        "close": "Κλείστε",
+                        "confirm_disable": "Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε αυτό το webhook;",
+                        "copied_to_clipboard": "Αντιγράφηκε στο πρόχειρο"
+                    }
                 },
                 "integrations": {
                     "caption": "Ενσωματώσεις",
@@ -705,7 +776,8 @@
                             "description": "Αυτό το βήμα απαιτεί να επισκεφτείτε μια εξωτερική ιστοσελίδα για να ολοκληρωθεί.",
                             "open_site": "Άνοιγμα ιστότοπου"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Δε μπορούν όλες οι ενσωματώσεις να διαμορφωθούν από το UI ακόμη."
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -723,7 +795,16 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Προσθήκη Συσκευών",
                         "spinner": "Αναζήτηση συσκευών ZHA Zigbee…",
-                        "discovery_text": "Οι ανακαλυφθείσες συσκευές θα εμφανιστούν εδώ. Ακολουθήστε τις οδηγίες για τις συσκευές σας και τοποθετήστε τις συσκευές στη λειτουργία αντιστοίχισης."
+                        "discovery_text": "Οι ανακαλυφθείσες συσκευές θα εμφανιστούν εδώ. Ακολουθήστε τις οδηγίες για τις συσκευές σας και τοποθετήστε τις συσκευές στη λειτουργία αντιστοίχισης.",
+                        "search_again": "Αναζήτηση ξανά"
+                    },
+                    "common": {
+                        "add_devices": "Προσθήκη συσκευών",
+                        "devices": "Συσκευές",
+                        "value": "Τιμή"
+                    },
+                    "cluster_commands": {
+                        "help_command_dropdown": "Επιλέξτε μια εντολή για αλληλεπίδραση με."
                     }
                 },
                 "area_registry": {
@@ -754,7 +835,11 @@
                         "unavailable": "(μη διαθέσιμο)",
                         "introduction": "Ο Home Assistant διατηρεί μητρώο από κάθε μοναδική οντότητα που ανιχνεύει. Αυτές οι οντότητες έχουν το δικό τους μοναδικό αναγνωριστικό ID.",
                         "introduction2": "Χρησιμοποιήστε το μητρώο οντοτήτων για να παρακάμψετε το όνομα, να αλλάξετε το αναγνωριστικό οντότητας ή να καταργήσετε την καταχώρηση από το Home Assistant. Σημειώστε ότι η κατάργηση της καταχώρησης δεν θα καταργήσει την οντότητα. Για να το κάνετε αυτό, ακολουθήστε τον παρακάτω σύνδεσμο και αφαιρέστε την από τη σελίδα ενοποίησης.",
-                        "integrations_page": "Σελίδα ενσωματώσεων"
+                        "integrations_page": "Σελίδα ενσωματώσεων",
+                        "show_disabled": "Προβολή απενεργοποιημένων οντότητων",
+                        "headers": {
+                            "name": "Όνομα"
+                        }
                     },
                     "editor": {
                         "unavailable": "Αυτή η οντότητα δεν είναι προς το παρόν διαθέσιμη.",
@@ -764,6 +849,7 @@
                         "enabled_label": "Ενεργοποίηση οντότητας",
                         "enabled_cause": "Απενεργοποιήθηκε από τo {cause}.",
                         "enabled_description": "Απενεργοποιημένες οντότητες δεν θα προστεθούν στον Home Assistant",
+                        "confirm_delete": "Είστε σίγουρος ότι θέλετε να διαγραφεί αυτή η ενοποίηση;",
                         "confirm_delete2": "Η διαγραφή μιας καταχώρησης δεν θα καταργήσει την οντότητα από το Home Assistant. Για να γίνει αυτό, θα πρέπει να καταργήσετε την ενσωμάτωση '{platform}' από το Home Assistant."
                     }
                 },
@@ -774,8 +860,19 @@
                         "name": "Όνομα",
                         "device_tracker_intro": "Επιλέξτε τις συσκευές που ανήκουν σε αυτό το άτομο.",
                         "device_tracker_picked": "Παρακολούθηση συσκευής",
-                        "device_tracker_pick": "Επιλέξτε συσκευή για παρακολούθηση"
-                    }
+                        "device_tracker_pick": "Επιλέξτε συσκευή για παρακολούθηση",
+                        "new_person": "Νέο άτομο",
+                        "name_error_msg": "Απαιτείται όνομα",
+                        "linked_user": "Συνδεδεμένος χρήστης",
+                        "delete": "Διαγραφή",
+                        "create": "Δημιουργία",
+                        "update": "Ενημέρωση"
+                    },
+                    "note_about_persons_configured_in_yaml": "Σημείωση: τα άτομα που έχουν ρυθμιστεί από το αρχείο configuration.yaml δε μπορούν να παραμετροποιηθούν από το UI.",
+                    "no_persons_created_yet": "Φαίνεται ότι δεν έχετε δημιουργήσει ακόμα κανένα άτομο.",
+                    "create_person": "Δημιουργία ατόμου",
+                    "add_person": "Προσθέστε Άτομο",
+                    "confirm_delete": "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το άτομο;"
                 },
                 "server_control": {
                     "caption": "Έλεγχος διακομιστή",
@@ -809,7 +906,23 @@
                 },
                 "devices": {
                     "caption": "Συσκευές",
-                    "description": "Διαχείριση συνδεδεμένων συσκευών"
+                    "description": "Διαχείριση συνδεδεμένων συσκευών",
+                    "automation": {
+                        "triggers": {
+                            "caption": "Κάνε κάτι όταν ..."
+                        },
+                        "conditions": {
+                            "caption": "Κάνε κάτι μόνο αν ..."
+                        },
+                        "actions": {
+                            "caption": "Όταν ενεργοποιείται κάτι ..."
+                        }
+                    }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Δεν αποθηκεύσατε τις αλλαγές. Είστε βέβαιοι ότι θέλετε να φύγετε;"
+                    }
                 }
             },
             "profile": {
@@ -885,6 +998,14 @@
                 "force_narrow": {
                     "header": "Να αποκρύπτεται πάντα η πλαϊνή μπάρα",
                     "description": "Αυτό θα κρύψει την πλαϊνή μπάρα από προεπιλογή, παρόμοια με την εμπειρία κινητού."
+                },
+                "vibrate": {
+                    "header": "Δόνηση",
+                    "description": "Ενεργοποιήστε ή απενεργοποιήστε τις δονήσεις σε αυτήν τη συσκευή κατά τον έλεγχο συσκευών."
+                },
+                "advanced_mode": {
+                    "title": "εξειδικευμένη λειτουργία",
+                    "description": "εξειδικευμένη λειτουργία"
                 }
             },
             "page-authorize": {
@@ -1032,7 +1153,8 @@
                         "navigate_to": "Μεταβείτε στην {location}",
                         "toggle": "Εναλλαγή {name}",
                         "call_service": "Κλήση υπηρεσίας {name}",
-                        "more_info": "Εμφάνιση περισσότερων πληροφοριών: {name}"
+                        "more_info": "Εμφάνιση περισσότερων πληροφοριών: {name}",
+                        "url": "Ανοίξτε το παράθυρο στο {url_path}"
                     }
                 },
                 "editor": {
@@ -1044,7 +1166,8 @@
                         "add": "Προσθήκη κάρτας",
                         "edit": "Επεξεργασία",
                         "delete": "Διαγραφή",
-                        "move": "Μετακίνηση"
+                        "move": "Μετακίνηση",
+                        "show_code_editor": "Εμφάνιση επεξεργαστή κώδικα"
                     },
                     "migrate": {
                         "header": "Μη συμβατή διαμόρφωση",
@@ -1078,6 +1201,99 @@
                     "edit_lovelace": {
                         "header": "Τίτλος του περιβάλλοντος εργασίας σας Lovelace",
                         "explanation": "Αυτός ο τίτλος εμφανίζεται πάνω από όλες τις καρτέλες σας στο Lovelace."
+                    },
+                    "card": {
+                        "alarm_panel": {
+                            "available_states": "Διαθέσιμες λειτουργίες"
+                        },
+                        "config": {
+                            "required": "Υποχρεωτικό",
+                            "optional": "Προαιρετικό"
+                        },
+                        "gauge": {
+                            "severity": {
+                                "green": "Πράσινος",
+                                "red": "Κόκκινο",
+                                "yellow": "Κίτρινο"
+                            },
+                            "name": "Μετρητής"
+                        },
+                        "glance": {
+                            "columns": "Στήλες"
+                        },
+                        "generic": {
+                            "aspect_ratio": "Αναλογία απεικόνισης",
+                            "camera_image": "Οντότητα κάμερας",
+                            "camera_view": "Προβολή κάμερας",
+                            "entities": "Οντότητες",
+                            "entity": "Οντότητα",
+                            "hours_to_show": "Ώρες για εμφάνιση",
+                            "icon": "Εικονίδιο",
+                            "icon_height": "Ύψος εικονιδίου",
+                            "image": "Διαδρομή εικόνας",
+                            "maximum": "Μέγιστο",
+                            "minimum": "Ελάχιστο",
+                            "name": "Όνομα",
+                            "show_icon": "Εμφάνιση εικονιδίου;",
+                            "show_name": "Εμφάνιση ονόματος;",
+                            "show_state": "Εμφάνιση κατάστασης;",
+                            "title": "Τίτλος",
+                            "theme": "Θέμα",
+                            "unit": "Μονάδα"
+                        },
+                        "map": {
+                            "geo_location_sources": "Πηγές γεωγεωγραφικής θέσης",
+                            "dark_mode": "Σκοτεινή λειτουργία;",
+                            "default_zoom": "Προεπιλεγμένο ζουμ",
+                            "source": "Πηγή",
+                            "name": "Χάρτης"
+                        },
+                        "markdown": {
+                            "content": "Περιεχόμενο"
+                        },
+                        "alarm-panel": {
+                            "name": "Πίνακας συναγερμών",
+                            "available_states": "Διαθέσιμες λειτουργίες"
+                        },
+                        "entities": {
+                            "name": "Οντότητες"
+                        },
+                        "entity-button": {
+                            "name": "Κουμπί οντότητας"
+                        },
+                        "entity-filter": {
+                            "name": "Φίλτρο οντοτήτων"
+                        },
+                        "history-graph": {
+                            "name": "Ιστορικό γράφημα"
+                        },
+                        "horizontal-stack": {
+                            "name": "Οριζόντια διάταξη"
+                        },
+                        "light": {
+                            "name": "Φως"
+                        },
+                        "picture": {
+                            "name": "Εικόνα"
+                        },
+                        "plant-status": {
+                            "name": "Κατάσταση εγκατάστασης"
+                        },
+                        "sensor": {
+                            "name": "Αισθητήρας"
+                        },
+                        "shopping-list": {
+                            "name": "Λίστα αγορών"
+                        },
+                        "thermostat": {
+                            "name": "Θερμοστάτης"
+                        },
+                        "vertical-stack": {
+                            "name": "Κάθετη διάταξη"
+                        },
+                        "weather-forecast": {
+                            "name": "πρόγνωση καιρού"
+                        }
                     }
                 },
                 "menu": {
@@ -1358,7 +1574,15 @@
                     "device_name_placeholder": "Όνομα δοσμένο από τον χρήστη",
                     "area_picker_label": "Περιοχή",
                     "update_name_button": "Ενημέρωση ονόματος"
-                }
+                },
+                "buttons": {
+                    "add": "Προσθήκη συσκευών",
+                    "remove": "Κατάργηση συσκευής",
+                    "reconfigure": "Ρυθμίστε Ξανά Τη Συσκευή"
+                },
+                "quirk": "Ιδιοτροπία",
+                "power_source": "Πηγή ενέργειας",
+                "unknown": "Άγνωστη"
             }
         },
         "auth_store": {
diff --git a/translations/en.json b/translations/en.json
index f2d81ea426..523eeca227 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -558,7 +558,12 @@
                                     "zone": "Zone"
                                 },
                                 "device": {
-                                    "label": "Device"
+                                    "label": "Device",
+                                    "extra_fields": {
+                                        "above": "Above",
+                                        "below": "Below",
+                                        "for": "Duration"
+                                    }
                                 },
                                 "and": {
                                     "label": "And"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Device"
+                                },
+                                "scene": {
+                                    "label": "Activate scene"
                                 }
                             },
                             "learn_more": "Learn more about actions"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Script",
-                    "description": "Create and edit scripts"
+                    "description": "Create and edit scripts",
+                    "picker": {
+                        "header": "Script Editor",
+                        "introduction": "The script editor allows you to create and edit scripts. Please follow the link below to read the instructions to make sure that you have configured Home Assistant correctly.",
+                        "learn_more": "Learn more about scripts",
+                        "no_scripts": "We couldn’t find any editable scripts",
+                        "add_script": "Add script"
+                    },
+                    "editor": {
+                        "header": "Script: {name}",
+                        "default_name": "New Script",
+                        "load_error_not_editable": "Only scripts inside scripts.yaml are editable.",
+                        "delete_confirm": "Are you sure you want to delete this script?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "True",
                         "false": "False",
                         "set_config_parameter": "Set Config Parameter"
+                    },
+                    "learn_more": "Learn more about Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW Log",
+                        "introduction": "View the log. 0 is the minimum (loads entire log) and 1000 is the maximum. Load will show a static log and tail will auto update with the last specified number of lines of the log."
                     }
                 },
                 "users": {
                     "caption": "Users",
                     "description": "Manage users",
                     "picker": {
-                        "title": "Users"
+                        "title": "Users",
+                        "system_generated": "System generated"
                     },
                     "editor": {
                         "rename_user": "Rename user",
@@ -678,7 +705,18 @@
                         "activate_user": "Activate user",
                         "deactivate_user": "Deactivate user",
                         "delete_user": "Delete user",
-                        "caption": "View user"
+                        "caption": "View user",
+                        "id": "ID",
+                        "owner": "Owner",
+                        "group": "Group",
+                        "active": "Active",
+                        "system_generated": "System generated",
+                        "system_generated_users_not_removable": "Unable to remove system generated users.",
+                        "unnamed_user": "Unnamed User",
+                        "enter_new_name": "Enter new name",
+                        "user_rename_failed": "User rename failed:",
+                        "group_update_failed": "Group update failed:",
+                        "confirm_user_deletion": "Are you sure you want to delete {name}?"
                     },
                     "add_user": {
                         "caption": "Add user",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Logged in as {email}",
                     "description_not_login": "Not logged in",
-                    "description_features": "Control away from home, integrate with Alexa and Google Assistant."
+                    "description_features": "Control away from home, integrate with Alexa and Google Assistant.",
+                    "login": {
+                        "title": "Cloud Login",
+                        "introduction": "Home Assistant Cloud provides you with a secure remote connection to your instance while away from home. It also allows you to connect with cloud-only services: Amazon Alexa and Google Assistant.",
+                        "introduction2": "This service is run by our partner ",
+                        "introduction2a": ", a company founded by the founders of Home Assistant and Hass.io.",
+                        "introduction3": "Home Assistant Cloud is a subscription service with a free one month trial. No payment information necessary.",
+                        "learn_more_link": "Learn more about Home Assistant Cloud",
+                        "dismiss": "Dismiss",
+                        "sign_in": "Sign in",
+                        "email": "Email",
+                        "email_error_msg": "Invalid email",
+                        "password": "Password",
+                        "password_error_msg": "Passwords are at least 8 characters",
+                        "forgot_password": "forgot password?",
+                        "start_trial": "Start your free 1 month trial",
+                        "trial_info": "No payment information necessary",
+                        "alert_password_change_required": "You need to change your password before logging in.",
+                        "alert_email_confirm_necessary": "You need to confirm your email before logging in."
+                    },
+                    "forgot_password": {
+                        "title": "Forgot password",
+                        "subtitle": "Forgot your password",
+                        "instructions": "Enter your email address and we will send you a link to reset your password.",
+                        "email": "Email",
+                        "email_error_msg": "Invalid email",
+                        "send_reset_email": "Send reset email",
+                        "check_your_email": "Check your email for instructions on how to reset your password."
+                    },
+                    "register": {
+                        "title": "Register Account",
+                        "headline": "Start your free trial",
+                        "information": "Create an account to start your free one month trial with Home Assistant Cloud. No payment information necessary.",
+                        "information2": "The trial will give you access to all the benefits of Home Assistant Cloud, including:",
+                        "feature_remote_control": "Control of Home Assistant away from home",
+                        "feature_google_home": "Integration with Google Assistant",
+                        "feature_amazon_alexa": "Integration with Amazon Alexa",
+                        "feature_webhook_apps": "Easy integration with webhook-based apps like OwnTracks",
+                        "information3": "This service is run by our partner ",
+                        "information3a": ", a company founded by the founders of Home Assistant and Hass.io.",
+                        "information4": "By registering an account you agree to the following terms and conditions.",
+                        "link_terms_conditions": "Terms and Conditions",
+                        "link_privacy_policy": "Privacy Policy",
+                        "create_account": "Create Account",
+                        "email_address": "Email address",
+                        "email_error_msg": "Invalid email",
+                        "password": "Password",
+                        "password_error_msg": "Passwords are at least 8 characters",
+                        "start_trial": "Start Trial",
+                        "resend_confirm_email": "Resend confirmation email",
+                        "account_created": "Account created! Check your email for instructions on how to activate your account."
+                    },
+                    "account": {
+                        "thank_you_note": "Thank you for being part of Home Assistant Cloud. It's because of people like you that we are able to make a great home automation experience for everyone. Thank you!",
+                        "nabu_casa_account": "Nabu Casa Account",
+                        "connection_status": "Cloud connection status",
+                        "manage_account": "Manage Account",
+                        "sign_out": "Sign out",
+                        "integrations": "Integrations",
+                        "integrations_introduction": "Integrations for Home Assistant Cloud allow you to connect with services in the cloud without having to expose your Home Assistant instance publicly on the internet.",
+                        "integrations_introduction2": "Check the website for ",
+                        "integrations_link_all_features": " all available features",
+                        "connected": "Connected",
+                        "not_connected": "Not Connected",
+                        "fetching_subscription": "Fetching subscription…",
+                        "remote": {
+                            "title": "Remote Control",
+                            "access_is_being_prepared": "Remote access is being prepared. We will notify you when it's ready.",
+                            "info": "Home Assistant Cloud provides a secure remote connection to your instance while away from home.",
+                            "instance_is_available": "Your instance is available at",
+                            "instance_will_be_available": "Your instance will be available at",
+                            "link_learn_how_it_works": "Learn how it works",
+                            "certificate_info": "Certificate Info"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "With the Alexa integration for Home Assistant Cloud you'll be able to control all your Home Assistant devices via any Alexa-enabled device.",
+                            "enable_ha_skill": "Enable the Home Assistant skill for Alexa",
+                            "config_documentation": "Config documentation",
+                            "enable_state_reporting": "Enable State Reporting",
+                            "info_state_reporting": "If you enable state reporting, Home Assistant will send all state changes of exposed entities to Amazon. This allows you to always see the latest states in the Alexa app and use the state changes to create routines.",
+                            "sync_entities": "Sync Entities",
+                            "manage_entities": "Manage Entities",
+                            "sync_entities_error": "Failed to sync entities:",
+                            "state_reporting_error": "Unable to {enable_disable} report state.",
+                            "enable": "enable",
+                            "disable": "disable"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "With the Google Assistant integration for Home Assistant Cloud you'll be able to control all your Home Assistant devices via any Google Assistant-enabled device.",
+                            "enable_ha_skill": "Activate the Home Assistant skill for Google Assistant",
+                            "config_documentation": "Config documentation",
+                            "enable_state_reporting": "Enable State Reporting",
+                            "info_state_reporting": "If you enable state reporting, Home Assistant will send all state changes of exposed entities to Google. This allows you to always see the latest states in the Google app.",
+                            "security_devices": "Security Devices",
+                            "enter_pin_info": "Please enter a pin to interact with security devices. Security devices are doors, garage doors and locks. You will be asked to say\/enter this pin when interacting with such devices via Google Assistant.",
+                            "devices_pin": "Security Devices Pin",
+                            "enter_pin_hint": "Enter a PIN to use security devices",
+                            "sync_entities": "Sync Entities to Google",
+                            "manage_entities": "Manage Entities",
+                            "enter_pin_error": "Unable to store pin:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Anything that is configured to be triggered by a webhook can be given a publicly accessible URL to allow you to send data back to Home Assistant from anywhere, without exposing your instance to the internet.",
+                            "no_hooks_yet": "Looks like you have no webhooks yet. Get started by configuring a ",
+                            "no_hooks_yet_link_integration": "webhook-based integration",
+                            "no_hooks_yet2": " or by creating a ",
+                            "no_hooks_yet_link_automation": "webhook automation",
+                            "link_learn_more": "Learn more about creating webhook-powered automations.",
+                            "loading": "Loading ...",
+                            "manage": "Manage",
+                            "disable_hook_error_msg": "Failed to disable webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "Editing which entities are exposed via this UI is disabled because you have configured entity filters in configuration.yaml.",
+                        "exposed_entities": "Exposed entities",
+                        "not_exposed_entities": "Not Exposed entities",
+                        "expose": "Expose to Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Certificate Information",
+                        "certificate_expiration_date": "Certificate expiration date",
+                        "will_be_auto_renewed": "Will be automatically renewed",
+                        "fingerprint": "Certificate fingerprint:",
+                        "close": "Close"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Expose to Google Assistant",
+                        "disable_2FA": "Disable two factor authentication",
+                        "banner": "Editing which entities are exposed via this UI is disabled because you have configured entity filters in configuration.yaml.",
+                        "exposed_entities": "Exposed entities",
+                        "not_exposed_entities": "Not Exposed entities",
+                        "sync_to_google": "Synchronizing changes to Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook for {name}",
+                        "available_at": "The webhook is available at the following url:",
+                        "managed_by_integration": "This webhook is managed by an integration and cannot be disabled.",
+                        "info_disable_webhook": "If you no longer want to use this webhook, you can",
+                        "link_disable_webhook": "disable it",
+                        "view_documentation": "View documentation",
+                        "close": "Close",
+                        "confirm_disable": "Are you sure you want to disable this webhook?",
+                        "copied_to_clipboard": "Copied to clipboard"
+                    }
                 },
                 "integrations": {
                     "caption": "Integrations",
@@ -720,7 +907,10 @@
                             "description": "This step requires you to visit an external website to be completed.",
                             "open_site": "Open website"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Not all integrations can be configured via the UI yet.",
+                    "note_about_website_reference": "More are available on the ",
+                    "home_assistant_website": "Home Assistant website"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Add Devices",
                         "spinner": "Searching for ZHA Zigbee devices...",
-                        "discovery_text": "Discovered devices will show up here. Follow the instructions for your device(s) and place the device(s) in pairing mode."
+                        "discovery_text": "Discovered devices will show up here. Follow the instructions for your device(s) and place the device(s) in pairing mode.",
+                        "search_again": "Search Again"
+                    },
+                    "common": {
+                        "add_devices": "Add Devices",
+                        "clusters": "Clusters",
+                        "devices": "Devices",
+                        "manufacturer_code_override": "Manufacturer Code Override",
+                        "value": "Value"
+                    },
+                    "network_management": {
+                        "header": "Network Management",
+                        "introduction": "Commands that affect the entire network"
+                    },
+                    "node_management": {
+                        "header": "Device Management",
+                        "introduction": "Run ZHA commands that affect a single device. Pick a device to see a list of available commands.",
+                        "hint_battery_devices": "Note: Sleepy (battery powered) devices need to be awake when executing commands against them. You can generally wake a sleepy device by triggering it.",
+                        "hint_wakeup": "Some devices such as Xiaomi sensors have a wake up button that you can press at ~5 second intervals that keep devices awake while you interact with them.",
+                        "help_node_dropdown": "Select a device to view per-device options."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Select a cluster to view attributes and commands."
+                    },
+                    "cluster_attributes": {
+                        "header": "Cluster Attributes",
+                        "introduction": "View and edit cluster attributes.",
+                        "attributes_of_cluster": "Attributes of the selected cluster",
+                        "get_zigbee_attribute": "Get Zigbee Attribute",
+                        "set_zigbee_attribute": "Set Zigbee Attribute",
+                        "help_attribute_dropdown": "Select an attribute to view or set its value.",
+                        "help_get_zigbee_attribute": "Get the value for the selected attribute.",
+                        "help_set_zigbee_attribute": "Set attribute value for the specified cluster on the specified entity."
+                    },
+                    "cluster_commands": {
+                        "header": "Cluster Commands",
+                        "introduction": "View and issue cluster commands.",
+                        "commands_of_cluster": "Commands of the selected cluster",
+                        "issue_zigbee_command": "Issue Zigbee Command",
+                        "help_command_dropdown": "Select a command to interact with."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant keeps a registry of every entity it has ever seen that can be uniquely identified. Each of these entities will have an entity ID assigned which will be reserved for just this entity.",
                         "introduction2": "Use the entity registry to override the name, change the entity ID or remove the entry from Home Assistant. Note, removing the entity registry entry won't remove the entity. To do that, follow the link below and remove it from the integrations page.",
                         "integrations_page": "Integrations page",
-                        "show_disabled": "Show disabled entities"
+                        "show_disabled": "Show disabled entities",
+                        "headers": {
+                            "name": "Name",
+                            "entity_id": "Entity ID",
+                            "integration": "Integration",
+                            "enabled": "Enabled"
+                        }
                     },
                     "editor": {
                         "unavailable": "This entity is not currently available.",
@@ -791,8 +1026,24 @@
                         "name": "Name",
                         "device_tracker_intro": "Select the devices that belong to this person.",
                         "device_tracker_picked": "Track Device",
-                        "device_tracker_pick": "Pick device to track"
-                    }
+                        "device_tracker_pick": "Pick device to track",
+                        "new_person": "New Person",
+                        "name_error_msg": "Name is required",
+                        "linked_user": "Linked User",
+                        "no_device_tracker_available_intro": "When you have devices that indicate the presence of a person, you will be able to assign them to a person here. You can add your first device by adding a presence-detection integration from the integrations page.",
+                        "link_presence_detection_integrations": "Presence Detection Integrations",
+                        "link_integrations_page": "Integrations page",
+                        "delete": "Delete",
+                        "create": "Create",
+                        "update": "Update"
+                    },
+                    "introduction": "Here you can define each person of interest in Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Note: persons configured via configuration.yaml cannot be edited via the UI.",
+                    "no_persons_created_yet": "Looks like you have not created any persons yet.",
+                    "create_person": "Create Person",
+                    "add_person": "Add Person",
+                    "confirm_delete": "Are you sure you want to delete this person?",
+                    "confirm_delete2": "All devices belonging to this person will become unassigned."
                 },
                 "server_control": {
                     "caption": "Server Control",
@@ -838,6 +1089,11 @@
                             "caption": "When something is triggered..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "You have unsaved changes. Are you sure you want to leave?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Vibrate",
                     "description": "Enable or disable vibration on this device when controlling devices."
+                },
+                "advanced_mode": {
+                    "title": "Advanced Mode",
+                    "description": "Home Assistant hides advanced features and options by default. You can make these features accessible by checking this toggle. This is a user-specific setting and does not impact other users using Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Add Card",
                         "edit": "Edit",
                         "delete": "Delete",
-                        "move": "Move"
+                        "move": "Move",
+                        "show_visual_editor": "Show Visual Editor",
+                        "show_code_editor": "Show Code Editor"
                     },
                     "migrate": {
                         "header": "Configuration Incompatible",
@@ -1121,7 +1383,8 @@
                             "optional": "Optional"
                         },
                         "entities": {
-                            "show_header_toggle": "Show Header Toggle?"
+                            "show_header_toggle": "Show Header Toggle?",
+                            "name": "Entities"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Green",
                                 "red": "Red",
                                 "yellow": "Yellow"
-                            }
+                            },
+                            "name": "Gauge"
                         },
                         "glance": {
-                            "columns": "Columns"
+                            "columns": "Columns",
+                            "name": "Glance"
                         },
                         "generic": {
                             "aspect_ratio": "Aspect Ratio",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Geolocation Sources",
                             "dark_mode": "Dark Mode?",
                             "default_zoom": "Default Zoom",
-                            "source": "Source"
+                            "source": "Source",
+                            "name": "Map"
                         },
                         "markdown": {
-                            "content": "Content"
+                            "content": "Content",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Graph Detail",
-                            "graph_type": "Graph Type"
+                            "graph_type": "Graph Type",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Alarm Panel",
+                            "available_states": "Available States"
+                        },
+                        "conditional": {
+                            "name": "Conditional"
+                        },
+                        "entity-button": {
+                            "name": "Entity Button"
+                        },
+                        "entity-filter": {
+                            "name": "Entity Filter"
+                        },
+                        "history-graph": {
+                            "name": "History Graph"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horizontal Stack"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Light"
+                        },
+                        "media-control": {
+                            "name": "Media Control"
+                        },
+                        "picture": {
+                            "name": "Picture"
+                        },
+                        "picture-elements": {
+                            "name": "Picture Elements"
+                        },
+                        "picture-entity": {
+                            "name": "Picture Entity"
+                        },
+                        "picture-glance": {
+                            "name": "Picture Glance"
+                        },
+                        "plant-status": {
+                            "name": "Plant Status"
+                        },
+                        "shopping-list": {
+                            "name": "Shopping List"
+                        },
+                        "thermostat": {
+                            "name": "Thermostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Vertical Stack"
+                        },
+                        "weather-forecast": {
+                            "name": "Weather Forecast"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "Turned off {entity}.",
             "service_called": "Service {service} called.",
             "service_call_failed": "Failed to call service {service}.",
-            "connection_lost": "Connection lost. Reconnecting…"
+            "connection_lost": "Connection lost. Reconnecting…",
+            "triggered": "Triggered {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1445,13 +1769,22 @@
                 "services": {
                     "reconfigure": "Reconfigure ZHA device (heal device). Use this if you are having issues with the device. If the device in question is a battery powered device please ensure it is awake and accepting commands when you use this service.",
                     "updateDeviceName": "Set a custom name for this device in the device registry.",
-                    "remove": "Remove a device from the ZigBee network."
+                    "remove": "Remove a device from the Zigbee network."
                 },
                 "zha_device_card": {
                     "device_name_placeholder": "User given name",
                     "area_picker_label": "Area",
                     "update_name_button": "Update Name"
-                }
+                },
+                "buttons": {
+                    "add": "Add Devices",
+                    "remove": "Remove Device",
+                    "reconfigure": "Reconfigure Device"
+                },
+                "quirk": "Quirk",
+                "last_seen": "Last Seen",
+                "power_source": "Power Source",
+                "unknown": "Unknown"
             }
         },
         "auth_store": {
diff --git a/translations/es.json b/translations/es.json
index 669b19dead..e483b91e5e 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -558,7 +558,12 @@
                                     "zone": "Zona"
                                 },
                                 "device": {
-                                    "label": "Dispositivo"
+                                    "label": "Dispositivo",
+                                    "extra_fields": {
+                                        "above": "Por encima de",
+                                        "below": "Por debajo de",
+                                        "for": "Duración"
+                                    }
                                 },
                                 "and": {
                                     "label": "Y"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Dispositivo"
+                                },
+                                "scene": {
+                                    "label": "Activar escena"
                                 }
                             },
                             "learn_more": "Aprende más sobre las acciones."
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Scripts",
-                    "description": "Crear y editar scripts"
+                    "description": "Crear y editar scripts",
+                    "picker": {
+                        "header": "Editor de scripts",
+                        "introduction": "El editor de scripts te permite crear y editar scripts. Por favor, sigue el siguiente enlace para leer las instrucciones para asegurarte de que has configurado Home Assistant correctamente.",
+                        "learn_more": "Más información sobre los scripts",
+                        "no_scripts": "No hemos encontrado ningún script editable",
+                        "add_script": "Añadir script"
+                    },
+                    "editor": {
+                        "header": "Script: {name}",
+                        "default_name": "Nuevo script",
+                        "load_error_not_editable": "Solo los scripts dentro de scripts.yaml son editables.",
+                        "delete_confirm": "¿Seguro que quieres eliminar este script?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Verdadero",
                         "false": "Falso",
                         "set_config_parameter": "Establecer parámetro de configuración"
+                    },
+                    "learn_more": "Obtenga más información sobre Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW Log",
+                        "introduction": "Ver el registro. 0 es el mínimo (carga el registro completo) y 1000 es el máximo. Load mostrará un registro estático y tail se actualizará automáticamente con el último número especificado de líneas del registro."
                     }
                 },
                 "users": {
                     "caption": "Usuarios",
                     "description": "Administrar usuarios",
                     "picker": {
-                        "title": "Usuarios"
+                        "title": "Usuarios",
+                        "system_generated": "Generado por el sistema"
                     },
                     "editor": {
                         "rename_user": "Renombrar usuario",
@@ -678,7 +705,18 @@
                         "activate_user": "Activar usuario",
                         "deactivate_user": "Desactivar usuario",
                         "delete_user": "Borrar usuario",
-                        "caption": "Ver usuario"
+                        "caption": "Ver usuario",
+                        "id": "ID",
+                        "owner": "Propietario",
+                        "group": "Grupo",
+                        "active": "Activo",
+                        "system_generated": "Generado por el sistema",
+                        "system_generated_users_not_removable": "No se pueden eliminar los usuarios generados por el sistema.",
+                        "unnamed_user": "Usuario sin nombre",
+                        "enter_new_name": "Introduzca un nuevo nombre",
+                        "user_rename_failed": "El cambio de nombre del usuario falló:",
+                        "group_update_failed": "La actualización del grupo falló:",
+                        "confirm_user_deletion": "¿Seguro que quieres eliminar {name}?"
                     },
                     "add_user": {
                         "caption": "Añadir usuario",
@@ -692,7 +730,156 @@
                     "caption": "Nube Home Assistant",
                     "description_login": "Has iniciado sesión como {email}",
                     "description_not_login": "No has iniciado sesión",
-                    "description_features": "Control fuera de casa, integración con Alexa y Google Assistant."
+                    "description_features": "Control fuera de casa, integración con Alexa y Google Assistant.",
+                    "login": {
+                        "title": "Inicio de sesión en la nube",
+                        "introduction": "Home Assistant Cloud te proporciona una conexión remota segura a tu instancia mientras estás fuera de casa. También te permite conectarte con servicios solo en la nube: Amazon Alexa y Google Assistant.",
+                        "introduction2": "Este servicio está a cargo de nuestro socio.",
+                        "introduction2a": ", una compañía fundada por los fundadores de Home Assistant y Hass.io.",
+                        "introduction3": "Home Assistant Cloud es un servicio de suscripción con una prueba gratuita de un mes. No se necesita información de pago.",
+                        "learn_more_link": "Más información sobre Home Assistant Cloud",
+                        "dismiss": "Descartar",
+                        "sign_in": "Inicia sesión",
+                        "email": "Correo electrónico",
+                        "email_error_msg": "Correo electrónico no válido",
+                        "password": "Contraseña",
+                        "password_error_msg": "Las contraseñas tienen al menos 8 caracteres.",
+                        "forgot_password": "¿Se te olvidó tu contraseña?",
+                        "start_trial": "Comienza tu prueba gratuita de 1 mes",
+                        "trial_info": "No se necesita información de pago",
+                        "alert_password_change_required": "Debes cambiar tu contraseña antes de iniciar sesión.",
+                        "alert_email_confirm_necessary": "Debes confirmar tu correo electrónico antes de iniciar sesión."
+                    },
+                    "forgot_password": {
+                        "title": "Se te olvidó tu contraseña",
+                        "subtitle": "Olvidaste tu contraseña",
+                        "instructions": "Introduce tu dirección de correo electrónico y te enviaremos un enlace para restablecer tu contraseña.",
+                        "email": "Correo electrónico",
+                        "email_error_msg": "Correo electrónico no válido",
+                        "send_reset_email": "Enviar correo electrónico de restablecimiento",
+                        "check_your_email": "Consulta tu correo electrónico para obtener instrucciones sobre cómo restablecer tu contraseña."
+                    },
+                    "register": {
+                        "title": "Registrar cuenta",
+                        "headline": "Comienza tu prueba gratuita",
+                        "information": "Crea una cuenta para comenzar tu prueba gratuita de un mes con Home Assistant Cloud. No se necesita información de pago.",
+                        "information2": "La versión de prueba te dará acceso a todos los beneficios de Home Assistant Cloud, incluyendo:",
+                        "feature_remote_control": "Control de Home Assistant fuera de casa",
+                        "feature_google_home": "Integración con el Asistente de Google",
+                        "feature_amazon_alexa": "Integración con Amazon Alexa",
+                        "feature_webhook_apps": "Fácil integración con aplicaciones basadas en webhook como OwnTracks",
+                        "information3": "Este servicio está a cargo de nuestro socio.",
+                        "information3a": ", una compañía fundada por los fundadores de Home Assistant y Hass.io.",
+                        "information4": "Al registrar una cuenta, aceptas los siguientes términos y condiciones.",
+                        "link_terms_conditions": "Términos y condiciones",
+                        "link_privacy_policy": "Política de privacidad",
+                        "create_account": "Crear una cuenta",
+                        "email_address": "Dirección de correo electrónico",
+                        "email_error_msg": "Correo electrónico no válido",
+                        "password": "Contraseña",
+                        "password_error_msg": "Las contraseñas tienen al menos 8 caracteres.",
+                        "start_trial": "Iniciar prueba",
+                        "resend_confirm_email": "Reenviar correo electrónico de confirmación",
+                        "account_created": "¡Cuenta creada! Consulta tu correo electrónico para obtener instrucciones sobre cómo activar tu cuenta."
+                    },
+                    "account": {
+                        "thank_you_note": "Gracias por ser parte de Home Assistant Cloud. Gracias a personas como tú, podemos hacer una gran experiencia de automatización del hogar para todos. ¡Gracias!",
+                        "nabu_casa_account": "Cuenta Nabu Casa",
+                        "connection_status": "Estado de conexión a la nube",
+                        "manage_account": "Administrar cuenta",
+                        "sign_out": "Cerrar sesión",
+                        "integrations": "Integraciones",
+                        "integrations_introduction": "Las integraciones para Home Assistant Cloud te permiten conectarte con servicios en la nube sin tener que exponer tu instancia de Home Assistant públicamente en Internet.",
+                        "integrations_introduction2": "Consulte el sitio web para",
+                        "integrations_link_all_features": "todas las funciones disponibles",
+                        "connected": "Conectado",
+                        "not_connected": "No conectado",
+                        "fetching_subscription": "Obteniendo suscripción ...",
+                        "remote": {
+                            "title": "Control remoto",
+                            "access_is_being_prepared": "Se está preparando el acceso remoto. Te avisaremos cuando esté listo.",
+                            "info": "Home Assistant Cloud proporciona una conexión remota segura a tu instancia mientras estás fuera de casa.",
+                            "instance_is_available": "Tu instancia está disponible en",
+                            "instance_will_be_available": "Tu instancia estará disponible en",
+                            "link_learn_how_it_works": "Aprende cómo funciona",
+                            "certificate_info": "Información del certificado"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Con la integración de Alexa para Home Assistant Cloud podrás controlar todos tus dispositivos Home Assistant a través de cualquier dispositivo habilitado para Alexa.",
+                            "enable_ha_skill": "Habilita la skill Home Assistant para Alexa",
+                            "config_documentation": "Documentación de configuración",
+                            "enable_state_reporting": "Habilitar informes de estado",
+                            "info_state_reporting": "Si habilitas los informes de estado, Home Assistant enviará todos los cambios de estado de las entidades expuestas a Amazon. Esto te permite ver siempre los estados más recientes en la aplicación Alexa y usar los cambios de estado para crear rutinas.",
+                            "sync_entities": "Sincronizar entidades",
+                            "manage_entities": "Administrar entidades",
+                            "sync_entities_error": "Error al sincronizar entidades:",
+                            "state_reporting_error": "No se puede {enable_disable} informar el estado.",
+                            "enable": "activar",
+                            "disable": "deshabilitar"
+                        },
+                        "google": {
+                            "title": "Asistente de Google",
+                            "info": "Con la integración del Asistente de Google para Home Assistant Cloud, podrás controlar todos tus dispositivos Home Assistant a través de cualquier dispositivo habilitado para Asistente de Google.",
+                            "enable_ha_skill": "Activa la skill de Home Assistant para el Asistente de Google",
+                            "config_documentation": "Documentación de configuración",
+                            "enable_state_reporting": "Habilitar informes de estado",
+                            "info_state_reporting": "Si habilitas los informes de estado, Home Assistant enviará todos los cambios de estado de las entidades expuestas a Google. Esto te permite ver siempre los últimos estados en la aplicación de Google.",
+                            "security_devices": "Dispositivos de seguridad",
+                            "enter_pin_info": "Por favor, introduce un pin para interactuar con los dispositivos de seguridad. Los dispositivos de seguridad son puertas, puertas de garaje y cerraduras. Se te pedirá que digas\/introduzcas este pin cuando interactúes con dichos dispositivos a través del Asistente de Google.",
+                            "devices_pin": "Pin de dispositivos de seguridad",
+                            "enter_pin_hint": "Introduce un PIN para utilizar dispositivos de seguridad",
+                            "sync_entities": "Sincronizar entidades con Google",
+                            "manage_entities": "Administrar entidades",
+                            "enter_pin_error": "No se puede almacenar el pin:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Cualquier cosa que esté configurada para ser activada por un webhook puede recibir una URL de acceso público para permitirte enviar datos a Home Assistant desde cualquier lugar, sin exponer tu instancia a Internet.",
+                            "no_hooks_yet": "Parece que todavía no tienes webhooks. Comienza configurando un",
+                            "no_hooks_yet_link_integration": "integración basada en webhook",
+                            "no_hooks_yet2": " o mediante la creación de un ",
+                            "no_hooks_yet_link_automation": "automatización de webhook",
+                            "link_learn_more": "Obtenga más información sobre la creación de automatizaciones basadas en webhook.",
+                            "loading": "Cargando ...",
+                            "manage": "Administrar",
+                            "disable_hook_error_msg": "No se pudo deshabilitar el webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "La edición de las entidades expuestas a través de esta IU está deshabilitada porque ha configurado filtros de entidad en configuration.yaml.",
+                        "exposed_entities": "Entidades expuestas",
+                        "not_exposed_entities": "Entidades no expuestas",
+                        "expose": "Exponer a Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Información del certificado",
+                        "certificate_expiration_date": "Fecha de vencimiento del certificado",
+                        "will_be_auto_renewed": "Se renovará automáticamente",
+                        "fingerprint": "Huella digital del certificado:",
+                        "close": "Cerrar"
+                    },
+                    "google": {
+                        "title": "Asistente de Google",
+                        "expose": "Exponer al Asistente de Google",
+                        "disable_2FA": "Deshabilitar la autenticación de dos factores",
+                        "banner": "La edición de las entidades expuestas a través de esta IU está deshabilitada porque ha configurado filtros de entidad en configuration.yaml.",
+                        "exposed_entities": "Entidades expuestas",
+                        "not_exposed_entities": "Entidades no expuestas",
+                        "sync_to_google": "Sincronización de cambios a Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook para {name}",
+                        "available_at": "El webhook está disponible en la siguiente url:",
+                        "managed_by_integration": "Este webhook se administra mediante una integración y no se puede deshabilitar.",
+                        "info_disable_webhook": "Si ya no quieres usar este webhook, puedes",
+                        "link_disable_webhook": "deshabilitarlo",
+                        "view_documentation": "Ver documentación",
+                        "close": "Cerrar",
+                        "confirm_disable": "¿Seguro que quieres deshabilitar este webhook?",
+                        "copied_to_clipboard": "Copiado al portapapeles"
+                    }
                 },
                 "integrations": {
                     "caption": "Integraciones",
@@ -720,7 +907,10 @@
                             "description": "Este paso requiere que visites una web externa para ser completado.",
                             "open_site": "Abrir sitio web"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Todavía no se pueden configurar todas las integraciones a través de la interfaz de usuario.",
+                    "note_about_website_reference": "Más están disponibles en el",
+                    "home_assistant_website": "Sitio web de Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Domótica Zigbee - Añadir dispositivos",
                         "spinner": "Buscando dispositivos ZHA Zigbee....",
-                        "discovery_text": "Los dispositivos detectados aparecerán aquí. Ponlos en modo emparejamiento siguiendo sus instrucciones."
+                        "discovery_text": "Los dispositivos detectados aparecerán aquí. Ponlos en modo emparejamiento siguiendo sus instrucciones.",
+                        "search_again": "Buscar de nuevo"
+                    },
+                    "common": {
+                        "add_devices": "Añadir dispositivos",
+                        "clusters": "Clusters",
+                        "devices": "Dispositivos",
+                        "manufacturer_code_override": "Anulación del código del fabricante",
+                        "value": "Valor"
+                    },
+                    "network_management": {
+                        "header": "Gestión de la red",
+                        "introduction": "Comandos que afectan a toda la red."
+                    },
+                    "node_management": {
+                        "header": "Gestión de dispositivos",
+                        "introduction": "Ejecuta comandos ZHA que afecten a un único dispositivo. Elije un dispositivo para ver una lista de comandos disponibles.",
+                        "hint_battery_devices": "Nota: Los dispositivos dormidos (alimentados por batería) deben estar despiertos al ejecutar comandos contra ellos. En general, puedes activar un dispositivo dormido activándolo.",
+                        "hint_wakeup": "Algunos dispositivos, como los sensores Xiaomi, tienen un botón de activación que puedes presionar a intervalos de ~ 5 segundos para mantener los dispositivos despiertos mientras interactúas con ellos.",
+                        "help_node_dropdown": "Selecciona un dispositivo para ver las opciones por dispositivo."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Selecciona un clúster para ver atributos y comandos."
+                    },
+                    "cluster_attributes": {
+                        "header": "Atributos del clúster",
+                        "introduction": "Ver y editar los atributos del clúster.",
+                        "attributes_of_cluster": "Atributos del clúster seleccionado",
+                        "get_zigbee_attribute": "Obtener atributo de Zigbee",
+                        "set_zigbee_attribute": "Establecer atributo de Zigbee",
+                        "help_attribute_dropdown": "Selecciona un atributo para ver o establecer su valor.",
+                        "help_get_zigbee_attribute": "Obtenga el valor del atributo seleccionado.",
+                        "help_set_zigbee_attribute": "Establece el valor del atributo para el clúster especificado en la entidad especificada."
+                    },
+                    "cluster_commands": {
+                        "header": "Comandos de clúster",
+                        "introduction": "Ver y emitir comandos de clúster.",
+                        "commands_of_cluster": "Comandos del clúster seleccionado",
+                        "issue_zigbee_command": "Emitir comando Zigbee",
+                        "help_command_dropdown": "Selecciona un comando con el que interactuar."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant mantiene un registro de cada entidad que ha visto. Cada una de estas entidades tendrá una identificación asignada que se reservará sólo para esta entidad.",
                         "introduction2": "Utiliza el registro de entidades para anular el nombre, cambiar el ID de la entidad o eliminar la entrada de Home Assistant. Nota: la eliminación de la entrada del registro de entidades no eliminará la entidad. Para ello, sigue el siguiente enlace y elimínalo de la página de integraciones.",
                         "integrations_page": "Integraciones",
-                        "show_disabled": "Mostrar entidades deshabilitadas"
+                        "show_disabled": "Mostrar entidades deshabilitadas",
+                        "headers": {
+                            "name": "Nombre",
+                            "entity_id": "ID de entidad",
+                            "integration": "Integración",
+                            "enabled": "Habilitado"
+                        }
                     },
                     "editor": {
                         "unavailable": "Esta entidad no está disponible actualmente.",
@@ -791,8 +1026,24 @@
                         "name": "Nombre",
                         "device_tracker_intro": "Seleccione los dispositivos que pertenecen a esta persona.",
                         "device_tracker_picked": "Rastrear dispositivo",
-                        "device_tracker_pick": "Seleccionar dispositivo para rastrear"
-                    }
+                        "device_tracker_pick": "Seleccionar dispositivo para rastrear",
+                        "new_person": "Nueva persona",
+                        "name_error_msg": "Se requiere el nombre",
+                        "linked_user": "Usuario vinculado",
+                        "no_device_tracker_available_intro": "Cuando tengas dispositivos que indiquen la presencia de una persona, podrás asignarlos a una persona aquí. Puedes agregar tu primer dispositivo agregando una integración de detección de presencia desde la página de integraciones.",
+                        "link_presence_detection_integrations": "Integraciones de detección de presencia",
+                        "link_integrations_page": "Página de integraciones",
+                        "delete": "Eliminar",
+                        "create": "Crear",
+                        "update": "Actualizar"
+                    },
+                    "introduction": "Aquí puedes definir a cada persona de interés en Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Nota: las personas configuradas a través de configuration.yaml no se pueden editar a través de la interfaz de usuario.",
+                    "no_persons_created_yet": "Parece que aún no has creado ninguna persona.",
+                    "create_person": "Crear persona",
+                    "add_person": "Añadir persona",
+                    "confirm_delete": "¿Estás seguro de que deseas eliminar a esta persona?",
+                    "confirm_delete2": "Todos los dispositivos que pertenecen a esta persona quedarán sin asignar."
                 },
                 "server_control": {
                     "caption": "Control del servidor",
@@ -838,6 +1089,11 @@
                             "caption": "Cuando algo se activa...."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Tienes cambios sin guardar. ¿Estás seguro de que quieres salir?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Vibrar",
                     "description": "Habilitar o deshabilitar la vibración en este dispositivo al controlar dispositivos."
+                },
+                "advanced_mode": {
+                    "title": "Modo avanzado",
+                    "description": "Home Assistant oculta las funciones y opciones avanzadas de forma predeterminada. Puedes hacer que estas funciones sean accesibles marcando esta opción. Esta es una configuración específica del usuario y no afecta a otros usuarios que usan Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Añadir tarjeta",
                         "edit": "Editar",
                         "delete": "Eliminar",
-                        "move": "Mover"
+                        "move": "Mover",
+                        "show_visual_editor": "Mostrar editor visual",
+                        "show_code_editor": "Mostrar editor de código"
                     },
                     "migrate": {
                         "header": "Configuración incompatible",
@@ -1121,7 +1383,8 @@
                             "optional": "Opcional"
                         },
                         "entities": {
-                            "show_header_toggle": "¿Mostrar interruptor en encabezado?"
+                            "show_header_toggle": "¿Mostrar interruptor en encabezado?",
+                            "name": "Entidades"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Verde",
                                 "red": "Rojo",
                                 "yellow": "Amarillo"
-                            }
+                            },
+                            "name": "Indicador"
                         },
                         "glance": {
-                            "columns": "Columnas"
+                            "columns": "Columnas",
+                            "name": "Vistazo"
                         },
                         "generic": {
                             "aspect_ratio": "Relación de aspecto",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Fuentes de geolocalización",
                             "dark_mode": "¿Modo oscuro?",
                             "default_zoom": "Zoom predeterminado",
-                            "source": "Fuente"
+                            "source": "Fuente",
+                            "name": "Mapa"
                         },
                         "markdown": {
-                            "content": "Contenido"
+                            "content": "Contenido",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Detalle del gráfico",
-                            "graph_type": "Tipo de gráfico"
+                            "graph_type": "Tipo de gráfico",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Panel de alarma",
+                            "available_states": "Estados disponibles"
+                        },
+                        "conditional": {
+                            "name": "Condicional"
+                        },
+                        "entity-button": {
+                            "name": "Botón de entidad"
+                        },
+                        "entity-filter": {
+                            "name": "Filtro de entidad"
+                        },
+                        "history-graph": {
+                            "name": "Gráfico histórico"
+                        },
+                        "horizontal-stack": {
+                            "name": "Pila horizontal"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Luz"
+                        },
+                        "media-control": {
+                            "name": "Control de medios"
+                        },
+                        "picture": {
+                            "name": "Imagen"
+                        },
+                        "picture-elements": {
+                            "name": "Elementos de imagen"
+                        },
+                        "picture-entity": {
+                            "name": "Entidad de imagen"
+                        },
+                        "picture-glance": {
+                            "name": "Vistazo de imagen"
+                        },
+                        "plant-status": {
+                            "name": "Estado de la planta"
+                        },
+                        "shopping-list": {
+                            "name": "Lista de la compra"
+                        },
+                        "thermostat": {
+                            "name": "Termostato"
+                        },
+                        "vertical-stack": {
+                            "name": "Pila vertical"
+                        },
+                        "weather-forecast": {
+                            "name": "Pronóstico del tiempo"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "Apagado {entity}.",
             "service_called": "Servicio {service} llamado.",
             "service_call_failed": "Error al llamar al servicio {service}.",
-            "connection_lost": "Conexión perdida. Reconectando..."
+            "connection_lost": "Conexión perdida. Reconectando...",
+            "triggered": "Activado {nombre}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "Nombre dado por el usuario",
                     "area_picker_label": "Área",
                     "update_name_button": "Cambiar nombre"
-                }
+                },
+                "buttons": {
+                    "add": "Añadir dispositivos",
+                    "remove": "Eliminar dispositivos",
+                    "reconfigure": "Reconfigurar dispositivo"
+                },
+                "quirk": "Peculiaridad",
+                "last_seen": "Ultima vez visto",
+                "power_source": "Fuente de alimentación",
+                "unknown": "Desconocido"
             }
         },
         "auth_store": {
diff --git a/translations/et.json b/translations/et.json
index 27ff74e446..82ec109136 100644
--- a/translations/et.json
+++ b/translations/et.json
@@ -504,7 +504,12 @@
                                     "leave": "Väljumine"
                                 },
                                 "device": {
-                                    "label": "Seade"
+                                    "label": "Seade",
+                                    "extra_fields": {
+                                        "above": "Üle",
+                                        "below": "Alla",
+                                        "for": "Kestus"
+                                    }
                                 }
                             },
                             "learn_more": "Lisateave päästikute kohta"
@@ -553,7 +558,18 @@
                                     "zone": "Ala"
                                 },
                                 "device": {
-                                    "label": "Seade"
+                                    "label": "Seade",
+                                    "extra_fields": {
+                                        "above": "Üle",
+                                        "below": "Alla",
+                                        "for": "Kestus"
+                                    }
+                                },
+                                "and": {
+                                    "label": "ja"
+                                },
+                                "or": {
+                                    "label": "või"
                                 }
                             },
                             "learn_more": "Lisateave tingimuste kohta"
@@ -591,17 +607,33 @@
                                 },
                                 "device_id": {
                                     "label": "Seade"
+                                },
+                                "scene": {
+                                    "label": "Aktiveeri stseen"
                                 }
                             },
                             "learn_more": "Lisateave tegevuste kohta"
                         },
                         "load_error_not_editable": "Ainult automations.yaml failis asuvad automatiseeringud on muudetavad.",
-                        "load_error_unknown": "Viga automatiseeringu laadimisel ({err_no})."
+                        "load_error_unknown": "Viga automatiseeringu laadimisel ({err_no}).",
+                        "description": {
+                            "label": "Kirjeldus",
+                            "placeholder": "Valikuline kirjeldus"
+                        }
                     }
                 },
                 "script": {
                     "caption": "Skript",
-                    "description": "Loo ja muuda skripte"
+                    "description": "Loo ja muuda skripte",
+                    "picker": {
+                        "header": "Skriptiredaktor",
+                        "add_script": "Lisa skript"
+                    },
+                    "editor": {
+                        "header": "Skript: {name}",
+                        "default_name": "Uus skript",
+                        "delete_confirm": "Oled kindel, et soovid selle skripti kustutada?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -649,13 +681,18 @@
                         "true": "Tõene",
                         "false": "Väär",
                         "set_config_parameter": "Seadista parameeter Config"
+                    },
+                    "learn_more": "Lisateave Z-Wave'i kohta",
+                    "ozw_log": {
+                        "header": "OZW logi"
                     }
                 },
                 "users": {
                     "caption": "Kasutajad",
                     "description": "Halda kasutajaid",
                     "picker": {
-                        "title": "Kasutajad"
+                        "title": "Kasutajad",
+                        "system_generated": "Süsteemi genereeritud"
                     },
                     "editor": {
                         "rename_user": "Nimeta kasutaja ümber",
@@ -663,7 +700,16 @@
                         "activate_user": "Aktiveeri kasutaja",
                         "deactivate_user": "Deaktiveeri kasutaja",
                         "delete_user": "Kustuta kasutaja",
-                        "caption": "Vaata kasutajat"
+                        "caption": "Vaata kasutajat",
+                        "id": "ID",
+                        "owner": "Omanik",
+                        "group": "Grupp",
+                        "active": "Aktiivne",
+                        "system_generated": "Süsteemi genereeritud",
+                        "unnamed_user": "Nimetu kasutaja",
+                        "enter_new_name": "Sisesta uus nimi",
+                        "user_rename_failed": "Kasutaja ümbernimetamine nurjus:",
+                        "confirm_user_deletion": "Oled kindel, et soovid kustutada {name}?"
                     },
                     "add_user": {
                         "caption": "Lisa kasutaja",
@@ -677,7 +723,85 @@
                     "caption": "Home Assistant pilv",
                     "description_login": "Sisse logitud kui {email}",
                     "description_not_login": "Pole sisse logitud",
-                    "description_features": "Juhi kodust eemal viibides, seo Alexa ja Google Assistant'iga."
+                    "description_features": "Juhi kodust eemal viibides, seo Alexa ja Google Assistant'iga.",
+                    "forgot_password": {
+                        "email": "E-post",
+                        "email_error_msg": "Vigane meiliaadress"
+                    },
+                    "register": {
+                        "headline": "Alusta tasuta prooviperioodi",
+                        "link_terms_conditions": "Tingimused",
+                        "link_privacy_policy": "Privaatsuspoliitika",
+                        "create_account": "Loo konto",
+                        "email_address": "E-posti aadress",
+                        "email_error_msg": "Vigane meiliaadress",
+                        "password": "Salasõna",
+                        "start_trial": "Alusta proovimist"
+                    },
+                    "account": {
+                        "nabu_casa_account": "Nabu Casa konto",
+                        "connection_status": "Pilveühenduse olek",
+                        "manage_account": "Halda kontot",
+                        "sign_out": "Logi välja",
+                        "integrations": "Sidumised",
+                        "remote": {
+                            "certificate_info": "Sertifikaadi teave"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "sync_entities": "Sünkrooni olemid",
+                            "manage_entities": "Halda olemeid",
+                            "sync_entities_error": "Olemite sünkroonimine ebaõnnestus:",
+                            "enable": "luba",
+                            "disable": "keela"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "security_devices": "Turvaseadmed",
+                            "devices_pin": "Turvaseadmete PIN",
+                            "enter_pin_hint": "Turvaseadmete kasutamiseks sisesta PIN",
+                            "sync_entities": "Sünkrooni olemid Google'iga",
+                            "manage_entities": "Halda olemeid"
+                        },
+                        "webhooks": {
+                            "title": "Veebihaagid",
+                            "no_hooks_yet_link_integration": "veebihaagipõhine sidumine",
+                            "no_hooks_yet_link_automation": "veebihaagi automatiseering",
+                            "loading": "Laadin ...",
+                            "manage": "Halda",
+                            "disable_hook_error_msg": "Veebihaagi keelamine ebaõnnestus:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "exposed_entities": "Avaldatud olemid",
+                        "not_exposed_entities": "Mitteavaldatud olemid",
+                        "expose": "Avalda Alexa'le"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Sertifikaadi teave",
+                        "certificate_expiration_date": "Sertifikaadi aegumiskuupäev",
+                        "will_be_auto_renewed": "Uuendatakse automaatselt",
+                        "fingerprint": "Sertifikaadi sõrmejälg:",
+                        "close": "Sulge"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Avalda Google Assistant'ile",
+                        "disable_2FA": "Keela kaheastmeline autentimine",
+                        "exposed_entities": "Avaldatud olemid",
+                        "not_exposed_entities": "Mitteavaldatud olemid",
+                        "sync_to_google": "Sünkroonin muutusi Google'iga"
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Veebihaak {name} jaoks",
+                        "info_disable_webhook": "Kui sa ei soovi enam seda veebihaaki kasutada, võid",
+                        "link_disable_webhook": "keela see",
+                        "view_documentation": "Vaata dokumentatsiooni",
+                        "close": "Sulge",
+                        "confirm_disable": "Oled kindel, et soovid selle veebihaagi keelata?",
+                        "copied_to_clipboard": "Kopeeritud lõikepuhvrisse"
+                    }
                 },
                 "integrations": {
                     "caption": "Sidumised",
@@ -705,7 +829,8 @@
                             "description": "Selle etapi lõpetamine nõuab välise veebisaidi külastamist.",
                             "open_site": "Ava veebisait"
                         }
-                    }
+                    },
+                    "home_assistant_website": "Home Assistant veebisait"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -723,7 +848,28 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - seadmete lisamine",
                         "spinner": "ZHA Zigbee seadmete otsimine ...",
-                        "discovery_text": "Leitud seadmed kuvatakse siin. Järgige seadme(te) juhiseid ja pange seade sidumisrežiimile."
+                        "discovery_text": "Leitud seadmed kuvatakse siin. Järgige seadme(te) juhiseid ja pange seade sidumisrežiimile.",
+                        "search_again": "Otsi uuesti"
+                    },
+                    "common": {
+                        "add_devices": "Lisa seadmeid",
+                        "clusters": "Klastrid",
+                        "devices": "Seadmed",
+                        "value": "Väärtus"
+                    },
+                    "network_management": {
+                        "header": "Võrgu haldamine",
+                        "introduction": "Kogu võrku mõjutavad käsud"
+                    },
+                    "node_management": {
+                        "header": "Seadme haldus"
+                    },
+                    "cluster_commands": {
+                        "header": "Klastri käsud",
+                        "introduction": "Vaata ja väljasta klastrikäske.",
+                        "commands_of_cluster": "Valitud klastri käsud",
+                        "issue_zigbee_command": "Väljasta Zigbee käsk",
+                        "help_command_dropdown": "Vali käsk, millega suhelda."
                     }
                 },
                 "area_registry": {
@@ -754,7 +900,14 @@
                         "unavailable": "(pole saadaval)",
                         "introduction": "Home Assistant peab registrit iga olemi kohta, mida ta kunagi näinud on ja mida saab üheselt tuvastada. Kõigile nendele olemitele antakse olemi ID, mis reserveeritakse ainult sellele olemile.",
                         "introduction2": "Kasuta olemite registrit olemi nime või ID muutmiseks või olemi eemaldamiseks Home Assistant'ist. Pane tähele, et olemi registrikirje eemaldamine ei eemalda olemit. Selleks järgi allolevat linki ja eemalda olem sidumiste lehelt.",
-                        "integrations_page": "Sidumiste leht"
+                        "integrations_page": "Sidumiste leht",
+                        "show_disabled": "Kuva keelatud olemid",
+                        "headers": {
+                            "name": "Nimi",
+                            "entity_id": "Olemi ID",
+                            "integration": "Sidumine",
+                            "enabled": "Lubatud"
+                        }
                     },
                     "editor": {
                         "unavailable": "See olem pole praegu saadaval.",
@@ -763,7 +916,8 @@
                         "update": "UUENDA",
                         "enabled_label": "Luba olem",
                         "enabled_cause": "Keelatud {cause}.",
-                        "enabled_description": "Keelatud olemeid ei lisata Home Assistant'i."
+                        "enabled_description": "Keelatud olemeid ei lisata Home Assistant'i.",
+                        "confirm_delete": "Oled kindel, et soovid selle kirje kustutada?"
                     }
                 },
                 "person": {
@@ -773,8 +927,20 @@
                         "name": "Nimi",
                         "device_tracker_intro": "Vali seadmed, mis kuuluvad sellele isikule.",
                         "device_tracker_picked": "Jälgi seadet",
-                        "device_tracker_pick": "Vali jälgitav seade"
-                    }
+                        "device_tracker_pick": "Vali jälgitav seade",
+                        "new_person": "Uus isik",
+                        "name_error_msg": "Nimi on kohustuslik",
+                        "linked_user": "Lingitud kasutaja",
+                        "link_integrations_page": "Sidumiste leht",
+                        "delete": "Kustuta",
+                        "create": "Loo",
+                        "update": "Uuenda"
+                    },
+                    "no_persons_created_yet": "Paistab, et sa pole veel ühtegi isikut loonud.",
+                    "create_person": "Loo isik",
+                    "add_person": "Lisa isik",
+                    "confirm_delete": "Oled kindel, et soovid selle isiku kustutada?",
+                    "confirm_delete2": "Kõik sellele isikule kuuluvad seadmed jäävad peremehetuks."
                 },
                 "server_control": {
                     "caption": "Serveri juhtimine",
@@ -808,7 +974,20 @@
                 },
                 "devices": {
                     "caption": "Seadmed",
-                    "description": "Halda ühendatud seadmeid"
+                    "description": "Halda ühendatud seadmeid",
+                    "automation": {
+                        "conditions": {
+                            "caption": "Tee midagi ainult siis, kui ..."
+                        },
+                        "actions": {
+                            "caption": "Kui midagi käivitatakse ..."
+                        }
+                    }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Sul on salvestamata muudatusi. Oled kindel, et soovid lahkuda?"
+                    }
                 }
             },
             "profile": {
@@ -884,6 +1063,9 @@
                 "force_narrow": {
                     "header": "Peida alati külgriba",
                     "description": "See peidab vaikimisi külgriba, sarnaselt mobiilikogemusega."
+                },
+                "vibrate": {
+                    "header": "Vibreeri"
                 }
             },
             "page-authorize": {
@@ -1043,7 +1225,9 @@
                         "add": "Lisa kaart",
                         "edit": "Muuda",
                         "delete": "Kustuta",
-                        "move": "Liiguta"
+                        "move": "Liiguta",
+                        "show_visual_editor": "Kuva visuaalne redaktor",
+                        "show_code_editor": "Kuva koodiredaktor"
                     },
                     "migrate": {
                         "header": "Konfiguratsioon ei ühildu",
@@ -1077,6 +1261,101 @@
                     "edit_lovelace": {
                         "header": "Lovelace kasutajaliidese pealkiri",
                         "explanation": "Seda pealkirja näidatakse kõikide Lovelace'i vaadete kohal."
+                    },
+                    "card": {
+                        "config": {
+                            "required": "Nõutav",
+                            "optional": "Valikuline"
+                        },
+                        "gauge": {
+                            "severity": {
+                                "define": "Kas määrata raskusaste?",
+                                "green": "Roheline",
+                                "red": "Punane",
+                                "yellow": "Kollane"
+                            },
+                            "name": "Mõõtur"
+                        },
+                        "glance": {
+                            "columns": "Veerud",
+                            "name": "Pilk"
+                        },
+                        "generic": {
+                            "aspect_ratio": "Proportsioonid",
+                            "camera_image": "Kaamera olem",
+                            "entities": "Olemid",
+                            "entity": "Olem",
+                            "icon": "Ikoon",
+                            "icon_height": "Ikooni kõrgus",
+                            "maximum": "Maksimaalne",
+                            "minimum": "Minimaalne",
+                            "name": "Nimi",
+                            "refresh_interval": "Värskendamise intervall",
+                            "show_icon": "Kas näidata ikooni?",
+                            "show_name": "Kas näidata nime?",
+                            "show_state": "Kas näidata olekut?",
+                            "title": "Pealkiri",
+                            "theme": "Teema",
+                            "unit": "Ühik",
+                            "url": "Url"
+                        },
+                        "map": {
+                            "dark_mode": "Tume režiim?",
+                            "source": "Allikas",
+                            "name": "Kaart"
+                        },
+                        "markdown": {
+                            "content": "Sisu",
+                            "name": "Markdown"
+                        },
+                        "conditional": {
+                            "name": "Tingimuslik"
+                        },
+                        "entities": {
+                            "name": "Olemid"
+                        },
+                        "entity-button": {
+                            "name": "Olemi nupp"
+                        },
+                        "entity-filter": {
+                            "name": "Olemi filter"
+                        },
+                        "history-graph": {
+                            "name": "Ajalooline graafik"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horisontaalne pinu"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Valgus"
+                        },
+                        "media-control": {
+                            "name": "Meedia juhtimine"
+                        },
+                        "picture": {
+                            "name": "Pilt"
+                        },
+                        "plant-status": {
+                            "name": "Taime olek"
+                        },
+                        "sensor": {
+                            "name": "Andur"
+                        },
+                        "shopping-list": {
+                            "name": "Ostunimekiri"
+                        },
+                        "thermostat": {
+                            "name": "Termostaat"
+                        },
+                        "vertical-stack": {
+                            "name": "Vertikaalne pinu"
+                        },
+                        "weather-forecast": {
+                            "name": "Ilmateade"
+                        }
                     }
                 },
                 "menu": {
@@ -1357,7 +1636,14 @@
                     "device_name_placeholder": "Kasutaja antud nimi",
                     "area_picker_label": "Ala",
                     "update_name_button": "Värskenda nime"
-                }
+                },
+                "buttons": {
+                    "add": "Lisa seadmeid",
+                    "remove": "Eemalda seade"
+                },
+                "last_seen": "Viimati nähtud",
+                "power_source": "Toiteallikas",
+                "unknown": "Teadmata"
             }
         },
         "auth_store": {
diff --git a/translations/fa.json b/translations/fa.json
index 03129481e2..94e2cabe08 100644
--- a/translations/fa.json
+++ b/translations/fa.json
@@ -557,7 +557,12 @@
                         "activate_user": "فعال کردن کاربر",
                         "deactivate_user": "غیر فعال کردن کاربر",
                         "delete_user": "حذف کاربر",
-                        "caption": "مشاهده کاربر"
+                        "caption": "مشاهده کاربر",
+                        "unnamed_user": "کاربر نامشخص",
+                        "enter_new_name": "نام جدید را وارد کنید",
+                        "user_rename_failed": "تغییر نام کاربری انجام نشد:",
+                        "group_update_failed": "بروزرسانی گروه انجام نشد:",
+                        "confirm_user_deletion": "آیا مطمئنید می خواهید {name} را حذف کنید ؟"
                     },
                     "add_user": {
                         "caption": "افزودن کاربر",
@@ -616,7 +621,20 @@
                     "add_device_page": {
                         "header": " صفحه اصلی اتوماسیون مدیریت شبکه Zigbee",
                         "spinner": "جستجو برای دستگاه های ZHY Zigbee ...",
-                        "discovery_text": "دستگاه های کشف شده در اینجا نشان داده می شوند. دستورالعمل های دستگاه (های) خود را دنبال کنید و دستگاه (های) را در حالت جفت قرار دهید."
+                        "discovery_text": "دستگاه های کشف شده در اینجا نشان داده می شوند. دستورالعمل های دستگاه (های) خود را دنبال کنید و دستگاه (های) را در حالت جفت قرار دهید.",
+                        "search_again": "جستجوی مجدد"
+                    },
+                    "common": {
+                        "add_devices": "افزودن دستگاهها",
+                        "devices": "دستگاه ها",
+                        "value": "مقدار"
+                    },
+                    "network_management": {
+                        "header": "مدیریت شبکه",
+                        "introduction": "دستوراتی که روی کل شبکه تأثیر می گذارند"
+                    },
+                    "node_management": {
+                        "header": "مدیریت دستگاه"
                     }
                 },
                 "area_registry": {
@@ -730,6 +748,10 @@
                 "vibrate": {
                     "header": "ویبره",
                     "description": "هنگام کنترل دستگاه، حالت ویبره فعال یا غیرفعال می‌شود."
+                },
+                "advanced_mode": {
+                    "title": "حالت پیشرفته",
+                    "description": "سیستم به طور پیش فرض ویژگی ها و گزینه های پیشرفته را پنهان می کند. می توانید با تغییر این گزینه ، این ویژگی ها را در فعال کنید. این  تنظیم خاص یک کاربر بوده و استفاده سایر کاربران این سیستم را تحت تأثیر قرار نمی دهد."
                 }
             },
             "page-authorize": {
@@ -899,14 +921,34 @@
                             "geo_location_sources": "منابع موقعیت یابی",
                             "dark_mode": "حالت تاریک",
                             "default_zoom": "بزرگنمایی پیش فرض",
-                            "source": "منبع"
+                            "source": "منبع",
+                            "name": "نقشه"
                         },
                         "markdown": {
                             "content": "محتوا"
                         },
                         "sensor": {
                             "graph_detail": "نمودار جزئیات",
-                            "graph_type": "نوع نمودار"
+                            "graph_type": "نوع نمودار",
+                            "name": "سنسور"
+                        },
+                        "light": {
+                            "name": "چراغ"
+                        },
+                        "media-control": {
+                            "name": "کنترل رسانه"
+                        },
+                        "picture": {
+                            "name": "تصویر"
+                        },
+                        "shopping-list": {
+                            "name": "لیست خرید"
+                        },
+                        "thermostat": {
+                            "name": "ترموستات"
+                        },
+                        "weather-forecast": {
+                            "name": "پیش بینی آب و هوا"
                         }
                     }
                 },
diff --git a/translations/fi.json b/translations/fi.json
index 20ca2ddd8c..fee29f3d9f 100644
--- a/translations/fi.json
+++ b/translations/fi.json
@@ -498,7 +498,12 @@
                                     "leave": "Poistu"
                                 },
                                 "device": {
-                                    "label": "Laite"
+                                    "label": "Laite",
+                                    "extra_fields": {
+                                        "above": "Yli",
+                                        "below": "Alle",
+                                        "for": "Kesto"
+                                    }
                                 }
                             },
                             "learn_more": "Lisätietoja triggereistä"
@@ -547,7 +552,12 @@
                                     "zone": "Alue"
                                 },
                                 "device": {
-                                    "label": "Laite"
+                                    "label": "Laite",
+                                    "extra_fields": {
+                                        "above": "Yli",
+                                        "below": "Alle",
+                                        "for": "Kesto"
+                                    }
                                 },
                                 "and": {
                                     "label": "Ja"
@@ -602,7 +612,11 @@
                 },
                 "script": {
                     "caption": "Skripti",
-                    "description": "Luo ja muokkaa skriptejä"
+                    "description": "Luo ja muokkaa skriptejä",
+                    "editor": {
+                        "header": "Skripti: {name}",
+                        "default_name": "Uusi skripti"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -650,13 +664,19 @@
                         "true": "Tosi",
                         "false": "Eätosi",
                         "set_config_parameter": "Aseta asetusparametri"
+                    },
+                    "learn_more": "Z-wave lisätietoja",
+                    "ozw_log": {
+                        "header": "OZW-loki",
+                        "introduction": "Tarkastele lokia. 0 on pienin (lataa koko lokin) ja 1000 on maksimi. Lataus näyttää staattisen lokin ja päivittää automaattisesti viimeisen määritetyn määrän rivejä lokiin."
                     }
                 },
                 "users": {
                     "caption": "Käyttäjät",
                     "description": "Käyttäjien hallinta",
                     "picker": {
-                        "title": "Käyttäjät"
+                        "title": "Käyttäjät",
+                        "system_generated": "Järjestelmän luoma"
                     },
                     "editor": {
                         "rename_user": "Nimeä käyttäjä uudelleen",
@@ -664,7 +684,18 @@
                         "activate_user": "Aktivoi käyttäjä",
                         "deactivate_user": "Passivoi käyttäjätunnus",
                         "delete_user": "Poista käyttäjä",
-                        "caption": "Näytä käyttäjä"
+                        "caption": "Näytä käyttäjä",
+                        "id": "ID",
+                        "owner": "Omistaja",
+                        "group": "Ryhmä",
+                        "active": "Aktiivinen",
+                        "system_generated": "Järjestelmän luoma",
+                        "system_generated_users_not_removable": "Järjestelmän luomia käyttäjiä ei voi poistaa.",
+                        "unnamed_user": "Nimeämätön käyttäjä",
+                        "enter_new_name": "Kirjoita uusi nimi",
+                        "user_rename_failed": "Käyttäjän uudelleen nimeäminen epäonnistui:",
+                        "group_update_failed": "Ryhmän päivitys epäonnistui:",
+                        "confirm_user_deletion": "Haluatko varmasti poistaa {name}?"
                     },
                     "add_user": {
                         "caption": "Lisää käyttäjä",
@@ -678,7 +709,107 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Kirjautunut sisään {email}",
                     "description_not_login": "Et ole kirjautunut",
-                    "description_features": "Ohjaus possa kotoa, käytä Alexaa ja Google Assistentia"
+                    "description_features": "Ohjaus possa kotoa, käytä Alexaa ja Google Assistentia",
+                    "login": {
+                        "introduction2": "Tätä palvelua ylläpitää kumppanimme",
+                        "introduction2a": ", Home Assistantin ja Hass.io: n perustajien perustama yritys.",
+                        "dismiss": "Hylkää",
+                        "sign_in": "Kirjaudu sisään",
+                        "email": "Sähköposti",
+                        "email_error_msg": "Virheellinen sähköpostiosoite",
+                        "password": "Salasana",
+                        "password_error_msg": "Salasanan pitää olla vähintään 8 merkkiä pitkä",
+                        "forgot_password": "Unohtuiko salasana?",
+                        "start_trial": "Aloita ilmainen 1 kuukauden kokeilu",
+                        "trial_info": "Maksutietoja ei tarvita",
+                        "alert_password_change_required": "Sinun on vaihdettava salasanasi ennen sisäänkirjautumista.",
+                        "alert_email_confirm_necessary": "Sinun on vahvistettava sähköpostiosoitteesi ennen sisäänkirjautumista."
+                    },
+                    "forgot_password": {
+                        "title": "Unohtuiko salasana?",
+                        "subtitle": "Unohtuiko salasana?",
+                        "instructions": "Kirjoita sähköpostiosoitteesi ja lähetämme sinulle linkin salasanasi palauttamiseksi.",
+                        "email": "Sähköposti",
+                        "email_error_msg": "Virheellinen sähköpostiosoite",
+                        "send_reset_email": "Lähetä palautusviesti",
+                        "check_your_email": "Tarkista sähköpostistasi ohjeet salasanan vaihtamiseen."
+                    },
+                    "register": {
+                        "title": "Rekisteröi tili",
+                        "headline": "Aloita ilmainen kokeilu",
+                        "information2": "Kokeilu antaa sinulle pääsyn kaikkiin Home Assistant Cloud -etuihin, mukaan lukien:",
+                        "feature_remote_control": "Hallitse Home Assistantia kodin ulkopuolelta",
+                        "information3": "Tätä palvelua ylläpitää kumppanimme",
+                        "information4": "Rekisteröimällä tilin hyväksyt seuraavat ehdot.",
+                        "link_terms_conditions": "Ehdot",
+                        "link_privacy_policy": "Tietosuojakäytäntö",
+                        "create_account": "Luo tili",
+                        "email_address": "Sähköpostiosoite",
+                        "email_error_msg": "Virheellinen sähköpostiosoite",
+                        "password": "Salasana",
+                        "password_error_msg": "Salasanan pitää olla vähintään 8 merkkiä pitkä",
+                        "start_trial": "Aloita kokeilujakso",
+                        "resend_confirm_email": "Lähetä varmistusviesti uudelleen",
+                        "account_created": "Tili luotu! Tarkista sähköpostistasi ohjeet tilisi aktivoimiseksi."
+                    },
+                    "account": {
+                        "nabu_casa_account": "Nabu Casa -tili",
+                        "sign_out": "Kirjaudu ulos",
+                        "integrations": "Integraatiot",
+                        "integrations_introduction": "Home Assistant Cloud integraatiot mahdollistavat pilvipalveluihin käytön ilman että Home Assistant asennus on näkyvissä julkisesti Internetissä.",
+                        "connected": "Yhdistetty",
+                        "not_connected": "Ei yhteyttä",
+                        "remote": {
+                            "title": "Etähallinta",
+                            "access_is_being_prepared": "Etäkäyttöä valmistellaan. Ilmoitamme sinulle, kun se on valmis.",
+                            "info": "Home Assistant Cloud tarjoaa turvallisen etäyhteyden ollessasi poissa kotoa.",
+                            "instance_is_available": "Asennuksesi on saatavilla osoitteessa",
+                            "instance_will_be_available": "Asennuksesi tulee saataville",
+                            "link_learn_how_it_works": "Lisätietoja toiminnasta",
+                            "certificate_info": "Sertifikaatin tiedot"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Alexa Integraatio Home Assistant Cloudille mahdollistaa Home Assistant laitteiden ohjaamisen miltä tahansa Alexa laitteelta.",
+                            "sync_entities": "Synkronoi kohteet",
+                            "manage_entities": "Hallitse kohteita",
+                            "state_reporting_error": "Tilaa {enable_disable} .ei ole saatavilla",
+                            "enable": "Ota käyttöön",
+                            "disable": "Poista käytöstä"
+                        },
+                        "google": {
+                            "info": "Google Assistant Integraatio Home Assistant Cloudille mahdollistaa Home Assistant laitteiden ohjaamisen miltä tahansa Google Assistant laitteelta.",
+                            "security_devices": "Turvalaitteet",
+                            "enter_pin_hint": "Anna PIN-koodi turvalaitteiden käyttämistä varten",
+                            "enter_pin_error": "PIN-koodin tallentaminen ei onnistu:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "manage": "Hallitse"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Sertifikaatin tiedot",
+                        "certificate_expiration_date": "Sertifikaatin vanhenemispäivä",
+                        "will_be_auto_renewed": "Uusitaan automaattisesti",
+                        "fingerprint": "Varmenteen sormenjälki:",
+                        "close": "Sulje"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "disable_2FA": "Poista kaksivaiheinen tunnistautuminen",
+                        "sync_to_google": "Synkronoidaan muutokset Googleen."
+                    },
+                    "dialog_cloudhook": {
+                        "link_disable_webhook": "Poista käytöstä",
+                        "view_documentation": "Näytä dokumentaatio",
+                        "close": "Sulje",
+                        "confirm_disable": "Haluatko varmasti poistaa tämän webhookin käytöstä?",
+                        "copied_to_clipboard": "Kopioitiin leikepöydälle"
+                    }
                 },
                 "integrations": {
                     "caption": "Integraatiot",
@@ -706,7 +837,10 @@
                             "description": "Tämä vaihe edellyttää, että vierailet ulkopuolisella verkkosivustolla.",
                             "open_site": "Avaa verkkosivusto"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Kaikkia integraatioita ei voi vielä määrittää käyttöliittymän kautta.",
+                    "note_about_website_reference": "Lisää saatavilla",
+                    "home_assistant_website": "Home Assistant – sivusto"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -719,12 +853,45 @@
                     "device_card": {
                         "device_name_placeholder": "Käyttäjän antama nimeä",
                         "area_picker_label": "Alue",
-                        "update_name_button": "Päivitä nimeä"
+                        "update_name_button": "Päivitä nimi"
                     },
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Lisää laitteita",
                         "spinner": "Etsitään ZHA Zigbee laitteita...",
-                        "discovery_text": "Löydetyt laitteet näkyvät täällä. Noudata laitteen (laitteiden) ohjeita ja aseta laite pariliitostilaan."
+                        "discovery_text": "Löydetyt laitteet näkyvät täällä. Noudata laitteen (laitteiden) ohjeita ja aseta laite pariliitostilaan.",
+                        "search_again": "Etsi uudestaan"
+                    },
+                    "common": {
+                        "add_devices": "Lisää laitteita",
+                        "clusters": "Klusterit",
+                        "devices": "Laitteet",
+                        "value": "Arvo"
+                    },
+                    "network_management": {
+                        "header": "Verkon hallinta"
+                    },
+                    "node_management": {
+                        "header": "Laitehallinta",
+                        "help_node_dropdown": "Valitse laite tarkastellaksesi laitekohtaisia vaihtoehtoja."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Valitse klusteri tarkastellaksesi määritteitä ja komentoja."
+                    },
+                    "cluster_attributes": {
+                        "header": "Klusterin määritteet",
+                        "introduction": "Tarkastele ja muokkaa klusterimääritteitä.",
+                        "attributes_of_cluster": "Valitun klusterin määritteet",
+                        "get_zigbee_attribute": "Hae Zigbee-ominaisuus",
+                        "set_zigbee_attribute": "Aseta Zigbee-ominaisuus",
+                        "help_attribute_dropdown": "Valitse määrite, jonka arvoa haluat tarkastella tai määrittää.",
+                        "help_get_zigbee_attribute": "Hae valitun määritteen arvo."
+                    },
+                    "cluster_commands": {
+                        "header": "Klusterikomennot",
+                        "introduction": "Tarkastele ja anna klusterikomentoja.",
+                        "commands_of_cluster": "Valitun klusterin komennot",
+                        "issue_zigbee_command": "Anna Zigbee käsky",
+                        "help_command_dropdown": "Valitse lähettettävä komento"
                     }
                 },
                 "area_registry": {
@@ -743,7 +910,7 @@
                     "editor": {
                         "default_name": "Uusi alue",
                         "delete": "POISTA",
-                        "update": "PÄIVITÄ",
+                        "update": "Päivitä",
                         "create": "LUO"
                     }
                 },
@@ -755,13 +922,21 @@
                         "unavailable": "(ei saatavilla)",
                         "introduction": "Home Assistant pitää rekisteriä jokaisesta havaitetusta olemuksesta, joka voidaan yksilöidä. Kullekin näille yksiköille määritetään olemus-ID, varattu juuri tälle yksikölle.",
                         "introduction2": "Yksikkörekisterin avulla voit ohittaa nimeä, muuttaa yksikön tunnusta tai poistaa merkinnän Home Assistantista. Huomaa, että rekisterimerkinnän poistaminen ei poista yksikköä sinäänsä. Sitä voit seuraamalla alla olevaa linkkiä ja poistamalla sitä integrointisivulta.",
-                        "integrations_page": "Integraatiot"
+                        "integrations_page": "Integraatiot",
+                        "headers": {
+                            "name": "Nimi",
+                            "entity_id": "Kohde ID",
+                            "integration": "Integraatio",
+                            "enabled": "Käytössä"
+                        }
                     },
                     "editor": {
                         "unavailable": "Parhaillaan olemus ei ole käytettävissä.",
                         "default_name": "Uusi alue",
                         "delete": "POISTA",
-                        "update": "PÄIVITYS"
+                        "update": "Päivitä",
+                        "enabled_cause": "Poistettu käytöstä {cause} .",
+                        "confirm_delete": "Haluatko varmasti poistaa tämän kohteen?"
                     }
                 },
                 "person": {
@@ -771,8 +946,21 @@
                         "name": "Nimi",
                         "device_tracker_intro": "Valitse tälle henkilölle kuuluvat laitteet.",
                         "device_tracker_picked": "Seuraa laitetta",
-                        "device_tracker_pick": "Valitse seurattava laite"
-                    }
+                        "device_tracker_pick": "Valitse seurattava laite",
+                        "new_person": "Uusi Henkilö",
+                        "name_error_msg": "Nimi on pakollinen",
+                        "linked_user": "Yhdsitetty käyttäjä",
+                        "no_device_tracker_available_intro": "Kun sinulla on laitteita, jotka ilmaisevat henkilön läsnäolon, voit kohdistaa ne henkilöön täällä. Voit lisätä ensimmäisen laitteen lisäämällä läsnäolon tunnistusintegraation sivulta.",
+                        "link_presence_detection_integrations": "Läsnäolon tunnistusintegraatiot",
+                        "link_integrations_page": "Integraatiot",
+                        "delete": "Poista",
+                        "create": "Luo",
+                        "update": "Päivitä"
+                    },
+                    "no_persons_created_yet": "Näyttää siltä, ettet ole vielä luonut yhtään henkilöä.",
+                    "create_person": "Luo henkilö",
+                    "add_person": "Lisää henkilö",
+                    "confirm_delete": "Haluatko varmasti poistaa tämän henkilön?"
                 },
                 "server_control": {
                     "caption": "Palvelimen hallinta",
@@ -805,6 +993,11 @@
                 "devices": {
                     "caption": "Laitteet",
                     "description": "Hallitse yhdistettyjä laitteita"
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Sinulla on tallentamattomia muutoksia. Haluatko varmasti poistua?"
+                    }
                 }
             },
             "profile": {
@@ -879,6 +1072,10 @@
                 "logout": "Kirjaudu ulos",
                 "force_narrow": {
                     "header": "Piilota sivupalkki aina"
+                },
+                "advanced_mode": {
+                    "title": "Lisäasetukset",
+                    "description": "Home Assistant piilottaa lisäominaisuudet ja -asetukset oletuksena. Voit aktivoida nämä ominaisuudet painamalla tästä kytkimestä. Tämä on käyttäjäkohtainen asetus, eikä se vaikuta muihin Home Assistantia käyttäviin käyttäjiin."
                 }
             },
             "page-authorize": {
@@ -1038,7 +1235,9 @@
                         "add": "Lisää kortti",
                         "edit": "Muokkaa",
                         "delete": "Poista",
-                        "move": "Siirrä"
+                        "move": "Siirrä",
+                        "show_visual_editor": "Näytä visuaalinen editori",
+                        "show_code_editor": "Näytä koodieditori"
                     },
                     "migrate": {
                         "header": "Epäkelvot asetukset",
@@ -1068,6 +1267,105 @@
                         "save": "Tallenna",
                         "unsaved_changes": "Tallentamattomat muutokset",
                         "saved": "Tallennettu"
+                    },
+                    "card": {
+                        "alarm_panel": {
+                            "available_states": "Käytettävissä olevat tilat"
+                        },
+                        "config": {
+                            "required": "Vaadittu",
+                            "optional": "Valinnainen"
+                        },
+                        "gauge": {
+                            "severity": {
+                                "define": "Määritä vakavuus?",
+                                "green": "Vihreä",
+                                "red": "Punainen",
+                                "yellow": "Keltainen"
+                            },
+                            "name": "Mittari"
+                        },
+                        "generic": {
+                            "camera_image": "Kamerakohde",
+                            "entity": "Kohde",
+                            "hold_action": "Pitkä painallus toiminto",
+                            "image": "Kuvan polku",
+                            "maximum": "Enimmäismäärä",
+                            "minimum": "Vähimmäismäärä",
+                            "name": "Nimi",
+                            "tap_action": "Napautus toiminto"
+                        },
+                        "sensor": {
+                            "graph_detail": "Kaavion tiedot",
+                            "name": "Sensori"
+                        },
+                        "alarm-panel": {
+                            "name": "Hälytyspaneeli",
+                            "available_states": "Käytettävissä olevat tilat"
+                        },
+                        "conditional": {
+                            "name": "Ehdollinen"
+                        },
+                        "entities": {
+                            "name": "Kohteet"
+                        },
+                        "entity-button": {
+                            "name": "Kohdenappi"
+                        },
+                        "entity-filter": {
+                            "name": "Kohteen suodatus"
+                        },
+                        "glance": {
+                            "name": "Pikavilkaisu"
+                        },
+                        "history-graph": {
+                            "name": "Historiakuvaaja"
+                        },
+                        "horizontal-stack": {
+                            "name": "Vaakapino"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Valo"
+                        },
+                        "map": {
+                            "name": "Kartta"
+                        },
+                        "markdown": {
+                            "name": "Merkintä"
+                        },
+                        "media-control": {
+                            "name": "Mediaohjaus"
+                        },
+                        "picture": {
+                            "name": "Kuva"
+                        },
+                        "picture-elements": {
+                            "name": "Kuvaelementit"
+                        },
+                        "picture-entity": {
+                            "name": "Kuvakohde"
+                        },
+                        "picture-glance": {
+                            "name": "Kuva pikavilkaisu"
+                        },
+                        "plant-status": {
+                            "name": "Kasvin tila"
+                        },
+                        "shopping-list": {
+                            "name": "Ostoslista"
+                        },
+                        "thermostat": {
+                            "name": "Termostaatti"
+                        },
+                        "vertical-stack": {
+                            "name": "Pystypino"
+                        },
+                        "weather-forecast": {
+                            "name": "Sääennuste"
+                        }
                     }
                 },
                 "menu": {
@@ -1137,7 +1435,8 @@
         "common": {
             "loading": "Ladataan",
             "cancel": "Peruuta",
-            "save": "Tallenna"
+            "save": "Tallenna",
+            "successfully_saved": "Tallennus onnistui"
         },
         "duration": {
             "day": "{count} {count, plural,\n  one {päivä}\n  other {päivää}\n}",
@@ -1258,6 +1557,14 @@
                 "target_temperature": "Tavoitelämpötila",
                 "operation": "Toiminto",
                 "away_mode": "Poissa kotoa"
+            },
+            "timer": {
+                "actions": {
+                    "start": "Aloita",
+                    "pause": "tauko",
+                    "cancel": "Peruuta",
+                    "finish": "Valmis"
+                }
             }
         },
         "components": {
@@ -1311,6 +1618,22 @@
                 "updater": {
                     "title": "Päivitysohjeet"
                 }
+            },
+            "config_entry_system_options": {
+                "title": "Järjestelmäasetukset"
+            },
+            "zha_device_info": {
+                "services": {
+                    "remove": "Poista laite Zigbee-verkosta."
+                },
+                "buttons": {
+                    "add": "Lisää laitteita",
+                    "remove": "Poista laite",
+                    "reconfigure": "Määritä laite uudelleen"
+                },
+                "last_seen": "Viimeksi nähty",
+                "power_source": "Virtalähde",
+                "unknown": "Tuntematon"
             }
         },
         "auth_store": {
diff --git a/translations/fr.json b/translations/fr.json
index 8eddd506c0..f17c871807 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -377,14 +377,14 @@
                         "server_control": {
                             "validation": {
                                 "heading": "Validation de la configuration",
-                                "introduction": "Validez votre configuration si vous l'avez récemment modifiée et que vous voulez vous assurer que tout est valide",
-                                "check_config": "Vérifiez la configuration",
+                                "introduction": "Valider votre configuration si vous avez récemment apporté quelques modifications à votre configuration et que vous souhaitez vous assurer qu'elle est valide",
+                                "check_config": "Vérifier la configuration",
                                 "valid": "Configuration valide !",
                                 "invalid": "Configuration invalide"
                             },
                             "reloading": {
                                 "heading": "Rechargement de la configuration",
-                                "introduction": "Certaines parties de Home Assistant peuvent être rechargées sans nécessiter un redémarrage. Appuyer sur \"recharger\" déchargera leur configuration actuelle et chargera la nouvelle.",
+                                "introduction": "Certaines parties de Home Assistant peuvent être rechargées sans nécessiter de redémarrage. Le fait de cliquer sur recharger déchargera leur configuration actuelle et chargera la nouvelle.",
                                 "core": "Recharger le noyau",
                                 "group": "Recharger les groupes",
                                 "automation": "Recharger les automatisations",
@@ -392,7 +392,7 @@
                             },
                             "server_management": {
                                 "heading": "Gestion du serveur",
-                                "introduction": "Contrôlez votre serveur Home Assistant... depuis Home Assistant.",
+                                "introduction": "Contrôler votre serveur Home Assistant… à partir de Home Assistant.",
                                 "restart": "Redémarrer",
                                 "stop": "Arrêter"
                             }
@@ -558,7 +558,12 @@
                                     "zone": "Zone"
                                 },
                                 "device": {
-                                    "label": "Appareil"
+                                    "label": "Appareil",
+                                    "extra_fields": {
+                                        "above": "Au dessus de",
+                                        "below": "Au dessous de",
+                                        "for": "Durée"
+                                    }
                                 },
                                 "and": {
                                     "label": "Et"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Appareil"
+                                },
+                                "scene": {
+                                    "label": "Activer scène"
                                 }
                             },
                             "learn_more": "En savoir plus sur les actions"
@@ -616,11 +624,24 @@
                 },
                 "script": {
                     "caption": "Script",
-                    "description": "Créer et modifier des scripts."
+                    "description": "Créer et modifier des scripts.",
+                    "picker": {
+                        "header": "Éditeur de script",
+                        "introduction": "L'éditeur de script vous permet de créer et d'éditer des scripts. Suivez le lien ci-dessous pour lire les instructions afin de vous assurer que vous avez correctement configuré Home Assistant.",
+                        "learn_more": "En savoir plus sur les scripts",
+                        "no_scripts": "Nous n'avons pas trouvé de scripts modifiables",
+                        "add_script": "Ajouter un script"
+                    },
+                    "editor": {
+                        "header": "Script: {name}",
+                        "default_name": "Nouveau script",
+                        "load_error_not_editable": "Seuls les scripts dans scripts.yaml sont modifiables.",
+                        "delete_confirm": "Êtes-vous sûr de vouloir supprimer ce script?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Gérez votre réseau Z-Wave.",
+                    "description": "Gérer votre réseau Z-Wave",
                     "network_management": {
                         "header": "Gestion de réseau Z-Wave",
                         "introduction": "Exécutez les commandes qui affectent le réseau Z-Wave. Vous ne saurez pas si la plupart des commandes ont réussi, mais vous pouvez consulter le journal OZW pour essayer de le savoir."
@@ -664,13 +685,19 @@
                         "true": "Vrai",
                         "false": "Faux",
                         "set_config_parameter": "Définir le paramètre de configuration"
+                    },
+                    "learn_more": "En savoir plus sur Z-Wave",
+                    "ozw_log": {
+                        "header": "Journal OZW",
+                        "introduction": "Afficher le journal. 0 est le minimum (charges journal entier) et 1000 est le maximum. La charge affichera un journal statique et la queue sera mise à jour automatique avec le dernier nombre spécifié de lignes du journal."
                     }
                 },
                 "users": {
                     "caption": "Utilisateurs",
                     "description": "Gérer les utilisateurs",
                     "picker": {
-                        "title": "Utilisateurs"
+                        "title": "Utilisateurs",
+                        "system_generated": "Généré par le système"
                     },
                     "editor": {
                         "rename_user": "Renommer l'utilisateur",
@@ -678,7 +705,18 @@
                         "activate_user": "Activer l'utilisateur",
                         "deactivate_user": "Désactiver l'utilisateur",
                         "delete_user": "Supprimer l'utilisateur",
-                        "caption": "Voir l'utilisateur"
+                        "caption": "Voir l'utilisateur",
+                        "id": "ID",
+                        "owner": "Propriétaire",
+                        "group": "Groupe",
+                        "active": "Actif",
+                        "system_generated": "Généré par le système",
+                        "system_generated_users_not_removable": "Impossible de supprimer les utilisateurs générés par le système.",
+                        "unnamed_user": "Utilisateur sans nom",
+                        "enter_new_name": "Entrer un nouveau nom",
+                        "user_rename_failed": "Le changement de nom d'utilisateur a échoué:",
+                        "group_update_failed": "La mise à jour du groupe a échoué:",
+                        "confirm_user_deletion": "Êtes-vous sûr de vouloir supprimer {name} ?"
                     },
                     "add_user": {
                         "caption": "Ajouter un utilisateur",
@@ -692,7 +730,156 @@
                     "caption": "Cloud Home Assistant",
                     "description_login": "Connecté en tant que {email}",
                     "description_not_login": "Non connecté",
-                    "description_features": "Contrôle hors de la maison, intégration avec Alexa et Google Assistant."
+                    "description_features": "Contrôle hors de la maison, intégration avec Alexa et Google Assistant.",
+                    "login": {
+                        "title": "Connexion Cloud",
+                        "introduction": "Home Assistant Cloud vous fournit une connexion sécurisée à distance à votre instance lorsque vous êtes loin de chez vous. Il vous permet également de vous connecter à des services cloud uniquement : Amazon Alexa et Google Assistant.",
+                        "introduction2": "Ce service est géré par notre partenaire",
+                        "introduction2a": ", entreprise fondée par les fondateurs de Home Assistant et de Hass.io.",
+                        "introduction3": "Home Assistant Cloud est un service d'abonnement avec un essai gratuit d'un mois. Aucune information de paiement nécessaire.",
+                        "learn_more_link": "En savoir plus sur Home Assistant Cloud",
+                        "dismiss": "Rejeter",
+                        "sign_in": "Connexion",
+                        "email": "Email",
+                        "email_error_msg": "E-mail non valide",
+                        "password": "Mot de passe",
+                        "password_error_msg": "Les mots de passe doivent comporter au moins 8 caractères.",
+                        "forgot_password": "Mot de passe oublié?",
+                        "start_trial": "Commencez votre essai gratuit de 1 mois",
+                        "trial_info": "Aucune information de paiement nécessaire",
+                        "alert_password_change_required": "Vous devez changer votre mot de passe avant de vous connecter.",
+                        "alert_email_confirm_necessary": "Vous devez confirmer votre email avant de vous connecter."
+                    },
+                    "forgot_password": {
+                        "title": "Mot de passe oublié",
+                        "subtitle": "Mot de passe oublié",
+                        "instructions": "Entrez votre adresse email et nous vous enverrons un lien pour réinitialiser votre mot de passe.",
+                        "email": "Email",
+                        "email_error_msg": "Email invalide",
+                        "send_reset_email": "Envoyer un email de réinitialisation",
+                        "check_your_email": "Consultez votre courrier électronique pour savoir comment réinitialiser votre mot de passe."
+                    },
+                    "register": {
+                        "title": "Créer un compte",
+                        "headline": "Commencer votre essai gratuit",
+                        "information": "Créer un compte afin de commencer un mois d'essai gratuit avec Home Assistant Cloud. Aucune information de paiement nécessaires.",
+                        "information2": "L'essai vous donnera accès à tous les avantages de Home Assistant Cloud, y compris:",
+                        "feature_remote_control": "Contrôle de Home Assistant en dehors de la maison",
+                        "feature_google_home": "Intégration avec Google Assistant",
+                        "feature_amazon_alexa": "Intégration avec Amazon Alexa",
+                        "feature_webhook_apps": "Intégration facile avec des applications Webhook telles que OwnTracks",
+                        "information3": "Ce service est géré par notre partenaire",
+                        "information3a": ", entreprise fondée par les fondateurs de Home Assistant et de Hass.io.",
+                        "information4": "En créant un compte, vous acceptez les termes et conditions suivantes.",
+                        "link_terms_conditions": "Termes et conditions",
+                        "link_privacy_policy": "Politique de confidentialité",
+                        "create_account": "Créer un compte",
+                        "email_address": "Adresse e-mail",
+                        "email_error_msg": "Email invalide",
+                        "password": "Mot de passe",
+                        "password_error_msg": "Les mots de passe doivent comporter au moins 8 caractères.",
+                        "start_trial": "Démarrer la version d'évaluation",
+                        "resend_confirm_email": "Renvoyer l'email de confirmation",
+                        "account_created": "Compte créé! Consultez votre courrier électronique pour savoir comment activer votre compte."
+                    },
+                    "account": {
+                        "thank_you_note": "Merci de faire partie de Home Assistant Cloud. C’est grâce à des personnes comme vous que nous sommes en mesure de proposer une expérience domotique exceptionnelle à tout le monde. Je vous remercie!",
+                        "nabu_casa_account": "Compte Nabu Casa",
+                        "connection_status": "Etat de la connexion cloud",
+                        "manage_account": "Gérer le compte",
+                        "sign_out": "Déconnexion",
+                        "integrations": "Intégrations",
+                        "integrations_introduction": "Les intégrations pour Home Assistant Cloud vous permettent de vous connecter à des services dans le cloud sans avoir à exposer publiquement votre instance de Home Assistant sur Internet.",
+                        "integrations_introduction2": "Consultez le site Web pour",
+                        "integrations_link_all_features": "Toutes les fonctionnalités disponibles",
+                        "connected": "Connecté",
+                        "not_connected": "Pas connecté",
+                        "fetching_subscription": "Obtenir un abonnement...",
+                        "remote": {
+                            "title": "Télécommande",
+                            "access_is_being_prepared": "L'accès à distance est en préparation. Nous vous informerons quand ce sera prêt.",
+                            "info": "Home Assistant Cloud fournit une connexion à distance sécurisée à votre instance lorsque vous n'êtes pas chez vous.",
+                            "instance_is_available": "Votre instance est disponible à l'adresse",
+                            "instance_will_be_available": "Votre instance sera disponible sur",
+                            "link_learn_how_it_works": "Apprenez comment ça marche",
+                            "certificate_info": "Informations sur le certificat"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Grâce à l'intégration d'Alexa pour Home Assistant Cloud, vous pourrez contrôler tous vos appareils Home Assistant via n'importe quel appareil compatible Alexa.",
+                            "enable_ha_skill": "Activer le skill Home Assistant pour Alexa",
+                            "config_documentation": "Documentation de configuration",
+                            "enable_state_reporting": "Activer le rapport d'état",
+                            "info_state_reporting": "Si vous activez le rapport d'état, Home Assistant envoie tous les changements d'état des entités exposées à Amazon. Cela vous permet de toujours voir les derniers états de l'application Alexa et d'utiliser les changements d'état pour créer des routines.",
+                            "sync_entities": "Synchroniser les entités",
+                            "manage_entities": "Gérer les entités",
+                            "sync_entities_error": "Échec de la synchronisation des entités:",
+                            "state_reporting_error": "Impossible d'activer {enable_disable} le rapport d'état .",
+                            "enable": "activer",
+                            "disable": "désactiver"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "Grâce à l'intégration de Google Assistant pour Home Assistant Cloud, vous pourrez contrôler tous vos appareils Home Assistant via n'importe quel appareil compatible avec Google Assistant.",
+                            "enable_ha_skill": "Activer le skill Home Assistant pour Google Assistant",
+                            "config_documentation": "Documentation de configuration",
+                            "enable_state_reporting": "Activer le rapport d'état",
+                            "info_state_reporting": "Si vous activez le rapport d'état, Home Assistant envoie tous les changements d'état des entités exposées à Google. Cela vous permet de toujours voir les derniers états de l'application Google.",
+                            "security_devices": "Dispositif de securité",
+                            "enter_pin_info": "Veuillez entrer un code PIN pour interagir avec les dispositifs de sécurité. Les dispositifs de sécurité sont les portes, les portes de garage et les serrures. Il vous sera demandé de dire\/entrer ce code PIN lorsque vous interagissez avec de tels appareils via Google Assistant.",
+                            "devices_pin": "PIN pour les appareils sécurisés",
+                            "enter_pin_hint": "Entrer un code PIN pour utiliser les dispositifs de sécurité",
+                            "sync_entities": "Synchroniser les entités vers Google",
+                            "manage_entities": "Gérer les entités",
+                            "enter_pin_error": "Impossible de stocker le PIN:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Tout ce qui est configuré pour être déclenché par un Webhook peut recevoir une URL accessible publiquement pour vous permettre de renvoyer des données à Home Assistant de n’importe où, sans exposer votre instance à Internet.",
+                            "no_hooks_yet": "On dirait que vous n'avez pas encore de webhooks. Commencez par configurer un",
+                            "no_hooks_yet_link_integration": "intégration basée sur Webhook",
+                            "no_hooks_yet2": "ou en créant un",
+                            "no_hooks_yet_link_automation": "automatisation webhook",
+                            "link_learn_more": "En savoir plus sur la création d'automatisations basées sur Webhook.",
+                            "loading": "Chargement ...",
+                            "manage": "Gérer",
+                            "disable_hook_error_msg": "Impossible de désactiver webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "La modification des entités exposées via cette interface utilisateur est désactivée, car vous avez configuré les filtres d'entité dans configuration.yaml.",
+                        "exposed_entities": "Entités exposées",
+                        "not_exposed_entities": "Entités non exposées",
+                        "expose": "Exposer à Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Informations sur le certificat",
+                        "certificate_expiration_date": "Date d'expiration du certificat",
+                        "will_be_auto_renewed": "Sera automatiquement renouvelé",
+                        "fingerprint": "Empreinte du certificat:",
+                        "close": "Fermer"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Exposer à Google Assistant",
+                        "disable_2FA": "Désactiver l'authentification à deux facteurs",
+                        "banner": "La modification des entités exposées via cette interface utilisateur est désactivée, car vous avez configuré les filtres d'entité dans configuration.yaml.",
+                        "exposed_entities": "Entités exposées",
+                        "not_exposed_entities": "Entités non exposées",
+                        "sync_to_google": "Synchroniser les modifications sur Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook pour {name}",
+                        "available_at": "Le Webhook est disponible à l'URL suivante:",
+                        "managed_by_integration": "Ce Webhook est géré par une intégration et ne peut pas être désactivé.",
+                        "info_disable_webhook": "Si vous ne souhaitez plus utiliser ce Webhook, vous pouvez",
+                        "link_disable_webhook": "le désactiver",
+                        "view_documentation": "Voir la documentation",
+                        "close": "Fermer",
+                        "confirm_disable": "Êtes-vous sûr de vouloir désactiver ce Webhook?",
+                        "copied_to_clipboard": "Copié dans le presse-papiers"
+                    }
                 },
                 "integrations": {
                     "caption": "Intégrations",
@@ -706,7 +893,7 @@
                         "no_devices": "Cette intégration n'a pas d'appareils.",
                         "no_device": "Entités sans appareils",
                         "delete_confirm": "Êtes-vous sûr de vouloir supprimer cette intégration?",
-                        "restart_confirm": "Redémarrez Home Assistant pour terminer la suppression de cette intégration",
+                        "restart_confirm": "Redémarrer Home Assistant pour terminer la suppression de cette intégration",
                         "manuf": "par {manufacturer}",
                         "via": "Connecté via",
                         "firmware": "Firmware: {version}",
@@ -720,7 +907,10 @@
                             "description": "Cette étape nécessite la visite d'un site Web externe pour être complétée.",
                             "open_site": "Ouvrir le site"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Toutes les intégrations ne peuvent pas encore être configurées via l'interface utilisateur.",
+                    "note_about_website_reference": "Plus sont disponibles sur le",
+                    "home_assistant_website": "Site Web de Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Ajout de périphériques",
                         "spinner": "Recherche de périphériques ZHA Zigbee ...",
-                        "discovery_text": "Les appareils découverts apparaîtront ici. Suivez les instructions pour votre \/ vos appareil(s) et placez-le(s) en mode de couplage."
+                        "discovery_text": "Les appareils découverts apparaîtront ici. Suivez les instructions pour votre \/ vos appareil(s) et placez-le(s) en mode de couplage.",
+                        "search_again": "Rechercher à nouveau"
+                    },
+                    "common": {
+                        "add_devices": "Ajouter des appareils",
+                        "clusters": "Clusters",
+                        "devices": "Appareils",
+                        "manufacturer_code_override": "Code de remplacement du fabricant",
+                        "value": "Valeur"
+                    },
+                    "network_management": {
+                        "header": "Gestion du réseau",
+                        "introduction": "Commandes qui affectent l'ensemble du réseau"
+                    },
+                    "node_management": {
+                        "header": "Gestion d'appareils",
+                        "introduction": "Exécutez les commandes ZHA qui affectent un seul périphérique. Choisissez un appareil pour voir une liste des commandes disponibles.",
+                        "hint_battery_devices": "Remarque: les appareils en veille (alimentés par batterie) doivent être réveillés lorsqu'ils exécutent des commandes. Vous pouvez généralement réveiller un appareil endormi en le déclenchant.",
+                        "hint_wakeup": "Certains appareils, tels que les capteurs Xiaomi, disposent d'un bouton de réveil sur lequel vous pouvez appuyer à environ 5 secondes d'intervalle pour que les appareils restent éveillés lorsque vous interagissez avec eux.",
+                        "help_node_dropdown": "Sélectionnez un périphérique pour afficher les options par périphérique."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Sélectionnez un cluster pour afficher les attributs et les commandes."
+                    },
+                    "cluster_attributes": {
+                        "header": "Attributs de cluster",
+                        "introduction": "Voir et éditer les attributs du cluster.",
+                        "attributes_of_cluster": "Attributs du cluster sélectionné",
+                        "get_zigbee_attribute": "Obtenir l'attribut Zigbee",
+                        "set_zigbee_attribute": "Définir l'attribut Zigbee",
+                        "help_attribute_dropdown": "Sélectionnez un attribut à afficher ou définissez sa valeur.",
+                        "help_get_zigbee_attribute": "Obtenez la valeur pour l'attribut sélectionné.",
+                        "help_set_zigbee_attribute": "Définir la valeur d'attribut pour le cluster spécifié sur l'entité spécifiée."
+                    },
+                    "cluster_commands": {
+                        "header": "Commandes de cluster",
+                        "introduction": "Afficher et émettre des commandes de cluster.",
+                        "commands_of_cluster": "Commandes du cluster sélectionné",
+                        "issue_zigbee_command": "Émettre une commande Zigbee",
+                        "help_command_dropdown": "Sélectionnez une commande avec laquelle interagir."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant tient un registre de chaque entité qu'il a déjà vu au moins une fois et qui peut être identifié de manière unique. Chacune de ces entités se verra attribuer un identifiant qui sera réservé à cette seule entité.",
                         "introduction2": "Utilisez le registre d'entités pour remplacer le nom, modifier l'ID d'entité ou supprimer l'entrée d'Home Assistant. Remarque: la suppression de l'entrée de registre d'entité ne supprime pas l'entité. Pour ce faire, suivez le lien ci-dessous et supprimez-le de la page des intégrations.",
                         "integrations_page": "Page des intégrations",
-                        "show_disabled": "Afficher les entités désactivées"
+                        "show_disabled": "Afficher les entités désactivées",
+                        "headers": {
+                            "name": "Nom",
+                            "entity_id": "ID de l'entité",
+                            "integration": "Intégration",
+                            "enabled": "Activé"
+                        }
                     },
                     "editor": {
                         "unavailable": "Cette entité n'est pas disponible actuellement.",
@@ -786,28 +1021,44 @@
                 },
                 "person": {
                     "caption": "Personnes",
-                    "description": "Gérez les personnes suivies par Home Assistant.",
+                    "description": "Gérer les personnes suivies par Home Assistant.",
                     "detail": {
                         "name": "Nom",
                         "device_tracker_intro": "Sélectionnez les appareils appartenant à cette personne.",
                         "device_tracker_picked": "Appareil suivi",
-                        "device_tracker_pick": "Choisissez le périphérique à suivre"
-                    }
+                        "device_tracker_pick": "Choisissez le périphérique à suivre",
+                        "new_person": "Nouvelle personne",
+                        "name_error_msg": "Le nom est obligatoire",
+                        "linked_user": "Utilisateur lié",
+                        "no_device_tracker_available_intro": "Lorsque vous avez des appareils qui indiquent la présence d'une personne, vous serez en mesure de les affecter à une personne ici. Vous pouvez ajouter votre premier appareil en ajoutant une intégration de détection de présence à partir de la page d'intégration.",
+                        "link_presence_detection_integrations": "Intégrations de détection de présence",
+                        "link_integrations_page": "Page des intégrations",
+                        "delete": "Supprimer",
+                        "create": "Créer",
+                        "update": "Mise à jour"
+                    },
+                    "introduction": "Ici, vous pouvez définir chaque personne d'intérêt dans Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Remarque: les personnes configurées via configuration.yaml ne peuvent pas être modifiées via l'interface utilisateur.",
+                    "no_persons_created_yet": "On dirait que vous n'avez pas encore créé de personnes.",
+                    "create_person": "Créer une personne",
+                    "add_person": "Ajouter une personne",
+                    "confirm_delete": "Êtes-vous sûr de vouloir supprimer cette personne?",
+                    "confirm_delete2": "Tous les appareils appartenant à cette personne ne seront plus affectés."
                 },
                 "server_control": {
                     "caption": "Contrôle du serveur",
-                    "description": "Redémarrez et arrêtez le serveur Home Assistant.",
+                    "description": "Redémarrer et arrêter le serveur Home Assistant",
                     "section": {
                         "validation": {
                             "heading": "Validation de la configuration",
-                            "introduction": "Validez votre configuration si vous l'avez récemment modifiée et que vous voulez vous assurer que tout est valide",
-                            "check_config": "Vérifiez la configuration",
+                            "introduction": "Valider votre configuration si vous avez récemment apporté quelques modifications à votre configuration et que vous souhaitez vous assurer qu'elle est valide",
+                            "check_config": "Vérifier la configuration",
                             "valid": "Configuration valide !",
                             "invalid": "Configuration invalide"
                         },
                         "reloading": {
                             "heading": "Rechargement de la configuration",
-                            "introduction": "Certaines parties de Home Assistant peuvent être rechargées sans nécessiter un redémarrage. Appuyer sur \"recharger\" déchargera leur configuration actuelle et chargera la nouvelle.",
+                            "introduction": "Certaines parties de Home Assistant peuvent être rechargées sans nécessiter de redémarrage. Le fait de cliquer sur recharger déchargera leur configuration actuelle et chargera la nouvelle.",
                             "core": "Recharger le noyau",
                             "group": "Recharger les groupes",
                             "automation": "Recharger les automatisations",
@@ -816,7 +1067,7 @@
                         },
                         "server_management": {
                             "heading": "Gestion du serveur",
-                            "introduction": "Contrôlez votre serveur Home Assistant ... depuis Home Assistant.",
+                            "introduction": "Contrôler votre serveur Home Assistant… à partir de Home Assistant.",
                             "restart": "Redémarrer",
                             "stop": "Arrêter",
                             "confirm_restart": "Êtes-vous sûr de vouloir redémarrer Home Assistant?",
@@ -838,6 +1089,11 @@
                             "caption": "Quand quelque chose est déclenché ..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Vous avez des changements non enregistrés. Êtes-vous sûr de vouloir quitter?"
+                    }
                 }
             },
             "profile": {
@@ -916,7 +1172,11 @@
                 },
                 "vibrate": {
                     "header": "Vibrer",
-                    "description": "Activez ou désactivez les vibrations sur cet appareil lorsque vous contrôlez des appareils."
+                    "description": "Activer ou désactiver les vibrations sur cet appareil lors du contrôle des périphériques."
+                },
+                "advanced_mode": {
+                    "title": "Mode avancé",
+                    "description": "Home Assistant cache les fonctionnalités et options avancées par défaut. Vous pouvez rendre ces fonctionnalités accessibles en cochant cette case. Il s'agit d'un paramètre spécifique à l'utilisateur et n'a pas d'impact sur les autres utilisateurs utilisant Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Ajouter une action",
                         "edit": "Modifier",
                         "delete": "Supprimer",
-                        "move": "Déplacer"
+                        "move": "Déplacer",
+                        "show_visual_editor": "Afficher l'éditeur visuel",
+                        "show_code_editor": "Afficher l'éditeur de code"
                     },
                     "migrate": {
                         "header": "Configuration incompatible",
@@ -1121,7 +1383,8 @@
                             "optional": "Optionnel"
                         },
                         "entities": {
-                            "show_header_toggle": "Afficher le bouton d'en-tête ?"
+                            "show_header_toggle": "Afficher le bouton d'en-tête ?",
+                            "name": "Entités"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Vert",
                                 "red": "Rouge",
                                 "yellow": "Jaune"
-                            }
+                            },
+                            "name": "Jauge"
                         },
                         "glance": {
-                            "columns": "Colonnes"
+                            "columns": "Colonnes",
+                            "name": "Coup d'oeil"
                         },
                         "generic": {
                             "aspect_ratio": "Ratio d'aspect",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Sources de géolocalisation",
                             "dark_mode": "Mode sombre ?",
                             "default_zoom": "Zoom par défaut",
-                            "source": "Source"
+                            "source": "Source",
+                            "name": "Carte"
                         },
                         "markdown": {
-                            "content": "Contenu"
+                            "content": "Contenu",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Détail du graphique",
-                            "graph_type": "Type de graphique"
+                            "graph_type": "Type de graphique",
+                            "name": "Capteur"
+                        },
+                        "alarm-panel": {
+                            "name": "Panneau d'alarme",
+                            "available_states": "États disponibles"
+                        },
+                        "conditional": {
+                            "name": "Conditionnel"
+                        },
+                        "entity-button": {
+                            "name": "Entité Bouton"
+                        },
+                        "entity-filter": {
+                            "name": "Filtre d'entité"
+                        },
+                        "history-graph": {
+                            "name": "Graphique Historique"
+                        },
+                        "horizontal-stack": {
+                            "name": "Pile horizontale"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Lumière"
+                        },
+                        "media-control": {
+                            "name": "Contrôle des médias"
+                        },
+                        "picture": {
+                            "name": "Image"
+                        },
+                        "picture-elements": {
+                            "name": "Éléments d'image"
+                        },
+                        "picture-entity": {
+                            "name": "Entité d'image"
+                        },
+                        "picture-glance": {
+                            "name": "Coup d'œil en image"
+                        },
+                        "plant-status": {
+                            "name": "Statut de la plante"
+                        },
+                        "shopping-list": {
+                            "name": "Liste de courses"
+                        },
+                        "thermostat": {
+                            "name": "Thermostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Pile verticale"
+                        },
+                        "weather-forecast": {
+                            "name": "Prévisions Météo"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "Extinction de \"{entity}\".",
             "service_called": "Service \"{service}\" appelé.",
             "service_call_failed": "Échec d'appel du service \"{service}\".",
-            "connection_lost": "Connexion perdue. Reconnexion en cours ..."
+            "connection_lost": "Connexion perdue. Reconnexion en cours ...",
+            "triggered": "Déclenché {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,13 +1775,22 @@
                     "device_name_placeholder": "Nom personnalisé",
                     "area_picker_label": "Pièce",
                     "update_name_button": "Modifier le nom"
-                }
+                },
+                "buttons": {
+                    "add": "Ajouter des appareils",
+                    "remove": "Supprimer l'appareil",
+                    "reconfigure": "Reconfigurer l'appareil"
+                },
+                "quirk": "Quirk",
+                "last_seen": "Dernière vue",
+                "power_source": "Source d'énergie",
+                "unknown": "Inconnu"
             }
         },
         "auth_store": {
             "ask": "Voulez-vous enregistrer cette connexion?",
             "decline": "Non merci",
-            "confirm": "Connexion automatique"
+            "confirm": "Enregistrer la connexion"
         },
         "notification_drawer": {
             "click_to_configure": "Cliquez sur le bouton pour configurer {entity}",
diff --git a/translations/he.json b/translations/he.json
index ee1903800d..38d20a87e2 100644
--- a/translations/he.json
+++ b/translations/he.json
@@ -349,10 +349,10 @@
                 "introduction": "כאן ניתן להגדיר את הרכיבים ואת ה Home Assistant. לא הכל ניתן להגדיר את ממשק המשתמש עדיין, אבל אנחנו עובדים על זה.",
                 "core": {
                     "caption": "כללי",
-                    "description": "בדיקת קובץ הקונפיגורציה שלך ושליטה על השרת",
+                    "description": "שנה את התצורה הכללית של Home Assistant",
                     "section": {
                         "core": {
-                            "header": "שליטה על הקונפיגורציה ועל השרת",
+                            "header": "הגדרות כלליות",
                             "introduction": "שינוי התצורה שלך יכול להיות תהליך מייגע. אנחנו יודעים. חלק זה ינסה להפוך את החיים שלך קצת יותר קלים.",
                             "core_config": {
                                 "edit_requires_storage": "עורך מושבת משום שתצורה מאוחסנת ב- configuration.yaml.",
@@ -415,7 +415,7 @@
                         "learn_more": "למד עוד על אוטומציות"
                     },
                     "editor": {
-                        "introduction": "השתמש באוטומציות להביא את הבית שלך לחיים",
+                        "introduction": "השתמש\/י באוטומציות להפיח חיים בביתך.",
                         "default_name": "אוטומציה חדשה",
                         "save": "שמור",
                         "unsaved_confirm": "יש לך שינויים שלא נשמרו. אתה בטוח שאתה רוצה לעזוב?",
@@ -636,13 +636,15 @@
                         "true": "True",
                         "false": "False",
                         "set_config_parameter": "הגדר פרמטר Config"
-                    }
+                    },
+                    "learn_more": "למידע נוסף על Z-Wave"
                 },
                 "users": {
                     "caption": "משתמשים",
                     "description": "ניהול משתמשים",
                     "picker": {
-                        "title": "משתמשים"
+                        "title": "משתמשים",
+                        "system_generated": "נוצר ע\"י המערכת"
                     },
                     "editor": {
                         "rename_user": "שנה שם משתמש",
@@ -650,7 +652,13 @@
                         "activate_user": "הפעל משתמש",
                         "deactivate_user": "בטל את המשתמש",
                         "delete_user": "מחיקת משתמש",
-                        "caption": "הצג משתמש"
+                        "caption": "הצג משתמש",
+                        "id": "מזהה",
+                        "owner": "בעלים",
+                        "group": "קבוצה",
+                        "active": "פעיל",
+                        "enter_new_name": "הזן שם חדש",
+                        "confirm_user_deletion": "האם הינך בטוח\/ה שברצונך למחוק את {name} ?"
                     },
                     "add_user": {
                         "caption": "הוסף משתמש",
@@ -664,11 +672,34 @@
                     "caption": "ענן Home Assistant",
                     "description_login": "מחובר בתור {email} מה",
                     "description_not_login": "לא מחובר",
-                    "description_features": "שליטה הרחק מהבית, משתלב עם Alexa ו Google Assistant."
+                    "description_features": "שליטה הרחק מהבית, משתלב עם Alexa ו Google Assistant.",
+                    "register": {
+                        "headline": "התחל את תקופת הניסיון בחינם",
+                        "feature_google_home": "אינטגרציה עם Google Assistant",
+                        "feature_amazon_alexa": "אינטגרציה עם Amazon Alexa"
+                    },
+                    "account": {
+                        "alexa": {
+                            "title": "Alexa",
+                            "info_state_reporting": "אם תאפשר דיווח על מצב, Home Assistant ישלח כל שינוי מצב של ישויות חשופות לאמזון. זה יאפשר לך לראות תמיד את המצב העדכני באפליקציית Alexa ולהשתמש בשינויי המצב ליצירת שגרות."
+                        },
+                        "google": {
+                            "title": "Google Assistant"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa"
+                    },
+                    "google": {
+                        "title": "Google Assistant"
+                    },
+                    "dialog_cloudhook": {
+                        "close": "סגור"
+                    }
                 },
                 "integrations": {
                     "caption": "אינטגרציות",
-                    "description": "ניהול התקנים ושירותים מחוברים",
+                    "description": "ניהול והגדרת אינטגרציות",
                     "discovered": "זוהו",
                     "configured": "הוגדר",
                     "new": "הגדר אינטגרציה",
@@ -692,7 +723,10 @@
                             "description": "שלב זה מחייב אותך לבקר באתר אינטרנט חיצוני להשלמת הפעולה.",
                             "open_site": "פתח אתר"
                         }
-                    }
+                    },
+                    "note_about_integrations": "קיימות אינטגרציות שלא ניתן עדיין להגדירן ע\"י ממשק המשתמש.",
+                    "note_about_website_reference": "מידע נוסף זמין ב:",
+                    "home_assistant_website": "אתר Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -710,7 +744,25 @@
                     "add_device_page": {
                         "header": "אוטומציית Zigbee - הוספת התקנים",
                         "spinner": "מחפש מכשירי ZHA Zigbee...",
-                        "discovery_text": ". המכשירים שהתגלו יופיעו כאן. עקוב אחר ההוראות עבור ההתקנים שלך והצב את ההתקנים במצב תיאום."
+                        "discovery_text": ". המכשירים שהתגלו יופיעו כאן. עקוב אחר ההוראות עבור ההתקנים שלך והצב את ההתקנים במצב תיאום.",
+                        "search_again": "חפש שוב"
+                    },
+                    "common": {
+                        "add_devices": "הוסף התקנים",
+                        "devices": "התקנים"
+                    },
+                    "node_management": {
+                        "hint_battery_devices": "הערה: מכשירים מנומנמים (מופעלים על סוללות) צריכים להיות ערים בעת ביצוע פקודות מולם. בדרך כלל ניתן להעיר מכשיר מנומנם על ידי ביצוע פקודה מולם.",
+                        "hint_wakeup": "מכשירים מסוימים, כגון חיישני Xiaomi, כוללים כפתור להתעוררות עליו ניתן ללחוץ במרווח של ~5 שניות על מנת להשאיר אותם ערים בזמן שמתקשרים איתם."
+                    },
+                    "cluster_attributes": {
+                        "get_zigbee_attribute": "קבל שדה Zigbee",
+                        "set_zigbee_attribute": "קבע שדה Zigbee",
+                        "help_attribute_dropdown": "בחר שדה לצפייה או לשינוי ערכו.",
+                        "help_get_zigbee_attribute": "קבל את הערך עבור השדה שנבחר."
+                    },
+                    "cluster_commands": {
+                        "issue_zigbee_command": "שלח פקודת Zigbee"
                     }
                 },
                 "area_registry": {
@@ -757,7 +809,9 @@
                         "name": "שם",
                         "device_tracker_intro": "בחר את המכשירים השייכים לאדם זה.",
                         "device_tracker_picked": "עקוב אחר מכשיר",
-                        "device_tracker_pick": "בחר מכשיר למעקב"
+                        "device_tracker_pick": "בחר מכשיר למעקב",
+                        "name_error_msg": "שם נדרש",
+                        "linked_user": "משתמש מקושר"
                     }
                 },
                 "server_control": {
@@ -861,6 +915,10 @@
                 "force_narrow": {
                     "header": "הסתר תמיד את הסרגל הצידי",
                     "description": "פעולה זו תסתיר את הסרגל הצדדי כברירת מחדל, בדומה לחוויה בנייד."
+                },
+                "advanced_mode": {
+                    "title": "מצב מתקדם",
+                    "description": "Home Assistant מסתיר תכונות ואפשרויות מתקדמות כברירת מחדל. ביכולתך לחשוף אותן ע\"י בחירת תיבת הסימון זו. הגדרה זו היא עבור המשתמש הנוכחי ולא תשפיע על משתמשים אחרים ב Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1050,6 +1108,44 @@
                         "save": "שמור",
                         "unsaved_changes": "שינויים שלא נשמרו",
                         "saved": "נשמר"
+                    },
+                    "card": {
+                        "horizontal-stack": {
+                            "name": "עימוד אופקי"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "תאורה"
+                        },
+                        "map": {
+                            "name": "מפה"
+                        },
+                        "media-control": {
+                            "name": "שליטה במדיה"
+                        },
+                        "picture": {
+                            "name": "תמונה"
+                        },
+                        "plant-status": {
+                            "name": "מצב הצמח"
+                        },
+                        "sensor": {
+                            "name": "חיישן"
+                        },
+                        "shopping-list": {
+                            "name": "רשימת קניות"
+                        },
+                        "thermostat": {
+                            "name": "וסת חום"
+                        },
+                        "vertical-stack": {
+                            "name": "עימוד אנכי"
+                        },
+                        "weather-forecast": {
+                            "name": "תחזית מזג האוויר"
+                        }
                     }
                 },
                 "menu": {
@@ -1125,8 +1221,8 @@
             "day": "יום ימים",
             "week": "שבוע שבועות",
             "second": "שניה שניות",
-            "minute": "דקה דקות",
-            "hour": "שעה שעות"
+            "minute": "{count} {count, plural,\n  one {דקה}\n  other {דקות}\n}",
+            "hour": "{count} {count, plural,\n  one {שעה}\n  other {שעות}\n}"
         },
         "login-form": {
             "password": "סיסמה",
diff --git a/translations/hu.json b/translations/hu.json
index deea9c3b9f..3d5cf1d8c9 100644
--- a/translations/hu.json
+++ b/translations/hu.json
@@ -412,7 +412,7 @@
                     "description": "Automatizálások létrehozása és szerkesztése",
                     "picker": {
                         "header": "Automatizálás szerkesztő",
-                        "introduction": "Az automatizálás szerkesztővel automatizálási szabályokat tudsz létrehozni és szerkeszteni. Kérlek olvasd el az útmutatót az alábbi linken, hogy megbizonyosodj róla, hogy a Home Assistant helyesen van konfigurálva.",
+                        "introduction": "Az automatizálás szerkesztő lehetővé teszi automatizálási szabályok létrehozását és szerkesztését. Kérlek, olvasd el az útmutatót az alábbi linken, hogy megbizonyosodj róla, hogy a Home Assistant helyesen van konfigurálva.",
                         "pick_automation": "Válassz ki egy automatizálást szerkesztésre",
                         "no_automations": "Nem találtunk szerkeszthető automatizálást",
                         "add_automation": "Automatizálás hozzáadása",
@@ -558,7 +558,12 @@
                                     "zone": "Zóna"
                                 },
                                 "device": {
-                                    "label": "Eszköz"
+                                    "label": "Eszköz",
+                                    "extra_fields": {
+                                        "above": "Felett",
+                                        "below": "Alatt",
+                                        "for": "Időtartam"
+                                    }
                                 },
                                 "and": {
                                     "label": "És"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Eszköz"
+                                },
+                                "scene": {
+                                    "label": "Jelenet aktiválása"
                                 }
                             },
                             "learn_more": "Tudj meg többet a műveletekről"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Szkript",
-                    "description": "Szkriptek létrehozása és szerkesztése"
+                    "description": "Szkriptek létrehozása és szerkesztése",
+                    "picker": {
+                        "header": "Szkript szerkesztő",
+                        "introduction": "A szkript szerkesztő lehetővé teszi szkriptek létrehozását és szerkesztését. Kérlek, olvasd el az útmutatót az alábbi linken, hogy megbizonyosodj róla, hogy a Home Assistant helyesen van konfigurálva.",
+                        "learn_more": "Tudj meg többet a szkriptekről",
+                        "no_scripts": "Nem találtunk szerkeszthető szkripteket",
+                        "add_script": "Szkript hozzáadása"
+                    },
+                    "editor": {
+                        "header": "Szkript: {name}",
+                        "default_name": "Új szkript",
+                        "load_error_not_editable": "Csak a scripts.yaml fájlban található szkriptek szerkeszthetők.",
+                        "delete_confirm": "Biztosan törölni szeretnéd ezt a szkriptet?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Igaz",
                         "false": "Hamis",
                         "set_config_parameter": "Konfigurációs paraméter beállítása"
+                    },
+                    "learn_more": "Tudj meg többet a Z-Wave-ről",
+                    "ozw_log": {
+                        "header": "OZW Log",
+                        "introduction": "Napló megtekintése. 0 a minimum (a teljes naplót betölti) és 1000 a maximum. A betöltés statikus naplót jelenít meg, és a vége automatikusan frissül a napló utolsó meghatározott számú sorával."
                     }
                 },
                 "users": {
                     "caption": "Felhasználók",
                     "description": "Felhasználók kezelése",
                     "picker": {
-                        "title": "Felhasználók"
+                        "title": "Felhasználók",
+                        "system_generated": "Rendszer által létrehozott"
                     },
                     "editor": {
                         "rename_user": "Felhasználó átnevezése",
@@ -678,7 +705,18 @@
                         "activate_user": "Felhasználó aktiválása",
                         "deactivate_user": "Felhasználó inaktiválása",
                         "delete_user": "Felhasználó törlése",
-                        "caption": "Felhasználó megtekintése"
+                        "caption": "Felhasználó megtekintése",
+                        "id": "ID",
+                        "owner": "Tulajdonos",
+                        "group": "Csoport",
+                        "active": "Aktív",
+                        "system_generated": "Rendszer által létrehozott",
+                        "system_generated_users_not_removable": "Nem lehet eltávolítani a rendszer által létrehozott felhasználókat.",
+                        "unnamed_user": "Névtelen felhasználó",
+                        "enter_new_name": "Add meg az új nevet",
+                        "user_rename_failed": "A felhasználó átnevezése sikertelen:",
+                        "group_update_failed": "A csoport frissítése sikertelen:",
+                        "confirm_user_deletion": "Biztosan törölni szeretnéd {name}-t?"
                     },
                     "add_user": {
                         "caption": "Felhasználó hozzáadása",
@@ -692,7 +730,148 @@
                     "caption": "Home Assistant Felhő",
                     "description_login": "Bejelentkezve mint {email}",
                     "description_not_login": "Nincs bejelentkezve",
-                    "description_features": "Távoli vezérlés, Alexa és Google Assistant integráció"
+                    "description_features": "Távoli vezérlés, Alexa és Google Asszisztens integráció",
+                    "login": {
+                        "title": "Bejelentkezés a felhőbe",
+                        "introduction": "A Home Assistant Felhő biztonságos távoli kapcsolatot nyújt a példányodhoz, miközben távol vagy. Azt is lehetővé teszi, hogy csak felhőn alapuló szolgáltatásokhoz csatlakozz: Amazon Alexa, Google Asszisztens.",
+                        "introduction2": "Ezt a szolgáltatást partnerünk üzemelteti ",
+                        "introduction2a": ", egy vállalat, amelyet a Home Assistant és a Hass.io alapítói alapítottak.",
+                        "introduction3": "A Home Assistant Felhő egy előfizetéses szolgáltatás egy hónapos ingyenes próbaverzióval. Nincs szükség fizetési információk megadására.",
+                        "learn_more_link": "Tudj meg többet a Home Assistant Felhőről",
+                        "dismiss": "Elvetés",
+                        "sign_in": "Bejelentkezés",
+                        "email": "Email",
+                        "email_error_msg": "Érvénytelen email",
+                        "password": "Jelszó",
+                        "password_error_msg": "A jelszavak legalább 8 karakteresek",
+                        "forgot_password": "elfelejtett jelszó?",
+                        "start_trial": "Indítsd el az ingyenes 1 hónapos próbaidőszakot",
+                        "trial_info": "Nincs szükség fizetési információk megadására",
+                        "alert_password_change_required": "A bejelentkezés előtt meg kell változtatnod a jelszavad.",
+                        "alert_email_confirm_necessary": "A bejelentkezés előtt meg kell erősítened az email címed."
+                    },
+                    "forgot_password": {
+                        "title": "Elfelejtett jelszó",
+                        "subtitle": "Elfelejtetted a jelszavad",
+                        "instructions": "Add meg az email címed, és mi küldünk egy linket a jelszó visszaállításához.",
+                        "email": "Email",
+                        "email_error_msg": "Érvénytelen email",
+                        "send_reset_email": "Visszaállítási email küldése",
+                        "check_your_email": "A jelszó visszaállításával kapcsolatos instrukciókért ellenőrizd az e-mail fiókod."
+                    },
+                    "register": {
+                        "title": "Fiók regisztráció",
+                        "headline": "Indítsd el az ingyenes próbaidőszakot",
+                        "information": "Hozz létre egy fiókot ahhoz, hogy elindíthasd az egy hónapos ingyenes Home Assistant Felhő próbaidőszakodat. Nincs szükség fizetési információk megadására.",
+                        "information2": "A próbaidőszak hozzáférést biztosít a Home Assistant Felhő minden előnyéhez, beleértve a következőket:",
+                        "feature_remote_control": "A Home Assistant vezérlése távolról",
+                        "feature_google_home": "Integráció a Google Asszisztenssel",
+                        "feature_amazon_alexa": "Integráció az Amazon Alexával",
+                        "feature_webhook_apps": "Egyszerű integráció webhook-alapú alkalmazásokkal, mint például az OwnTracks",
+                        "information3": "Ezt a szolgáltatást partnerünk üzemelteti ",
+                        "information3a": ", egy vállalat, amelyet a Home Assistant és a Hass.io alapítói alapítottak.",
+                        "information4": "Fiók regisztrálásával elfogadod az alábbi feltételeket.",
+                        "link_terms_conditions": "Felhasználási feltételek",
+                        "link_privacy_policy": "Adatvédelmi irányelvek",
+                        "create_account": "Fiók Létrehozása",
+                        "email_address": "Email cím",
+                        "email_error_msg": "Érvénytelen email",
+                        "password": "Jelszó",
+                        "password_error_msg": "A jelszavak legalább 8 karakteresek",
+                        "start_trial": "Próbaidőszak indítása",
+                        "resend_confirm_email": "Megerősítő e-mail újraküldése",
+                        "account_created": "Fiók létrehozva! Az aktiválással kapcsolatos instrukciókért ellenőrizd az e-mail fiókod."
+                    },
+                    "account": {
+                        "thank_you_note": "Köszönjük, hogy a Home Assistant Felhő részese vagy. Az olyan emberek miatt, mint te, vagyunk képesek mindenki számára nagyszerű otthoni automatizálási élményt nyújtani. Köszönjük!",
+                        "nabu_casa_account": "Nabu Casa fiók",
+                        "connection_status": "Felhő kapcsolat állapota",
+                        "manage_account": "Fiók kezelése",
+                        "sign_out": "Kijelentkezés",
+                        "integrations": "Integrációk",
+                        "integrations_introduction2": "Nézd meg a weboldalt a ",
+                        "integrations_link_all_features": "az összes elérhető funkció",
+                        "connected": "Csatlakoztatva",
+                        "not_connected": "Nincs csatlakoztatva",
+                        "fetching_subscription": "Előfizetés lekérése...",
+                        "remote": {
+                            "title": "Távoli vezérlés",
+                            "access_is_being_prepared": "A távoli hozzáférés előkészítése folyamatban van. Értesíteni fogunk, ha készen áll.",
+                            "info": "A Home Assistant Felhő biztonságos távoli kapcsolatot nyújt a példányodhoz, miközben távol vagy.",
+                            "instance_is_available": "A példányod itt elérhető:",
+                            "instance_will_be_available": "A példányod itt lesz elérhető:",
+                            "link_learn_how_it_works": "Tudd meg, hogyan működik",
+                            "certificate_info": "Tanúsítvány infó"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "enable_ha_skill": "Home Assistant készség aktiválása Alexának",
+                            "config_documentation": "Konfigurációs dokumentáció",
+                            "enable_state_reporting": "Állapotjelentés engedélyezése",
+                            "info_state_reporting": "Ha engedélyezed az állapotjelentést, akkor a Home Assistant minden állapotváltozást el fog küldeni a feltárt entitásokról az Amazon-nak. Ez lehetővé teszi, hogy mindig láthasd a legfrissebb állapotokat az Alexa alkalmazásban, és az állapotváltozásokkal rutinokat hozhass létre.",
+                            "sync_entities": "Entitások szinkronizálása",
+                            "manage_entities": "Entitások kezelése",
+                            "sync_entities_error": "Nem sikerült szinkronizálni az entitásokat:",
+                            "state_reporting_error": "Nem lehet {enable_disable} az állapotjelentést.",
+                            "enable": "engedélyezni",
+                            "disable": "letiltani"
+                        },
+                        "google": {
+                            "title": "Google Asszisztens",
+                            "enable_ha_skill": "Home Assistant készség aktiválása a Google Asszisztensnek",
+                            "config_documentation": "Konfigurációs dokumentáció",
+                            "enable_state_reporting": "Állapotjelentés engedélyezése",
+                            "info_state_reporting": "Ha engedélyezed az állapotjelentést, akkor a Home Assistant minden állapotváltozást el fog küldeni a feltárt entitásokról a Google-nak. Ez lehetővé teszi, hogy mindig láthasd a legfrissebb állapotokat a Google alkalmazásban.",
+                            "security_devices": "Biztonsági eszközök",
+                            "devices_pin": "Biztonsági eszközök pin kódja",
+                            "enter_pin_hint": "Adj meg egy PIN-kódot a biztonsági eszközök használatához",
+                            "sync_entities": "Entitások szinkronizálása a Google-lal",
+                            "manage_entities": "Entitások kezelése",
+                            "enter_pin_error": "A PIN-kód nem tárolható:"
+                        },
+                        "webhooks": {
+                            "title": "Webhookok",
+                            "no_hooks_yet": "Úgy tűnik, még nincs egy webhookod sem. Kezdéshez konfigurálj egy ",
+                            "no_hooks_yet_link_integration": "webhook-alapú integráció",
+                            "no_hooks_yet_link_automation": "webhook automatizálás",
+                            "link_learn_more": "Tudj meg többet a webhook-alapú automatizálások létrehozásáról.",
+                            "loading": "Betöltés...",
+                            "manage": "Kezelés",
+                            "disable_hook_error_msg": "A webhook letiltása sikertelen:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "exposed_entities": "Feltárt entitások",
+                        "not_exposed_entities": "Nem feltárt entitások",
+                        "expose": "Feltárás Alexának"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Tanúsítvány-információ",
+                        "certificate_expiration_date": "Tanúsítvány lejárati dátuma",
+                        "will_be_auto_renewed": "Automatikusan megújul",
+                        "fingerprint": "Tanúsítvány ujjlenyomata:",
+                        "close": "Bezárás"
+                    },
+                    "google": {
+                        "title": "Google Asszisztens",
+                        "expose": "Feltárás a Google Asszisztensnek",
+                        "disable_2FA": "Kétfaktoros hitelesítés letiltása",
+                        "exposed_entities": "Feltárt entitások",
+                        "not_exposed_entities": "Nem feltárt entitások",
+                        "sync_to_google": "A változások szinkronizálása a Google-lal."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook: {name}",
+                        "available_at": "A webhook a következő URL-címen érhető el:",
+                        "managed_by_integration": "Ezt a webhookot egy integráció kezeli, ezért nem lehet letiltani.",
+                        "info_disable_webhook": "Ha már nem szeretnéd ezt a webhookot használni, akkor",
+                        "link_disable_webhook": "letilthatod",
+                        "view_documentation": "Dokumentáció megtekintése",
+                        "close": "Bezárás",
+                        "confirm_disable": "Biztosan le szeretnéd tiltani ezt a webhookot?",
+                        "copied_to_clipboard": "Vágólapra másolva"
+                    }
                 },
                 "integrations": {
                     "caption": "Integrációk",
@@ -720,7 +899,9 @@
                             "description": "Ehhez a lépéshez egy külső weboldal meglátogatása szükséges.",
                             "open_site": "Weboldal megnyitása"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Még nem minden integráció konfigurálható a felhasználói felületen keresztül.",
+                    "home_assistant_website": "Home Assistant weboldal"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -739,6 +920,14 @@
                         "header": "Zigbee Home Automation - Eszközök hozzáadása",
                         "spinner": "ZHA Zigbee eszközök keresése...",
                         "discovery_text": "A felfedezett eszközök itt fognak megjelenni. A készülékek használati utasításai alapján állítsd őket párosítási módba."
+                    },
+                    "common": {
+                        "add_devices": "Eszközök hozzáadása",
+                        "devices": "Eszközök",
+                        "value": "Érték"
+                    },
+                    "network_management": {
+                        "header": "Hálózat menedzsment"
                     }
                 },
                 "area_registry": {
@@ -770,7 +959,13 @@
                         "introduction": "A Home Assistant nyilvántartást vezet minden olyan entitásról, melyet valaha látott, és egyedileg azonosítható. Ezen entitások mindegyikéhez létrejön egy entitás ID, amely csak az adott entitáshoz van rendelve.",
                         "introduction2": "Az entitás nyilvántartás használatával felülbírálhatod a nevet, módosíthatod az entitás ID-t vagy eltávolíthatod a bejegyzést a Home Assistant-ból. Megjegyzendő, hogy az entitás nyilvántartásból történő bejegyzés eltávolítás nem fogja eltávolítani magát az entitást. Ehhez kövesd az alábbi linket, és távolítsd el azt az integrációk oldalról.",
                         "integrations_page": "Integrációk oldal",
-                        "show_disabled": "Letiltott entitások megjelenítése"
+                        "show_disabled": "Letiltott entitások megjelenítése",
+                        "headers": {
+                            "name": "Név",
+                            "entity_id": "Entitás ID",
+                            "integration": "Integráció",
+                            "enabled": "Engedélyezve"
+                        }
                     },
                     "editor": {
                         "unavailable": "Ez az entitás jelenleg nem elérhető.",
@@ -791,8 +986,21 @@
                         "name": "Név",
                         "device_tracker_intro": "Válaszd ki azokat az eszközöket, amelyek ehhez a felhasználóhoz tartoznak.",
                         "device_tracker_picked": "Eszköz követése",
-                        "device_tracker_pick": "Válassz egy követni kívánt eszközt"
-                    }
+                        "device_tracker_pick": "Válassz egy követni kívánt eszközt",
+                        "new_person": "Új személy",
+                        "name_error_msg": "Név szükséges",
+                        "linked_user": "Csatolt felhasználó",
+                        "link_integrations_page": "Integrációk oldal",
+                        "delete": "Törlés",
+                        "create": "Létrehozás",
+                        "update": "Frissítés"
+                    },
+                    "note_about_persons_configured_in_yaml": "Megjegyzés: a configuration.yaml fájlban konfigurált személyek nem szerkeszthetők a felhasználói felületen.",
+                    "no_persons_created_yet": "Úgy tűnik, még nem hoztál létre személyeket.",
+                    "create_person": "Személy létrehozása",
+                    "add_person": "Személy hozzáadása",
+                    "confirm_delete": "Biztosan törölni szeretnéd ezt a személyt?",
+                    "confirm_delete2": "Minden ehhez a személyhez tartozó eszköz hozzárendelés nélküli lesz."
                 },
                 "server_control": {
                     "caption": "Szerver vezérlés",
@@ -838,6 +1046,11 @@
                             "caption": "Amikor valami indításra kerül..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Vannak nem mentett módosítások. Biztos, hogy elhagyod az oldalt?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1130,10 @@
                 "vibrate": {
                     "header": "Rezgés",
                     "description": "Rezgés engedélyezése vagy tiltása ezen az eszközön az eszközök vezérlésekor."
+                },
+                "advanced_mode": {
+                    "title": "Haladó üzemmód",
+                    "description": "A Home Assistant alapértelmezés szerint elrejti a haladó funkciókat és beállításokat, de ezzel a kapcsolóval elérhetővé teheted őket. Ez egy felhasználó-specifikus beállítás, ami nem befolyásolja a többi felhasználó felületét."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1294,9 @@
                         "add": "Kártya hozzáadása",
                         "edit": "Szerkesztés",
                         "delete": "Törlés",
-                        "move": "Áthelyezés"
+                        "move": "Áthelyezés",
+                        "show_visual_editor": "Vizuális szerkesztő megjelenítése",
+                        "show_code_editor": "Kódszerkesztő megjelenítése"
                     },
                     "migrate": {
                         "header": "Inkompatibilis Konfiguráció",
@@ -1121,7 +1340,8 @@
                             "optional": "Opcionális"
                         },
                         "entities": {
-                            "show_header_toggle": "Fejléc kapcsoló megjelenítése?"
+                            "show_header_toggle": "Fejléc kapcsoló megjelenítése?",
+                            "name": "Entitások"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1349,12 @@
                                 "green": "Zöld",
                                 "red": "Piros",
                                 "yellow": "Sárga"
-                            }
+                            },
+                            "name": "Műszer"
                         },
                         "glance": {
-                            "columns": "Oszlopok"
+                            "columns": "Oszlopok",
+                            "name": "Pillantás"
                         },
                         "generic": {
                             "aspect_ratio": "Oldalarány",
@@ -1156,20 +1378,78 @@
                             "title": "Cím",
                             "theme": "Téma",
                             "unit": "Egység",
-                            "url": "Url"
+                            "url": "URL"
                         },
                         "map": {
                             "geo_location_sources": "Helylokáció forrásai",
                             "dark_mode": "Sötét mód?",
                             "default_zoom": "Alapértelmezett nagyítás",
-                            "source": "Forrás"
+                            "source": "Forrás",
+                            "name": "Térkép"
                         },
                         "markdown": {
-                            "content": "Tartalom"
+                            "content": "Tartalom",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Grafikon részletei",
-                            "graph_type": "Grafikon típusa"
+                            "graph_type": "Grafikon típusa",
+                            "name": "Érzékelő"
+                        },
+                        "alarm-panel": {
+                            "name": "Riasztópanel",
+                            "available_states": "Rendelkezésre álló állapotok"
+                        },
+                        "conditional": {
+                            "name": "Feltételes"
+                        },
+                        "entity-button": {
+                            "name": "Entitás gomb"
+                        },
+                        "entity-filter": {
+                            "name": "Entitás szűrő"
+                        },
+                        "history-graph": {
+                            "name": "Előzmény grafikon"
+                        },
+                        "horizontal-stack": {
+                            "name": "Vízszintes készlet"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Világítás"
+                        },
+                        "media-control": {
+                            "name": "Médiavezérlés"
+                        },
+                        "picture": {
+                            "name": "Kép"
+                        },
+                        "picture-elements": {
+                            "name": "Kép elemek"
+                        },
+                        "picture-entity": {
+                            "name": "Kép entitás"
+                        },
+                        "picture-glance": {
+                            "name": "Kép pillantás"
+                        },
+                        "plant-status": {
+                            "name": "Növény állapota"
+                        },
+                        "shopping-list": {
+                            "name": "Bevásárló lista"
+                        },
+                        "thermostat": {
+                            "name": "Termosztát"
+                        },
+                        "vertical-stack": {
+                            "name": "Függőleges készlet"
+                        },
+                        "weather-forecast": {
+                            "name": "Időjárás előrejelzés"
                         }
                     }
                 },
@@ -1405,7 +1685,8 @@
             "entity_turned_off": "{entity} kikapcsolva.",
             "service_called": "{service} szolgáltatás meghívva.",
             "service_call_failed": "Nem sikerült meghívni a(z) {service} szolgáltatást.",
-            "connection_lost": "A kapcsolat megszakadt. Újracsatlakozás…"
+            "connection_lost": "A kapcsolat megszakadt. Újracsatlakozás…",
+            "triggered": "Aktiválva {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1445,13 +1726,21 @@
                 "services": {
                     "reconfigure": "A ZHA készülék újratelepítése (eszköz rendbehozatala). Akkor használd ezt a funkciót, ha problémáid vannak a készülékkel. Ha a kérdéses eszköz akkumulátoros, győződj meg róla, hogy nincs alvó állapotban és fogadja a parancsokat, amikor ezt a szolgáltatást használod.",
                     "updateDeviceName": "Egyedi név beállítása ehhez az eszközhöz az eszköz nyilvántartásban.",
-                    "remove": "Törölj egy eszközt a Zigbee hálózatból"
+                    "remove": "Távolíts el egy eszközt a Zigbee hálózatból."
                 },
                 "zha_device_card": {
                     "device_name_placeholder": "Felhasználó utóneve",
                     "area_picker_label": "Terület",
                     "update_name_button": "Név frissítése"
-                }
+                },
+                "buttons": {
+                    "add": "Eszközök hozzáadása",
+                    "remove": "Eszköz eltávolítása",
+                    "reconfigure": "Eszköz újrakonfigurálása"
+                },
+                "last_seen": "Utolsó jelentés",
+                "power_source": "Energia forrás",
+                "unknown": "Ismeretlen"
             }
         },
         "auth_store": {
diff --git a/translations/is.json b/translations/is.json
index fc645d032c..d8847f2d5f 100644
--- a/translations/is.json
+++ b/translations/is.json
@@ -52,6 +52,9 @@
                 "off": "Hreinsa",
                 "on": "Uppgötvað"
             },
+            "vibration": {
+                "on": "Uppgötvað"
+            },
             "safety": {
                 "off": "Öruggt",
                 "on": "Óöruggt"
@@ -116,11 +119,16 @@
             "dry": "Þurrt",
             "fan_only": "Vifta eingöngu",
             "eco": "Sparnaður",
+            "performance": "Frammistaða",
             "heat_pump": "Hitadæla",
             "gas": "Gas",
             "manual": "Handvirkt",
             "heat_cool": "Hita\/Kæla"
         },
+        "configurator": {
+            "configure": "Stilli",
+            "configured": "Stillt"
+        },
         "cover": {
             "open": "Opin",
             "opening": "Opna",
@@ -457,7 +465,8 @@
                                     "label": "Tæki",
                                     "extra_fields": {
                                         "above": "Yfir",
-                                        "below": "Undir"
+                                        "below": "Undir",
+                                        "for": "Tímalengd"
                                     }
                                 }
                             },
@@ -485,6 +494,8 @@
                                     "label": "Sól",
                                     "before": "Fyrir:",
                                     "after": "Eftir:",
+                                    "before_offset": "Fyrir hliðrun (valfrjálst)",
+                                    "after_offset": "Eftir hliðrun (valfrjálst)",
                                     "sunrise": "Sólarupprás",
                                     "sunset": "Sólsetur"
                                 },
@@ -503,7 +514,12 @@
                                     "zone": "Öryggissvæði"
                                 },
                                 "device": {
-                                    "label": "Tæki"
+                                    "label": "Tæki",
+                                    "extra_fields": {
+                                        "above": "Yfir",
+                                        "below": "Undir",
+                                        "for": "Tímalengd"
+                                    }
                                 },
                                 "and": {
                                     "label": "Og"
@@ -561,7 +577,10 @@
                 },
                 "script": {
                     "caption": "Skrifta",
-                    "description": "Búa til og breyta skriftum"
+                    "description": "Búa til og breyta skriftum",
+                    "picker": {
+                        "learn_more": "Læra meira um skriftur"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -592,7 +611,8 @@
                         "seconds": "sekúndur",
                         "config_value": "Stillingargildi",
                         "set_config_parameter": "Stilltu Config Parameter"
-                    }
+                    },
+                    "learn_more": "Læra meira um Z-Wave"
                 },
                 "users": {
                     "caption": "Notendur",
@@ -606,7 +626,13 @@
                         "activate_user": "Virkja notanda",
                         "deactivate_user": "Gera notanda óvirkan",
                         "delete_user": "Eyða notanda",
-                        "caption": "Skoða notanda"
+                        "caption": "Skoða notanda",
+                        "id": "ID",
+                        "owner": "Eigandi",
+                        "group": "Hópur",
+                        "active": "Virkur",
+                        "unnamed_user": "Ónefndur notandi",
+                        "enter_new_name": "Sláðu inn nýtt nafn"
                     },
                     "add_user": {
                         "caption": "Bæta við notanda",
@@ -620,7 +646,77 @@
                     "caption": "Home Assistant skýið",
                     "description_login": "Innskráð(ur) sem {email}",
                     "description_not_login": "Ekki skráð(ur) inn",
-                    "description_features": "Stjórna heimili að heiman með Alexa og Google Assistant."
+                    "description_features": "Stjórna heimili að heiman með Alexa og Google Assistant.",
+                    "login": {
+                        "learn_more_link": "Læra meira um Home Assistant skýið",
+                        "dismiss": "Vísa frá",
+                        "sign_in": "Skrá inn",
+                        "email": "Netfang",
+                        "email_error_msg": "Ógilt netfang",
+                        "password": "Lykilorð",
+                        "password_error_msg": "Lykilorð eru að minnsta kosti 8 stafir",
+                        "forgot_password": "gleymt lykilorð?",
+                        "alert_password_change_required": "Þú verður að breyta lykilorðinu þínu áður en þú skráir þig inn.",
+                        "alert_email_confirm_necessary": "Þú þarft að staðfesta tölvupóstinn þinn áður en þú skráir þig inn."
+                    },
+                    "forgot_password": {
+                        "title": "Gleymt lykilorð",
+                        "subtitle": "Gleymdirðu lykilorðinu þínu",
+                        "email": "Netfang",
+                        "email_error_msg": "Ógilt netfang"
+                    },
+                    "register": {
+                        "feature_google_home": "Samþætting við Google Assistant",
+                        "feature_amazon_alexa": "Samþætting við Amazon Alexa",
+                        "link_terms_conditions": "Skilmálar og skilyrði",
+                        "link_privacy_policy": "Friðhelgisstefna",
+                        "create_account": "Stofna aðgang",
+                        "email_address": "Netfang",
+                        "email_error_msg": "Ógilt netfang",
+                        "password": "Lykilorð",
+                        "resend_confirm_email": "Endursenda staðfestingarpóst"
+                    },
+                    "account": {
+                        "nabu_casa_account": "Nabu Casa aðgangur",
+                        "sign_out": "Skrá út",
+                        "integrations": "Samþættingar",
+                        "connected": "Tengdur",
+                        "not_connected": "Ekki tengdur",
+                        "fetching_subscription": "Sæki áskrift...",
+                        "remote": {
+                            "title": "Fjarstýring",
+                            "link_learn_how_it_works": "Læra hvernig þetta virkar",
+                            "certificate_info": "Upplýsingar skilríkis"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "enable": "virkja",
+                            "disable": "afvirkja"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "security_devices": "Öryggistæki"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "loading": "Hleð ..."
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa"
+                    },
+                    "dialog_certificate": {
+                        "fingerprint": "Fingrafar skilríkis:",
+                        "close": "Loka"
+                    },
+                    "google": {
+                        "title": "Google Assistant"
+                    },
+                    "dialog_cloudhook": {
+                        "close": "Loka",
+                        "confirm_disable": "Ertu viss um að þú viljir afvirkja þennan vefkrók?",
+                        "copied_to_clipboard": "Afritað á klemmuspjald"
+                    }
                 },
                 "integrations": {
                     "caption": "Samþættingar",
@@ -648,7 +744,8 @@
                             "description": "Þetta skref krefst þess að þú heimsækir ytri vefsíðu svo hægt sé að ljúka þessu skrefi.",
                             "open_site": "Opna vefsíðu"
                         }
-                    }
+                    },
+                    "home_assistant_website": "Vefsíða Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -665,7 +762,20 @@
                     "add_device_page": {
                         "header": "Zigbee sjálfvirkni - Bæta við tækjum",
                         "spinner": "Leitað að ZHA Zigbee tækjum...",
-                        "discovery_text": "Uppgötvuð tæki munu birtast hér. Fylgdu leiðbeiningunum fyrir tækið þitt og setjið tækið í pörunarstillingu."
+                        "discovery_text": "Uppgötvuð tæki munu birtast hér. Fylgdu leiðbeiningunum fyrir tækið þitt og setjið tækið í pörunarstillingu.",
+                        "search_again": "Leita aftur"
+                    },
+                    "common": {
+                        "add_devices": "Bæta við tækjum",
+                        "clusters": "Klasar",
+                        "devices": "Tæki",
+                        "value": "Gildi"
+                    },
+                    "network_management": {
+                        "header": "Netumsýsla"
+                    },
+                    "node_management": {
+                        "header": "Tækjaumsýsla"
                     }
                 },
                 "area_registry": {
@@ -696,14 +806,18 @@
                         "unavailable": "(ekki tiltækt)",
                         "introduction": "Home Assistant heldur bókhald utanum allar einingar sem verið greindar. Hver þessara eininga hafa einingar-auðkenni (ID) sem er frátekið bara fyrir þessa tilteknu einingu.",
                         "integrations_page": "Samþættingar síða",
-                        "show_disabled": "Sýna afvirkjaðar einingar"
+                        "show_disabled": "Sýna afvirkjaðar einingar",
+                        "headers": {
+                            "name": "Nafn"
+                        }
                     },
                     "editor": {
                         "unavailable": "Þessi eining er ekki tiltæk eins og er.",
                         "default_name": "Nýtt svæði",
                         "delete": "EYÐA",
                         "update": "UPPFÆRA",
-                        "enabled_label": "Virkja einingu"
+                        "enabled_label": "Virkja einingu",
+                        "enabled_cause": "Afvirkjað vegna {cause}."
                     }
                 },
                 "person": {
@@ -713,8 +827,19 @@
                         "name": "Nafn",
                         "device_tracker_intro": "Veldu tæki sem tilheyrir þessari persónu.",
                         "device_tracker_picked": "Rekja tæki",
-                        "device_tracker_pick": "Velja tæki til að rekja"
-                    }
+                        "device_tracker_pick": "Velja tæki til að rekja",
+                        "new_person": "Ný persóna",
+                        "name_error_msg": "Nafn er skilyrt",
+                        "linked_user": "Tengdur notandi",
+                        "link_integrations_page": "Samþættingar síða",
+                        "delete": "Eyða",
+                        "create": "Stofna",
+                        "update": "Uppfæra"
+                    },
+                    "create_person": "Stofna persónu",
+                    "add_person": "Bæta við persónu",
+                    "confirm_delete": "Ertu viss um að þú viljir eyða þessari persónu?",
+                    "confirm_delete2": "Öll tæki sem tilheyra þessari persónu munu verða óúthlutuð."
                 },
                 "server_control": {
                     "caption": "Stjórnun þjóns",
@@ -783,6 +908,8 @@
                     "dropdown_label": "Þema"
                 },
                 "refresh_tokens": {
+                    "header": "Uppfæra tóka",
+                    "token_title": "Uppfæra tóka fyrir {clientId}",
                     "created_at": "Búið til þann {date}",
                     "delete_failed": "Ekki tókst að eyða endurnýjunartókanum.",
                     "last_used": "Síðast notaður þann {date} frá {location}",
@@ -953,6 +1080,7 @@
                 "core-config": {
                     "intro": "Hæ {name}, velkomin(n) í Home Assistant. Hvað á heimilið þitt að heita?",
                     "intro_location": "Okkur langar að vita hvar þú býrð. Þessar upplýsingar munu hjálpa varðandi upplýsingar og uppsetningu á sólar-tengdri sjálfvirkni. Þessum upplýsingum er aldrei deilt út fyrir þitt net.",
+                    "intro_location_detect": "Við getum aðstoðað þig við að fylla út þessar upplýsingar með því að kalla einu sinni á utanaðkomandi þjónustu til að sækja þær.",
                     "location_name_default": "Heima",
                     "button_detect": "Uppgötva",
                     "finish": "Næsta"
@@ -976,7 +1104,8 @@
                         "navigate_to": "Fara yfir á {location}",
                         "toggle": "Víxla {name}",
                         "call_service": "Kalla í þjónustu {name}",
-                        "more_info": "Sýna frekari upplýsingar: {name}"
+                        "more_info": "Sýna frekari upplýsingar: {name}",
+                        "url": "Opna glugga á {url_path}"
                     }
                 },
                 "editor": {
@@ -988,7 +1117,9 @@
                         "add": "Bæta við spjaldi",
                         "edit": "Breyta",
                         "delete": "Eyða",
-                        "move": "Færa"
+                        "move": "Færa",
+                        "show_visual_editor": "Birta sjónrænan ritil",
+                        "show_code_editor": "Birta kóða ritil"
                     },
                     "migrate": {
                         "header": "Ósamhæfðar stillingar",
@@ -1031,7 +1162,8 @@
                                 "green": "Grænt",
                                 "red": "Rautt",
                                 "yellow": "Gult"
-                            }
+                            },
+                            "name": "Mælir"
                         },
                         "glance": {
                             "columns": "Dálkar"
@@ -1057,10 +1189,54 @@
                         },
                         "map": {
                             "dark_mode": "Dökkur hamur?",
-                            "default_zoom": "Sjálfgefinn aðdráttur"
+                            "default_zoom": "Sjálfgefinn aðdráttur",
+                            "name": "Kort"
                         },
                         "markdown": {
-                            "content": "Innihald"
+                            "content": "Innihald",
+                            "name": "Markdown"
+                        },
+                        "alarm-panel": {
+                            "available_states": "Tiltækar stöður"
+                        },
+                        "entities": {
+                            "name": "Einingar"
+                        },
+                        "entity-button": {
+                            "name": "Eininga hnappur"
+                        },
+                        "entity-filter": {
+                            "name": "Eininga sía"
+                        },
+                        "history-graph": {
+                            "name": "Sögulínurit"
+                        },
+                        "horizontal-stack": {
+                            "name": "Láréttur stafli"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Ljós"
+                        },
+                        "picture": {
+                            "name": "Mynd"
+                        },
+                        "plant-status": {
+                            "name": "Staða plöntu"
+                        },
+                        "sensor": {
+                            "name": "Skynjari"
+                        },
+                        "shopping-list": {
+                            "name": "Innkaupalisti"
+                        },
+                        "thermostat": {
+                            "name": "Hitastillir"
+                        },
+                        "vertical-stack": {
+                            "name": "Lóðréttur stafli"
                         }
                     }
                 },
@@ -1185,18 +1361,24 @@
             },
             "alarm_control_panel": {
                 "code": "Kóði",
-                "clear_code": "Hreinsa"
+                "clear_code": "Hreinsa",
+                "armed_custom_bypass": "Sérsniðin hjáleið",
+                "arm_custom_bypass": "Sérsniðin hjáleið"
             },
             "automation": {
                 "last_triggered": "Síðast kveikt",
                 "trigger": "Kveikja"
             },
             "cover": {
-                "position": "Staðsetning"
+                "position": "Staðsetning",
+                "tilt_position": "Hallastaða"
             },
             "fan": {
                 "speed": "Hraði",
-                "direction": "Snúningsátt"
+                "oscillate": "Sveiflast",
+                "direction": "Snúningsátt",
+                "forward": "Áfram",
+                "reverse": "Afturábak"
             },
             "light": {
                 "brightness": "Birtustig",
@@ -1320,7 +1502,10 @@
                 "zha_device_card": {
                     "area_picker_label": "Svæði",
                     "update_name_button": "Uppfæra nafn"
-                }
+                },
+                "last_seen": "Síðast séð",
+                "power_source": "Orkugjafi",
+                "unknown": "Óþekkt"
             }
         },
         "auth_store": {
@@ -1393,6 +1578,7 @@
                 "none": "Ekkert",
                 "eco": "Sparnaður",
                 "away": "Fjarverandi",
+                "boost": "Uppörvun",
                 "comfort": "Þægindi",
                 "home": "Heima",
                 "sleep": "Svefn",
diff --git a/translations/it.json b/translations/it.json
index 09bcc1289f..8c08b75763 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -558,7 +558,12 @@
                                     "zone": "Zona"
                                 },
                                 "device": {
-                                    "label": "Dispositivo"
+                                    "label": "Dispositivo",
+                                    "extra_fields": {
+                                        "above": "Sopra",
+                                        "below": "Sotto",
+                                        "for": "Durata"
+                                    }
                                 },
                                 "and": {
                                     "label": "E"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Dispositivo"
+                                },
+                                "scene": {
+                                    "label": "Attivare la scena"
                                 }
                             },
                             "learn_more": "Per saperne di più sulle azioni"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Script",
-                    "description": "Crea e modifica script"
+                    "description": "Crea e modifica script",
+                    "picker": {
+                        "header": "Editor di script",
+                        "introduction": "L'editor di script consente di creare e modificare script. Seguire il collegamento seguente per leggere le istruzioni per assicurarsi di aver configurato correttamente Home Assistant.",
+                        "learn_more": "Ulteriori informazioni sugli script",
+                        "no_scripts": "Non è stato possibile trovare alcuno script modificabile",
+                        "add_script": "Aggiungi script"
+                    },
+                    "editor": {
+                        "header": "Script: {name}",
+                        "default_name": "Nuovo Script",
+                        "load_error_not_editable": "Solo gli script all'interno di scripts.yaml sono modificabili.",
+                        "delete_confirm": "Sei sicuro di voler eliminare questo script?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Vero",
                         "false": "Falso",
                         "set_config_parameter": "Imposta parametro di configurazione"
+                    },
+                    "learn_more": "Ulteriori informazioni su Z-Wave",
+                    "ozw_log": {
+                        "header": "Registro OZW",
+                        "introduction": "Guarda il registro. 0 è il minimo (carica l'intero log) e 1000 è il massimo. Load mostrerà un log statico e la coda si aggiornerà automaticamente con l'ultimo numero di righe specificato del log."
                     }
                 },
                 "users": {
                     "caption": "Utenti",
                     "description": "Gestisci gli utenti",
                     "picker": {
-                        "title": "Utenti"
+                        "title": "Utenti",
+                        "system_generated": "Generato dal sistema"
                     },
                     "editor": {
                         "rename_user": "Rinomina utente",
@@ -678,7 +705,18 @@
                         "activate_user": "Attiva utente",
                         "deactivate_user": "Disattiva utente",
                         "delete_user": "Elimina utente",
-                        "caption": "Visualizza utente"
+                        "caption": "Visualizza utente",
+                        "id": "ID",
+                        "owner": "Proprietario",
+                        "group": "Gruppo",
+                        "active": "Attivo",
+                        "system_generated": "Generato dal sistema",
+                        "system_generated_users_not_removable": "Impossibile rimuovere gli utenti generati dal sistema.",
+                        "unnamed_user": "Utente senza nome",
+                        "enter_new_name": "Inserisci un nuovo nome",
+                        "user_rename_failed": "Rinominazione dell'utente fallita:",
+                        "group_update_failed": "L'aggiornamento del gruppo non è riuscito:",
+                        "confirm_user_deletion": "Sei sicuro di voler eliminare {name} ?"
                     },
                     "add_user": {
                         "caption": "Aggiungi utente",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Connesso come {email}",
                     "description_not_login": "Accesso non effettuato",
-                    "description_features": "Controllo fuori casa, integrazione con Alexa e Google Assistant."
+                    "description_features": "Controllo fuori casa, integrazione con Alexa e Google Assistant.",
+                    "login": {
+                        "title": "Accesso al cloud",
+                        "introduction": "Home Assistant Cloud fornisce una connessione remota sicura alla tua istanza quando sei lontano da casa. Consente inoltre di connettersi con i servizi cloud: Amazon Alexa e Google Assistant.",
+                        "introduction2": "Questo servizio è gestito dal nostro partner",
+                        "introduction2a": ", una società fondata dai fondatori di Home Assistant e Hass.io.",
+                        "introduction3": "Home Assistant Cloud è un servizio in abbonamento con un mese di prova gratuita. Non sono necessarie informazioni di pagamento.",
+                        "learn_more_link": "Ulteriori informazioni su Home Assistant Cloud",
+                        "dismiss": "Respingere",
+                        "sign_in": "Accedi",
+                        "email": "E-mail",
+                        "email_error_msg": "E-mail non valida",
+                        "password": "Password",
+                        "password_error_msg": "Le password sono di almeno 8 caratteri",
+                        "forgot_password": "Hai dimenticato la password?",
+                        "start_trial": "Inizia la tua prova gratuita di 1 mese",
+                        "trial_info": "Nessuna informazione di pagamento necessaria",
+                        "alert_password_change_required": "È necessario modificare la password prima di effettuare l'accesso.",
+                        "alert_email_confirm_necessary": "È necessario confermare l'e-mail prima di effettuare l'accesso."
+                    },
+                    "forgot_password": {
+                        "title": "Password dimenticata",
+                        "subtitle": "Hai dimenticato la password",
+                        "instructions": "Inserisci il tuo indirizzo email e ti invieremo un link per reimpostare la password.",
+                        "email": "E-mail",
+                        "email_error_msg": "E-mail non valida",
+                        "send_reset_email": "Invia e-mail di ripristino",
+                        "check_your_email": "Controlla la tua email per le istruzioni su come reimpostare la tua password."
+                    },
+                    "register": {
+                        "title": "Registra account",
+                        "headline": "Inizia la tua prova gratuita",
+                        "information": "Crea un account per iniziare la tua prova gratuita di un mese con Home Assistant Cloud. Non sono necessarie informazioni di pagamento.",
+                        "information2": "La versione di prova ti darà accesso a tutti i vantaggi di Home Assistant Cloud, tra cui:",
+                        "feature_remote_control": "Controllo di Home Assistant lontano da casa",
+                        "feature_google_home": "Integrazione con Google Assistant",
+                        "feature_amazon_alexa": "Integrazione con Amazon Alexa",
+                        "feature_webhook_apps": "Facile integrazione con applicazioni basate su webhook come OwnTracks",
+                        "information3": "Questo servizio è gestito dal nostro partner ",
+                        "information3a": ", una società fondata dai fondatori di Home Assistant e Hass.io.",
+                        "information4": "Registrando un account accetti i seguenti termini e condizioni.",
+                        "link_terms_conditions": "Termini e condizioni",
+                        "link_privacy_policy": "Informativa sulla privacy",
+                        "create_account": "Crea un account",
+                        "email_address": "Indirizzo e-mail",
+                        "email_error_msg": "Email non valida",
+                        "password": "Password",
+                        "password_error_msg": "Le password sono di almeno 8 caratteri",
+                        "start_trial": "Inizia la prova",
+                        "resend_confirm_email": "Inviare di nuovo l'e-mail di conferma",
+                        "account_created": "Account creato! Controlla la tua email per istruzioni su come attivare il tuo account."
+                    },
+                    "account": {
+                        "thank_you_note": "Grazie per far parte di Home Assistant Cloud. È grazie a persone come te che siamo in grado di creare un'ottima esperienza domotica per tutti. Grazie!",
+                        "nabu_casa_account": "Account Nabu Casa",
+                        "connection_status": "Stato della connessione cloud",
+                        "manage_account": "Gestisci account",
+                        "sign_out": "Esci",
+                        "integrations": "Integrazioni",
+                        "integrations_introduction": "Le integrazioni per Home Assistant Cloud ti permettono di connetterti con i servizi nel cloud senza dover esporre pubblicamente la tua istanza di Home Assistant su Internet.",
+                        "integrations_introduction2": "Controlla il sito web per ",
+                        "integrations_link_all_features": " tutte le funzioni disponibili",
+                        "connected": "Connesso",
+                        "not_connected": "Non Connesso",
+                        "fetching_subscription": "Recupero abbonamento ...",
+                        "remote": {
+                            "title": "Telecomando",
+                            "access_is_being_prepared": "È in fase di preparazione l'accesso remoto. Ti avviseremo quando sarà pronto.",
+                            "info": "Home Assistant Cloud fornisce una connessione remota sicura alla tua istanza mentre sei fuori casa.",
+                            "instance_is_available": "La tua istanza è disponibile su",
+                            "instance_will_be_available": "La tua istanza sarà disponibile su",
+                            "link_learn_how_it_works": "Scopri come funziona",
+                            "certificate_info": "Informazioni sul certificato"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Con l'integrazione Alexa per Home Assistant Cloud sarete in grado di controllare tutti i vostri dispositivi Home Assistant tramite qualsiasi dispositivo abilitato Alexa.",
+                            "enable_ha_skill": "Abilitare la skill Home Assistant per Alexa",
+                            "config_documentation": "Documentazione di configurazione",
+                            "enable_state_reporting": "Attivare la segnalazione dello stato",
+                            "info_state_reporting": "Se si abilita la segnalazione dello stato, Home Assistant invierà ad Amazon tutte le modifiche di stato delle entità esposte. Questo permette di vedere sempre gli ultimi stati nell'app Alexa e di utilizzare i cambiamenti di stato per creare routine.",
+                            "sync_entities": "Sincronizza entità",
+                            "manage_entities": "Gestire le entità",
+                            "sync_entities_error": "Impossibile sincronizzare le entità:",
+                            "state_reporting_error": "Impossibile a {enable_disable} segnalare lo stato.",
+                            "enable": "abilitare",
+                            "disable": "disabilitare"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "Con l'integrazione di Google Assistant per Home Assistant Cloud sarai in grado di controllare tutti i tuoi dispositivi Home Assistant tramite qualsiasi dispositivo abilitato per Google Assistant.",
+                            "enable_ha_skill": "Abilitare la skill Home Assistant per Google Assistant",
+                            "config_documentation": "Documentazione di configurazione",
+                            "enable_state_reporting": "Attivare la segnalazione dello Stato",
+                            "info_state_reporting": "Se si abilita la segnalazione dello stato, Home Assistant invierà a Google tutte le modifiche di stato delle entità esposte. Questo ti permette di vedere sempre gli ultimi stati nell'app di Google.",
+                            "security_devices": "Dispositivi di sicurezza",
+                            "enter_pin_info": "Inserisci un PIN per interagire con i dispositivi di sicurezza. I dispositivi di sicurezza sono porte, porte da garage e serrature. Ti verrà chiesto di dire\/inserire questo PIN quando interagisci con tali dispositivi tramite Google Assistant.",
+                            "devices_pin": "PIN dei dispositivi di sicurezza",
+                            "enter_pin_hint": "Immettere un PIN per utilizzare i dispositivi di sicurezza",
+                            "sync_entities": "Sincronizzare le entità con Google",
+                            "manage_entities": "Gestire le entità",
+                            "enter_pin_error": "Impossibile memorizzare il pin:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Tutto ciò che è configurato per essere attivato da un webhook può essere dotato di un URL accessibile pubblicamente per consentire di inviare i dati all'Home Assistant da qualsiasi luogo, senza esporre la vostra istanza a Internet.",
+                            "no_hooks_yet": "Sembra che tu non abbia ancora dei webhook. Per iniziare, configurare un ",
+                            "no_hooks_yet_link_integration": "Integrazione basata su webhook",
+                            "no_hooks_yet2": " o creando un ",
+                            "no_hooks_yet_link_automation": "automazione webhook",
+                            "link_learn_more": "Ulteriori informazioni sulla creazione di automazioni basate su webhook.",
+                            "loading": "Caricamento in corso ...",
+                            "manage": "Gestire",
+                            "disable_hook_error_msg": "Impossibile disabilitare webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "La modifica delle entità esposte tramite questa interfaccia utente è disabilitata perché sono stati configurati filtri di entità in configuration.yaml.",
+                        "exposed_entities": "Entità esposte",
+                        "not_exposed_entities": "Entità non esposte",
+                        "expose": "Esporre ad Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Informazioni sul certificato",
+                        "certificate_expiration_date": "Data di scadenza del certificato",
+                        "will_be_auto_renewed": "Sarà rinnovato automaticamente",
+                        "fingerprint": "Impronta digitale del certificato:",
+                        "close": "Chiudi"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Esporre a Google Assistant",
+                        "disable_2FA": "Disattivare l'autenticazione a due fattori",
+                        "banner": "La modifica delle entità esposte tramite questa interfaccia utente è disabilitata perché sono stati configurati filtri di entità in configuration.yaml.",
+                        "exposed_entities": "Entità esposte",
+                        "not_exposed_entities": "Entità non esposte",
+                        "sync_to_google": "Sincronizzazione delle modifiche a Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook per {name}",
+                        "available_at": "Il webhook è disponibile al seguente URL:",
+                        "managed_by_integration": "Questo webhook è gestito da un'integrazione e non può essere disabilitato.",
+                        "info_disable_webhook": "Se non si desidera più utilizzare questo webhook, è possibile",
+                        "link_disable_webhook": "disabilitarlo",
+                        "view_documentation": "Visualizza la documentazione",
+                        "close": "Chiudi",
+                        "confirm_disable": "Sei sicuro di voler disabilitare questo webhook?",
+                        "copied_to_clipboard": "Copiato negli appunti"
+                    }
                 },
                 "integrations": {
                     "caption": "Integrazioni",
@@ -720,7 +907,10 @@
                             "description": "Questo passaggio richiede di visitare un sito Web esterno per essere completato.",
                             "open_site": "Apri sito Web"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Non tutte le integrazioni possono ancora essere configurate tramite l'interfaccia utente.",
+                    "note_about_website_reference": "Ulteriori informazioni sono disponibili su ",
+                    "home_assistant_website": "Sito Web di Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Aggiungi dispositivi",
                         "spinner": "Ricerca di dispositivi ZHA Zigbee ...",
-                        "discovery_text": "I dispositivi rilevati verranno visualizzati qui. Seguire le istruzioni per il \/ i dispositivo \/ i e posizionare il \/ i dispositivo \/ i in modalità accoppiamento."
+                        "discovery_text": "I dispositivi rilevati verranno visualizzati qui. Seguire le istruzioni per il \/ i dispositivo \/ i e posizionare il \/ i dispositivo \/ i in modalità accoppiamento.",
+                        "search_again": "Cerca di nuovo"
+                    },
+                    "common": {
+                        "add_devices": "Aggiungi dispositivi",
+                        "clusters": "Clusters",
+                        "devices": "Dispositivi",
+                        "manufacturer_code_override": "Sostituzione codice produttore",
+                        "value": "Valore"
+                    },
+                    "network_management": {
+                        "header": "Gestione della rete",
+                        "introduction": "Comandi che influiscono sull'intera rete"
+                    },
+                    "node_management": {
+                        "header": "Gestione dei dispositivi",
+                        "introduction": "Eseguire i comandi ZHA che interessano un singolo dispositivo. Scegliere un dispositivo per visualizzare un elenco di comandi disponibili.",
+                        "hint_battery_devices": "Nota: i dispositivi sleepy (alimentati a batteria) devono essere svegli durante l'esecuzione di comandi contro di essi. Generalmente è possibile riattivare un dispositivo dormiente attivandolo.",
+                        "hint_wakeup": "Alcuni dispositivi, come i sensori Xiaomi, hanno un pulsante di riattivazione che è possibile premere a intervalli di 5 secondi che mantengono i dispositivi svegli mentre si interagisce con loro.",
+                        "help_node_dropdown": "Selezionare un dispositivo per visualizzare le opzioni per dispositivo."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Selezionare un cluster per visualizzare attributi e comandi."
+                    },
+                    "cluster_attributes": {
+                        "header": "Attributi del cluster",
+                        "introduction": "Visualizza e modifica gli attributi del cluster.",
+                        "attributes_of_cluster": "Attributi del cluster selezionato",
+                        "get_zigbee_attribute": "Ottieni l'attributo Zigbee",
+                        "set_zigbee_attribute": "Imposta l'attributo Zigbee",
+                        "help_attribute_dropdown": "Selezionare un attributo da visualizzare o impostare il suo valore.",
+                        "help_get_zigbee_attribute": "Ottieni il valore per l'attributo selezionato.",
+                        "help_set_zigbee_attribute": "Impostare il valore dell'attributo per il cluster specificato nell'entità specificata."
+                    },
+                    "cluster_commands": {
+                        "header": "Comandi cluster",
+                        "introduction": "Visualizzare ed eseguire comandi cluster.",
+                        "commands_of_cluster": "Comandi del cluster selezionato",
+                        "issue_zigbee_command": "Emettere il comando Zigbee",
+                        "help_command_dropdown": "Selezionare un comando con cui interagire."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant mantiene un registro di tutte le entità che ha mai localizzato e possono essere identificate in modo univoco. A ciascuna di queste entità sarà assegnato un ID che sarà riservato solo a questa entità.",
                         "introduction2": "Utilizzare il registro delle entità per sovrascrivere il nome, modificare l'entity ID o rimuovere la voce da Home Assistant. Nota, la rimozione della voce del registro entità non rimuoverà l'entità. Per farlo, segui il link sottostante e rimuovilo dalla pagina delle integrazioni.",
                         "integrations_page": "Integrazioni",
-                        "show_disabled": "Mostra entità disabilitate"
+                        "show_disabled": "Mostra entità disabilitate",
+                        "headers": {
+                            "name": "Nome",
+                            "entity_id": "ID entità",
+                            "integration": "Integrazione",
+                            "enabled": "Abilitato"
+                        }
                     },
                     "editor": {
                         "unavailable": "Questa entità non è attualmente disponibile.",
@@ -791,8 +1026,24 @@
                         "name": "Nome",
                         "device_tracker_intro": "Seleziona i dispositivi che appartengono a questa persona.",
                         "device_tracker_picked": "Traccia dispositivo",
-                        "device_tracker_pick": "Scegli il dispositivo da tracciare"
-                    }
+                        "device_tracker_pick": "Scegli il dispositivo da tracciare",
+                        "new_person": "Nuova Persona",
+                        "name_error_msg": "Il nome è obbligatorio",
+                        "linked_user": "Utente collegato",
+                        "no_device_tracker_available_intro": "Quando disponi di dispositivi che indicano la presenza di una persona, sarai in grado di assegnarli a essa qui. Puoi aggiungere il tuo primo dispositivo aggiungendo un'integrazione di rilevamento presenza dalla pagina delle integrazioni.",
+                        "link_presence_detection_integrations": "Integrazioni di rilevamento presenza",
+                        "link_integrations_page": "Integrazioni",
+                        "delete": "Elimina",
+                        "create": "Crea",
+                        "update": "Aggiorna"
+                    },
+                    "introduction": "Qui è possibile definire ogni persona di interesse in Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Nota: le persone configurate tramite configuration.yaml non possono essere modificate tramite l'interfaccia utente.",
+                    "no_persons_created_yet": "Sembra che tu non abbia ancora creato nessuna persona.",
+                    "create_person": "Crea persona",
+                    "add_person": "Aggiungi persona",
+                    "confirm_delete": "Sei sicuro di voler cancellare questa persona?",
+                    "confirm_delete2": "Tutti i dispositivi appartenenti a questa persona non saranno assegnati."
                 },
                 "server_control": {
                     "caption": "Gestione del server",
@@ -838,6 +1089,11 @@
                             "caption": "Quando qualcosa si attiva..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Hai dei cambiamenti non salvati. Sei sicuro di voler andare via?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Vibrare",
                     "description": "Abilitare o disabilitare la vibrazione su questo dispositivo durante il controllo dei dispositivi."
+                },
+                "advanced_mode": {
+                    "title": "Modalità avanzata",
+                    "description": "Home Assistant nasconde le funzioni e le opzioni avanzate per impostazione predefinita. È possibile rendere accessibili queste funzionalità selezionando questo interruttore. Si tratta di un'impostazione specifica dell'utente e non influisce sugli altri utenti che utilizzano Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Aggiungi scheda",
                         "edit": "Modifica",
                         "delete": "Elimina",
-                        "move": "Sposta"
+                        "move": "Sposta",
+                        "show_visual_editor": "Mostra Editor Visivo",
+                        "show_code_editor": "Mostra Editor di Codice"
                     },
                     "migrate": {
                         "header": "Configurazione incompatibile",
@@ -1121,7 +1383,8 @@
                             "optional": "Facoltativo"
                         },
                         "entities": {
-                            "show_header_toggle": "Mostrare l'interruttore dell'intestazione?"
+                            "show_header_toggle": "Mostrare l'interruttore dell'intestazione?",
+                            "name": "Entità"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Verde",
                                 "red": "Rosso",
                                 "yellow": "Giallo"
-                            }
+                            },
+                            "name": "Indicatore"
                         },
                         "glance": {
-                            "columns": "Colonne"
+                            "columns": "Colonne",
+                            "name": "Vista"
                         },
                         "generic": {
                             "aspect_ratio": "Proporzioni",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Fonti di geolocalizzazione",
                             "dark_mode": "Modalità scura?",
                             "default_zoom": "Ingrandimento predefinito",
-                            "source": "Fonte"
+                            "source": "Fonte",
+                            "name": "Mappa"
                         },
                         "markdown": {
-                            "content": "Contenuto"
+                            "content": "Contenuto",
+                            "name": "Riduzione"
                         },
                         "sensor": {
                             "graph_detail": "Dettaglio grafico",
-                            "graph_type": "Tipo di grafico"
+                            "graph_type": "Tipo di grafico",
+                            "name": "Sensore"
+                        },
+                        "alarm-panel": {
+                            "name": "Pannello di allarme",
+                            "available_states": "Stati disponibili"
+                        },
+                        "conditional": {
+                            "name": "Condizionale"
+                        },
+                        "entity-button": {
+                            "name": "Pulsante Entità"
+                        },
+                        "entity-filter": {
+                            "name": "Filtro Entità"
+                        },
+                        "history-graph": {
+                            "name": "Grafico cronologico"
+                        },
+                        "horizontal-stack": {
+                            "name": "Pila orizzontale"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Luce"
+                        },
+                        "media-control": {
+                            "name": "Controllo dei media"
+                        },
+                        "picture": {
+                            "name": "Immagine"
+                        },
+                        "picture-elements": {
+                            "name": "Elementi immagine"
+                        },
+                        "picture-entity": {
+                            "name": "Entità immagine"
+                        },
+                        "picture-glance": {
+                            "name": "Vista immagine"
+                        },
+                        "plant-status": {
+                            "name": "Stato dell'impianto"
+                        },
+                        "shopping-list": {
+                            "name": "Lista della spesa"
+                        },
+                        "thermostat": {
+                            "name": "Termostato"
+                        },
+                        "vertical-stack": {
+                            "name": "Pila verticale"
+                        },
+                        "weather-forecast": {
+                            "name": "Previsioni del tempo"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "Spenta {entity}.",
             "service_called": "Servizio {service} chiamato.",
             "service_call_failed": "Fallita chiamata a servizio {service} .",
-            "connection_lost": "Connessione persa. Riconnessione..."
+            "connection_lost": "Connessione persa. Riconnessione...",
+            "triggered": "Attivato {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "Nome assegnato dall'utente",
                     "area_picker_label": "Area",
                     "update_name_button": "Aggiorna nome"
-                }
+                },
+                "buttons": {
+                    "add": "Aggiungi dispositivi",
+                    "remove": "Rimuovi dispositivo",
+                    "reconfigure": "Riconfigura dispositivo"
+                },
+                "quirk": "Quirk",
+                "last_seen": "Ultima visualizzazione",
+                "power_source": "Sorgente di alimentazione",
+                "unknown": "Sconosciuto"
             }
         },
         "auth_store": {
diff --git a/translations/ko.json b/translations/ko.json
index 091b72f5b7..e6d9813d62 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -4,7 +4,7 @@
         "states": "둘러보기",
         "map": "지도",
         "logbook": "로그북",
-        "history": "히스토리",
+        "history": "기록 그래프",
         "mailbox": "메일함",
         "shopping_list": "장보기목록",
         "dev-info": "정보",
@@ -207,7 +207,7 @@
             "on": "켜짐"
         },
         "scene": {
-            "scening": "씬구성중"
+            "scening": "씬 구성중"
         },
         "script": {
             "off": "꺼짐",
@@ -558,7 +558,12 @@
                                     "zone": "구역"
                                 },
                                 "device": {
-                                    "label": "기기"
+                                    "label": "기기",
+                                    "extra_fields": {
+                                        "above": "이상",
+                                        "below": "이하",
+                                        "for": "동안"
+                                    }
                                 },
                                 "and": {
                                     "label": "다중조건 (그리고)"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "기기"
+                                },
+                                "scene": {
+                                    "label": "씬 활성화"
                                 }
                             },
                             "learn_more": "동작에 대해 더 알아보기"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "스크립트",
-                    "description": "스크립트를 만들고 편집합니다"
+                    "description": "스크립트를 만들고 편집합니다",
+                    "picker": {
+                        "header": "스크립트 편집기",
+                        "introduction": "스크립트 편집기를 사용하여 스크립트를 작성하고 편집 할 수 있습니다. 아래 링크를 따라 안내사항을 읽고 Home Assistant 를 올바르게 구성했는지 확인해보세요.",
+                        "learn_more": "스크립트에 대해 더 알아보기",
+                        "no_scripts": "편집 가능한 스크립트를 찾을 수 없습니다",
+                        "add_script": "스크립트 추가"
+                    },
+                    "editor": {
+                        "header": "스크립트: {name}",
+                        "default_name": "새로운 스크립트",
+                        "load_error_not_editable": "scripts.yaml 의 스크립트만 편집할 수 있습니다.",
+                        "delete_confirm": "이 스크립트를 삭제 하시겠습니까?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "참",
                         "false": "거짓",
                         "set_config_parameter": "구성 파라메터 설정"
+                    },
+                    "learn_more": "Z-Wave 에 대해 더 알아보기",
+                    "ozw_log": {
+                        "header": "OZW 로그",
+                        "introduction": "로그를 봐주세요. 0은 최소값(전체 로그 로드)이고 1000은 최대값입니다. 로드는 정적 로그를 보여주며 로그의 마지막은 최근 지정된 로그의 행으로 자동으로 업데이트됩니다."
                     }
                 },
                 "users": {
                     "caption": "사용자",
                     "description": "사용자를 관리합니다",
                     "picker": {
-                        "title": "사용자"
+                        "title": "사용자",
+                        "system_generated": "시스템 자동 생성"
                     },
                     "editor": {
                         "rename_user": "사용자 이름 변경",
@@ -678,7 +705,18 @@
                         "activate_user": "사용자 활성화",
                         "deactivate_user": "사용자 비활성화",
                         "delete_user": "사용자 삭제",
-                        "caption": "사용자 보기"
+                        "caption": "사용자 보기",
+                        "id": "ID",
+                        "owner": "소유자",
+                        "group": "그룹",
+                        "active": "활성화",
+                        "system_generated": "시스템 자동 생성",
+                        "system_generated_users_not_removable": "시스템 자동 생성 사용자는 제거 할 수 없습니다.",
+                        "unnamed_user": "이름이 없는 사용자",
+                        "enter_new_name": "새로운 이름을 입력해주세요",
+                        "user_rename_failed": "사용자 이름 변경이 실패했습니다:",
+                        "group_update_failed": "그룹 업데이트가 실패했습니다:",
+                        "confirm_user_deletion": "{name} 을(를) 삭제 하시겠습니까?"
                     },
                     "add_user": {
                         "caption": "사용자 계정 만들기",
@@ -690,9 +728,158 @@
                 },
                 "cloud": {
                     "caption": "Home Assistant Cloud",
-                    "description_login": "{email} 로 로그인 되어있습니다",
+                    "description_login": "{email} 로(으로) 로그인 되어있습니다",
                     "description_not_login": "로그인이 되어있지 않습니다",
-                    "description_features": "Alexa 및 Google Assistant 를 통해 집 밖에서도 집을 관리하세요."
+                    "description_features": "Alexa 및 Google 어시스턴트를 통해 집 밖에서도 집을 관리하세요.",
+                    "login": {
+                        "title": "클라우드 로그인",
+                        "introduction": "Home Assistant Cloud 는 집 밖에서도 구성요소에 대해 안전한 원격 연결을 제공합니다. 또한 Amazon Alexa 및 Google 어시스턴트와 같은 클라우드 전용 서비스에 연결할 수 있습니다.",
+                        "introduction2": "이 서비스는 Home Assistant 와 Hass.io 의 설립자가 설립한 회사인 ",
+                        "introduction2a": " 에 의해 운영되고 있습니다.",
+                        "introduction3": "Home Assistant Cloud 는 1개월 무료 평가판이 포함된 구독 서비스입니다. 결제 정보는 필요하지 않습니다.",
+                        "learn_more_link": "Home Assistant Cloud 에 대해 더 알아보기",
+                        "dismiss": "로그인 취소",
+                        "sign_in": "로그인",
+                        "email": "이메일",
+                        "email_error_msg": "잘못된 이메일 형식",
+                        "password": "비밀번호",
+                        "password_error_msg": "비밀번호는 최소 8자 이상입니다",
+                        "forgot_password": "비밀번호가 기억나지 않으세요?",
+                        "start_trial": "1개월 무료 평가판 사용해 보기",
+                        "trial_info": "결제 정보는 필요하지 않습니다",
+                        "alert_password_change_required": "로그인하기 전에 비밀번호를 변경해야 합니다.",
+                        "alert_email_confirm_necessary": "로그인하기 전에 검증 이메일을 확인해야 합니다."
+                    },
+                    "forgot_password": {
+                        "title": "비밀번호 찾기",
+                        "subtitle": "비밀번호 재설정 하기",
+                        "instructions": "이메일 주소를 입력하시면 비밀번호를 재설정 할 수 있는 링크를 보내드립니다.",
+                        "email": "이메일",
+                        "email_error_msg": "잘못된 이메일 형식",
+                        "send_reset_email": "재설정 이메일 보내기",
+                        "check_your_email": "비밀번호를 재설정하는 방법은 보내드린 이메일을 확인해주세요."
+                    },
+                    "register": {
+                        "title": "계정 만들기",
+                        "headline": "1개월 무료 평가판 사용해 보기",
+                        "information": "1개월간 무료로 사용해 볼 수 있는 Home Assistant Cloud 계정을 만들어보세요. 결제 정보는 필요하지 않습니다.",
+                        "information2": "평가판을 사용하면 다음을 포함하는 Home Assistant Cloud 의 모든 기능을 이용해 볼 수 있습니다:",
+                        "feature_remote_control": "집 밖에서 Home Assistant 를 제어",
+                        "feature_google_home": "Google 어시스턴트 연동",
+                        "feature_amazon_alexa": "Amazon Alexa 연동",
+                        "feature_webhook_apps": "OwnTracks 와 같은 Webhook 기반 앱과 쉬운 연동",
+                        "information3": "이 서비스는 Home Assistant 와 Hass.io 의 설립자가 설립한 회사인 ",
+                        "information3a": " 에 의해 운영되고 있습니다.",
+                        "information4": "계정을 등록하시면 다음과 같이 이용 약관에 동의하게 됩니다.",
+                        "link_terms_conditions": "이용 약관",
+                        "link_privacy_policy": "개인 정보 정책",
+                        "create_account": "계정 만들기",
+                        "email_address": "이메일 주소",
+                        "email_error_msg": "잘못된 이메일 형식",
+                        "password": "비밀번호",
+                        "password_error_msg": "비밀번호는 최소 8자 이상입니다",
+                        "start_trial": "무료 평가판 시작",
+                        "resend_confirm_email": "검증 이메일 다시보내기",
+                        "account_created": "계정이 생성되었습니다! 계정을 활성화 하는 방법은 보내드린 이메일을 확인해주세요."
+                    },
+                    "account": {
+                        "thank_you_note": "Home Assistant Cloud 를 이용해주셔서 감사합니다. 여러분 덕분에 저희는 모든 사람에게 더 나은 홈 자동화를 제공해드릴 수 있습니다. 감사합니다!",
+                        "nabu_casa_account": "Nabu Casa 계정",
+                        "connection_status": "클라우드 연결 상태",
+                        "manage_account": "계정 관리",
+                        "sign_out": "로그 아웃",
+                        "integrations": "서비스 연동",
+                        "integrations_introduction": "Home Assistant Cloud 연동을 통해 Home Assistant 구성요소를 인터넷상에 공개 노출시키지 않고도 클라우드의 서비스에 연결시킬 수 있습니다.",
+                        "integrations_introduction2": "웹사이트를 통해 다음을 확인해보세요. ",
+                        "integrations_link_all_features": "사용 가능한 모든 기능",
+                        "connected": "연결됨",
+                        "not_connected": "연결되지 않음",
+                        "fetching_subscription": "구독 정보를 가져오는 중…",
+                        "remote": {
+                            "title": "원격 제어",
+                            "access_is_being_prepared": "원격 액세스가 준비 중입니다. 준비가 되면 알려드리겠습니다.",
+                            "info": "Home Assistant Cloud 는 집을 비운 상태에서도 구성요소에 대한 안전한 원격 연결을 제공합니다.",
+                            "instance_is_available": "구성요소는 다음의 서비스에서 사용이 가능합니다.",
+                            "instance_will_be_available": "구성요소는 다음의 서비스에서 제공 예정입니다.",
+                            "link_learn_how_it_works": "작동 방식에 대해 알아보기",
+                            "certificate_info": "인증서 정보"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Home Assistant Cloud 의 Alexa 연동 기능으로 Alexa 가 지원하는 기기로서 Home Assistant 기기를 제어 할 수 있습니다.",
+                            "enable_ha_skill": "Alexa 에 Home Assistant 스킬 사용하기",
+                            "config_documentation": "설정 문서 보기",
+                            "enable_state_reporting": "상태 보고 활성화",
+                            "info_state_reporting": "상태 보고를 활성화하면 Home Assistant 는 노출된 구성요소의 모든 상태 변경 사항을 Amazon 에 보냅니다. 이를 통해 Alexa 앱에서 언제든지 구성요소의 최신 상태를 확인할 수 있으며, 상태 변경을 사용하여 루틴을 만들 수 있습니다.",
+                            "sync_entities": "구성요소 동기화",
+                            "manage_entities": "구성요소 관리",
+                            "sync_entities_error": "구성요소 동기화를 하지 못했습니다:",
+                            "state_reporting_error": "상태 보고를 {enable_disable}할 수 없습니다.",
+                            "enable": "활성화",
+                            "disable": "비활성화"
+                        },
+                        "google": {
+                            "title": "Google 어시스턴트",
+                            "info": "Home Assistant Cloud 의 Google 어시스턴트 연동 기능으로 Google 어시스턴트가 지원하는 기기로서 Home Assistant 기기를 제어 할 수 있습니다.",
+                            "enable_ha_skill": "Google 어시스턴트에 Home Assistant 스킬 사용하기",
+                            "config_documentation": "설정 문서 보기",
+                            "enable_state_reporting": "상태 보고 활성화",
+                            "info_state_reporting": "상태 보고를 활성화하면 Home Assistant 는 노출된 구성요소의 모든 상태 변경 사항을 Google 에 보냅니다. 이를 통해 Google 앱에서 언제든지 구성요소의 최신 상태를 확인할 수 있습니다.",
+                            "security_devices": "보안 기기",
+                            "enter_pin_info": "보안 기기를 제어하기 위한 PIN 을 설정해주세요. 보안 기기란 현관문, 차고문, 도어락과 같은 기기입니다. Google 어시스턴트를 통해 이러한 기기를 제어할 때 PIN 을 입력하거나 말씀해주셔야 합니다.",
+                            "devices_pin": "보안 기기 PIN",
+                            "enter_pin_hint": "보안 기기를 사용하시려면 PIN 을 입력해주세요",
+                            "sync_entities": "구성요소를 Google 에 동기화",
+                            "manage_entities": "구성요소 관리",
+                            "enter_pin_error": "PIN 을 저장할 수 없습니다:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Webhook 에 의해 트리거 되도록 구성된 모든 구성요소를 인터넷상에 공개 노출시키지 않고도 어디서나 Home Assistant 로 데이터를 보낼 수 있는 공개된 액세스가 가능한 URL 을 제공해드립니다.",
+                            "no_hooks_yet": "아직 Webhook 가 없는 것 같습니다. 다음을 구성하여 시작하실 수 있습니다. ",
+                            "no_hooks_yet_link_integration": "Webhook 기반 연동",
+                            "no_hooks_yet2": " 또는 다음을 작성할 수 있습니다. ",
+                            "no_hooks_yet_link_automation": "Webhook 자동화",
+                            "link_learn_more": "Webhook 기반 자동화 생성에 대해 더 알아보기.",
+                            "loading": "읽는 중 ...",
+                            "manage": "관리",
+                            "disable_hook_error_msg": "Webhook 를 비활성화하지 못했습니다:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "configuration.yaml 에서 구성요소 필터를 구성했기 때문에 UI 를 통해 노출된 구성요소를 편집 할 수 없습니다.",
+                        "exposed_entities": "노출된 구성요소",
+                        "not_exposed_entities": "노출되지 않은 구성요소",
+                        "expose": "Alexa 에 노출"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "인증서 정보",
+                        "certificate_expiration_date": "인증서 만료 날짜",
+                        "will_be_auto_renewed": "인증서는 자동으로 갱신됩니다",
+                        "fingerprint": "인증서 지문:",
+                        "close": "닫기"
+                    },
+                    "google": {
+                        "title": "Google 어시스턴트",
+                        "expose": "Google 어시스턴트에 노출",
+                        "disable_2FA": "2단계 인증 비활성화",
+                        "banner": "configuration.yaml 에서 구성요소 필터를 구성했기 때문에 UI 를 통해 노출된 구성요소를 편집 할 수 없습니다.",
+                        "exposed_entities": "노출된 구성요소",
+                        "not_exposed_entities": "노출되지 않은 구성요소",
+                        "sync_to_google": "변경 사항을 Google 에 동기화하는 중."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "{name} Webhook",
+                        "available_at": "Webhook 는 다음의 URL 을 사용해 주세요:",
+                        "managed_by_integration": "이 Webhook 는 통합 구성요소에 의해 관리되며 비활성화할 수 없습니다.",
+                        "info_disable_webhook": "이 Webhook 를 더 이상 사용하지 않으려면, 다음을 해보세요: ",
+                        "link_disable_webhook": "비활성화",
+                        "view_documentation": "관련문서 보기",
+                        "close": "닫기",
+                        "confirm_disable": "이 Webhook 를 비활성화 하시겠습니까?",
+                        "copied_to_clipboard": "클립보드에 복사됨"
+                    }
                 },
                 "integrations": {
                     "caption": "통합 구성요소",
@@ -720,7 +907,10 @@
                             "description": "이 단계는 외부 웹사이트 방문이 필요합니다.",
                             "open_site": "웹사이트 열기"
                         }
-                    }
+                    },
+                    "note_about_integrations": "아직 UI 에서 모든 통합 구성요소를 구성할 수 있는것은 아닙니다.",
+                    "note_about_website_reference": "더 많은 구성요소는 다음에서 살펴 봐주세요. ",
+                    "home_assistant_website": "Home Assistant 웹 사이트"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee 홈 자동화 - 기기 추가",
                         "spinner": "ZHA Zigbee 기기를 찾고있습니다...",
-                        "discovery_text": "발견된 기기가 여기에 표시됩니다. 기기의 설명서를 참고하여 기기를 페어링 모드로 설정해주세요."
+                        "discovery_text": "발견된 기기가 여기에 표시됩니다. 기기의 설명서를 참고하여 기기를 페어링 모드로 설정해주세요.",
+                        "search_again": "다시 검색"
+                    },
+                    "common": {
+                        "add_devices": "기기 추가",
+                        "clusters": "클러스터",
+                        "devices": "기기",
+                        "manufacturer_code_override": "제조업체 코드 재정의",
+                        "value": "값"
+                    },
+                    "network_management": {
+                        "header": "네트워크 관리",
+                        "introduction": "전체 네트워크에 영향을 미치는 명령"
+                    },
+                    "node_management": {
+                        "header": "기기 관리",
+                        "introduction": "단일 기기에 영향을 주는 ZHA 명령을 실행합니다. 사용 가능한 명령 목록을 보려면 기기를 선택해주세요.",
+                        "hint_battery_devices": "참고: 절전(배터리 구동) 기기는 명령을 실행할 때 절전 모드가 해제되어 있어야 합니다. 일반적으로 절전 기기는 트리거해서 절전 모드를 해제할 수 있습니다.",
+                        "hint_wakeup": "Xiaomi 센서와 같은 일부 기기는 상호 작용하는 동안 기기의 절전 모드를 해제할 수 있는 최대 5초 간격으로 누를 수 있는 절전 해제 버튼이 있습니다.",
+                        "help_node_dropdown": "기기별 옵션을 보려면 기기를 선택해주세요."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "속성과 명령을 보려면 클러스터를 선택해주세요."
+                    },
+                    "cluster_attributes": {
+                        "header": "클러스터 속성",
+                        "introduction": "클러스터 속성을 보고 편집합니다.",
+                        "attributes_of_cluster": "선택된 클러스터의 속성",
+                        "get_zigbee_attribute": "Zigbee 속성 가져오기",
+                        "set_zigbee_attribute": "Zigbee 속성 설정하기",
+                        "help_attribute_dropdown": "설정된 값을 보거나 설정하려면 속성을 선택해주세요.",
+                        "help_get_zigbee_attribute": "선택한 속성의 값을 가져옵니다.",
+                        "help_set_zigbee_attribute": "지정된 구성요소에서 지정된 클러스터의 속성 값을 설정합니다."
+                    },
+                    "cluster_commands": {
+                        "header": "클러스터 명령",
+                        "introduction": "클러스터 명령을 보고 실행합니다.",
+                        "commands_of_cluster": "선택된 클러스터의 명령",
+                        "issue_zigbee_command": "Zigbee 명령 실행",
+                        "help_command_dropdown": "제어할 명령을 선택합니다."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant 는 구성요소의 식별을 위해 모든 구성요소에 고유한 레지스트리를 부여합니다. 각각의 구성요소들은 자신만의 고유한 구성요소 ID 를 가집니다.",
                         "introduction2": "구성요소를 편집하여 이름을 대체하거나 구성요소 ID를 변경하고 Home Assistant 에서 항목을 제거할 수 있습니다. 단, 구성요소 편집창에서 구성요소를 삭제해도 구성요소가 완전히 제거되는 것은 아닙니다. 완전히 제거하려면, 아래 링크를 따라 통합 구성요소 페이지에서 제거해주세요.",
                         "integrations_page": "통합 구성요소 페이지",
-                        "show_disabled": "비활성화 된 구성요소 표시"
+                        "show_disabled": "비활성화 된 구성요소 표시",
+                        "headers": {
+                            "name": "이름",
+                            "entity_id": "구성요소 ID",
+                            "integration": "통합 구성요소",
+                            "enabled": "활성화됨"
+                        }
                     },
                     "editor": {
                         "unavailable": "이 구성요소는 현재 사용할 수 없습니다.",
@@ -791,8 +1026,24 @@
                         "name": "이름",
                         "device_tracker_intro": "이 구성원에게 속한 기기를 선택해주세요.",
                         "device_tracker_picked": "추적 대상 기기",
-                        "device_tracker_pick": "추적 할 기기 선택"
-                    }
+                        "device_tracker_pick": "추적 할 기기 선택",
+                        "new_person": "새로운 구성원",
+                        "name_error_msg": "이름은 필수 요소입니다",
+                        "linked_user": "사용자 계정 연결",
+                        "no_device_tracker_available_intro": "구성원의 재실 여부를 알려주는 기기가 있다면 구성원을 해당 기기에 할당할 수 있습니다. 통합 구성요소 페이지에서 재실 감지 통합 구성요소를 추가해서 기기를 구성해보세요.",
+                        "link_presence_detection_integrations": "재실 감지 통합 구성요소",
+                        "link_integrations_page": "통합 구성요소 페이지",
+                        "delete": "삭제",
+                        "create": "만들기",
+                        "update": "업데이트"
+                    },
+                    "introduction": "Home Assistant 에서 추적 할 구성원을 정의 할 수 있습니다.",
+                    "note_about_persons_configured_in_yaml": "참고: configuration.yaml 에서 구성된 구성원은 UI 를 통해 편집 할 수 없습니다.",
+                    "no_persons_created_yet": "아직 생성된 구성원이 없는 것 같습니다.",
+                    "create_person": "구성원 만들기",
+                    "add_person": "구성원 추가하기",
+                    "confirm_delete": "이 구성원을 삭제 하시겠습니까?",
+                    "confirm_delete2": "이 구성원에게 속한 모든 기기는 비할당 상태로 남게됩니다."
                 },
                 "server_control": {
                     "caption": "서버 제어",
@@ -826,7 +1077,7 @@
                 },
                 "devices": {
                     "caption": "기기",
-                    "description": "연결된 기기 관리",
+                    "description": "연결된 기기를 관리합니다",
                     "automation": {
                         "triggers": {
                             "caption": "...일 때 뭔가를 실행"
@@ -838,6 +1089,11 @@
                             "caption": "뭔가 트리거 되었을 때...."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "변경된 내용을 저장하지 않았습니다. 정말로 이 페이지를 떠나시겠습니까?"
+                    }
                 }
             },
             "profile": {
@@ -873,7 +1129,7 @@
                 },
                 "long_lived_access_tokens": {
                     "header": "장기 액세스 토큰",
-                    "description": "스크립트가 Home Assistant 인스턴스와 상호 작용할 수 있도록 장기 액세스 토큰을 생성하세요. 각 토큰은 생성 후 10년 동안 유효합니다. 현재 활성 상태인 장기 액세스 토큰은 다음과 같습니다.",
+                    "description": "스크립트가 Home Assistant 구성요소와 상호 작용할 수 있도록 장기 액세스 토큰을 생성하세요. 각 토큰은 생성 후 10년 동안 유효합니다. 현재 활성 상태인 장기 액세스 토큰은 다음과 같습니다.",
                     "learn_auth_requests": "인증 요청을 생성하는 방법에 대해 알아 보세요.",
                     "created_at": "{date} 에 생성 됨",
                     "confirm_delete": "{name} 액세스 토큰을 삭제 하시겠습니까?",
@@ -917,11 +1173,15 @@
                 "vibrate": {
                     "header": "진동효과",
                     "description": "기기를 제어 할 때 이 기기에서 진동을 활성화 또는 비활성화합니다."
+                },
+                "advanced_mode": {
+                    "title": "고급 모드",
+                    "description": "Home Assistant 의 고급 기능과 옵션은 기본적으로 숨겨져 있으며 토글을 활성화하여 이러한 기능을 사용하실 수 있습니다. 이 설정은 사용자별 설정이며 Home Assistant 를 사용하는 다른 사용자에게 영향을 미치지 않습니다."
                 }
             },
             "page-authorize": {
                 "initializing": "초기화 중",
-                "authorizing_client": "{clientId} 에 Home Assistant 인스턴스에 대한 액세스 권한을 부여하려고 합니다.",
+                "authorizing_client": "{clientId} 에 Home Assistant 구성요소에 대한 액세스 권한을 부여하려고 합니다.",
                 "logging_in_with": "**{authProviderName}** 로(으로) 로그인 합니다.",
                 "pick_auth_provider": "또는 다음으로 로그인하세요",
                 "abort_intro": "로그인이 중단되었습니다",
@@ -1074,10 +1334,12 @@
                         "save": "저장하기",
                         "toggle_editor": "에디터 전환",
                         "pick_card": "추가하려는 카드를 선택해주세요",
-                        "add": "카드 추가",
+                        "add": "카드 추가하기",
                         "edit": "편집",
                         "delete": "삭제",
-                        "move": "이동"
+                        "move": "이동",
+                        "show_visual_editor": "비주얼 편집기 보기",
+                        "show_code_editor": "코드 편집기 보기"
                     },
                     "migrate": {
                         "header": "구성 내용이 호환되지 않습니다",
@@ -1121,7 +1383,8 @@
                             "optional": "선택사항"
                         },
                         "entities": {
-                            "show_header_toggle": "헤더 토글 표시"
+                            "show_header_toggle": "헤더 토글 표시",
+                            "name": "구성요소"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "초록",
                                 "red": "빨강",
                                 "yellow": "노랑"
-                            }
+                            },
+                            "name": "게이지"
                         },
                         "glance": {
-                            "columns": "열"
+                            "columns": "열",
+                            "name": "한눈에 보기"
                         },
                         "generic": {
                             "aspect_ratio": "종횡비",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "위치정보 소스",
                             "dark_mode": "어둡게 표시",
                             "default_zoom": "기본 확대",
-                            "source": "소스"
+                            "source": "소스",
+                            "name": "지도"
                         },
                         "markdown": {
-                            "content": "내용"
+                            "content": "내용",
+                            "name": "마크다운"
                         },
                         "sensor": {
                             "graph_detail": "그래프 세부묘사 정도",
-                            "graph_type": "그래프 유형"
+                            "graph_type": "그래프 유형",
+                            "name": "센서"
+                        },
+                        "alarm-panel": {
+                            "name": "알람 패널",
+                            "available_states": "사용 가능한 상태요소"
+                        },
+                        "conditional": {
+                            "name": "조건부"
+                        },
+                        "entity-button": {
+                            "name": "구성요소 버튼"
+                        },
+                        "entity-filter": {
+                            "name": "구성요소 필터"
+                        },
+                        "history-graph": {
+                            "name": "기록 그래프"
+                        },
+                        "horizontal-stack": {
+                            "name": "수평 쌓아보기"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "조명"
+                        },
+                        "media-control": {
+                            "name": "미디어 컨트롤"
+                        },
+                        "picture": {
+                            "name": "그림"
+                        },
+                        "picture-elements": {
+                            "name": "그림 복합요소"
+                        },
+                        "picture-entity": {
+                            "name": "그림 구성요소"
+                        },
+                        "picture-glance": {
+                            "name": "그림 한눈에 보기"
+                        },
+                        "plant-status": {
+                            "name": "식물 상태"
+                        },
+                        "shopping-list": {
+                            "name": "장보기목록"
+                        },
+                        "thermostat": {
+                            "name": "온도 조절기"
+                        },
+                        "vertical-stack": {
+                            "name": "수직 쌓아보기"
+                        },
+                        "weather-forecast": {
+                            "name": "날씨 예보"
                         }
                     }
                 },
@@ -1238,7 +1561,7 @@
             "external_app_configuration": "앱 구성"
         },
         "common": {
-            "loading": "읽는중",
+            "loading": "읽는 중",
             "cancel": "취소",
             "save": "저장",
             "successfully_saved": "성공적으로 저장되었습니다"
@@ -1396,8 +1719,8 @@
                 }
             },
             "history_charts": {
-                "loading_history": "히스토리 읽는 중...",
-                "no_history_found": "히스토리 내용이 없습니다."
+                "loading_history": "상태 기록 내용 읽는 중...",
+                "no_history_found": "상태 기록 내용이 없습니다."
             }
         },
         "notification_toast": {
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "{entity} 이(가) 꺼졌습니다.",
             "service_called": "{service} 서비스가 호출되었습니다.",
             "service_call_failed": "{service} 서비스를 호출하지 못했습니다.",
-            "connection_lost": "서버와 연결이 끊어졌습니다. 다시 연결 중..."
+            "connection_lost": "서버와 연결이 끊어졌습니다. 다시 연결 중...",
+            "triggered": "{name} 트리거됨"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "사용자 지정 이름",
                     "area_picker_label": "영역",
                     "update_name_button": "이름 업데이트"
-                }
+                },
+                "buttons": {
+                    "add": "기기 추가",
+                    "remove": "기기 제거",
+                    "reconfigure": "기기 재설정"
+                },
+                "quirk": "습관",
+                "last_seen": "마지막 확인",
+                "power_source": "전원",
+                "unknown": "알 수 없슴"
             }
         },
         "auth_store": {
@@ -1477,7 +1810,7 @@
         "cover": "여닫이",
         "device_tracker": "추적 기기",
         "fan": "송풍기",
-        "history_graph": "기록그래프",
+        "history_graph": "기록 그래프",
         "group": "그룹",
         "image_processing": "이미지처리",
         "input_boolean": "논리입력",
diff --git a/translations/lb.json b/translations/lb.json
index 2b11e81b79..9e031005e4 100644
--- a/translations/lb.json
+++ b/translations/lb.json
@@ -558,7 +558,12 @@
                                     "zone": "Zon"
                                 },
                                 "device": {
-                                    "label": "Apparat"
+                                    "label": "Apparat",
+                                    "extra_fields": {
+                                        "above": "Iwwert",
+                                        "below": "Ënnert",
+                                        "for": "Dauer"
+                                    }
                                 },
                                 "and": {
                                     "label": "An"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Apparat"
+                                },
+                                "scene": {
+                                    "label": "Zeen aktivéieren"
                                 }
                             },
                             "learn_more": "Méi iwwert Aktioune liesen"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Skript",
-                    "description": "Skript erstellen an änneren"
+                    "description": "Skript erstellen an änneren",
+                    "picker": {
+                        "header": "Skript Editeur",
+                        "introduction": "De Skript Editeur erlaabt Iech Skripten ze erstellen an z'änneren. Follegt de Link hei ënnendrënner fir d'Instruktiounen ze liese fir sécher ze stellen, datt Dir den Home Assistant richteg konfiguréiert hutt",
+                        "learn_more": "Méi iwwert Skripten léieren",
+                        "no_scripts": "Keng Skripte fir ze ännere fonnt",
+                        "add_script": "Skript dobäisetze"
+                    },
+                    "editor": {
+                        "header": "Skript: {name}",
+                        "default_name": "Neie Skript",
+                        "load_error_not_editable": "Nëmme Skripten am scripts.yaml kënnen editéiert ginn.",
+                        "delete_confirm": "Sécher fir dësen Skript ze läsche?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Richteg",
                         "false": "Falsch",
                         "set_config_parameter": "Konfiguratioun's Parameter setzen"
+                    },
+                    "learn_more": "Méi iwwert Z-Wave léieren",
+                    "ozw_log": {
+                        "header": "OZW Log",
+                        "introduction": "Logbicher kucken. 0 ass de minimum (luet de ganze Log) an 1000 ass de maximum. Luede weist ee statesche Log an \"tail\" aktualiséiert de Log automatesch mat de leschten Zeile vum Log."
                     }
                 },
                 "users": {
                     "caption": "Benotzer",
                     "description": "Benotzer verwalten",
                     "picker": {
-                        "title": "Benotzer"
+                        "title": "Benotzer",
+                        "system_generated": "Vum System generéiert"
                     },
                     "editor": {
                         "rename_user": "Benotzer ëmbenennen",
@@ -678,7 +705,18 @@
                         "activate_user": "Benotzer aktivéieren",
                         "deactivate_user": "Benotzer déaktivéieren",
                         "delete_user": "Benotzer läschen",
-                        "caption": "Benotzer kucken"
+                        "caption": "Benotzer kucken",
+                        "id": "ID",
+                        "owner": "Proprietär",
+                        "group": "Gruppe",
+                        "active": "Aktiv",
+                        "system_generated": "Vum System generéiert",
+                        "system_generated_users_not_removable": "Ka keng System generéiert Benotzer läschen.",
+                        "unnamed_user": "Benotzer ouni Numm",
+                        "enter_new_name": "Neie Numm aginn",
+                        "user_rename_failed": "Feeler beim ëmbenennen vum Benotzer:",
+                        "group_update_failed": "Feeler bei der aktualiséiereung vum Gruppe",
+                        "confirm_user_deletion": "Sécher fir {name} ze läsche?"
                     },
                     "add_user": {
                         "caption": "Benotzer erstellen",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Ageloggt als {email}",
                     "description_not_login": "Net ageloggt",
-                    "description_features": "Steiert vun ënnerwee aus, integréiert mam Alexa an Google Assistant."
+                    "description_features": "Steiert vun ënnerwee aus, integréiert mam Alexa an Google Assistant.",
+                    "login": {
+                        "title": "Cloud Login",
+                        "introduction": "Home Assistant Cloud liwwert Iech eng sécher Fernverbindung op Är Instanz wann Dir ënnerwee sidd. Et erlaabt Iech och mat Cloud Servicer ze verbannen: Amazon Alexa a Google Assistant.",
+                        "introduction2": "Dëse Service gëtt vun eisem Partner geleet ",
+                        "introduction2a": ", eng Firma gegrënnt vun de Grënner vun Home Assistant an Hass.io.",
+                        "introduction3": "Home Assistant Cloud ass een Abonnement Service mat engem Mount gratis Testperiod. Keng Paiement Informatiounen néideg",
+                        "learn_more_link": "Léier méi iwwert Home Assistant Cloud",
+                        "dismiss": "Verwerfen",
+                        "sign_in": "Umellen",
+                        "email": "E-Mail",
+                        "email_error_msg": "Ongëlteg E-Mail",
+                        "password": "Passwuert",
+                        "password_error_msg": "Passwierder hunn op mannst 8 Charakteren",
+                        "forgot_password": "Passwuert vergiess?",
+                        "start_trial": "Start är gratis 1 Mount Testperiod",
+                        "trial_info": "Keng Paiement Informatiounen néideg",
+                        "alert_password_change_required": "Dir musst ärt Passwuert ännere ier dir iech verbanne kënnt.",
+                        "alert_email_confirm_necessary": "Dir musst är E-Mail confirméieren ier dir iech verbanne kënnt."
+                    },
+                    "forgot_password": {
+                        "title": "Passwuert vergiess",
+                        "subtitle": "Passwuert vergiess",
+                        "instructions": "Gitt är E-Mail Adress un a mir schécken iech e Link fir äert Passwuert zeréck ze setzen.",
+                        "email": "E-Mail",
+                        "email_error_msg": "Ongëlteg E-Mail",
+                        "send_reset_email": "Reset E-Mail schécken",
+                        "check_your_email": "Kuckt är E-Maile fir Uweisunge wéi d'Passwuert zeréckgesat gëtt."
+                    },
+                    "register": {
+                        "title": "Kont registréieren",
+                        "headline": "Start är gratis Testperiod",
+                        "information": "Erstellt ee Kont fir mat ärer Gratis 1 Mount Test Period unzefänken. Keng Paiement Informatiounen néideg.",
+                        "information2": "Testversioun gëtt iech Accès op all Beneficer vun der Home Assistant Cloud, inklusive:",
+                        "feature_remote_control": "Kontrolléiert ären Home Assistant vun ënnerwee",
+                        "feature_google_home": "Integratioun mat Google Assistant",
+                        "feature_amazon_alexa": "Integratioun mat Amazon Alexa",
+                        "feature_webhook_apps": "Einfach Integratioun mat webhook-baséierten Apps wéi OwnTracks",
+                        "information3": "Dëse Service gëtt vun eisem Partner geleet ",
+                        "information3a": ", eng Firma gegrënnt vun de Grënner vun Home Assistant an Hass.io.",
+                        "information4": "Andeems Dir Iech fir e Kont ugemellt hutt, akzeptéiert Dir déi folgend Bedéngungen.",
+                        "link_terms_conditions": "Konditioune",
+                        "link_privacy_policy": "Dateschutz Bestëmmungen",
+                        "create_account": "Kont erstellen",
+                        "email_address": "E-Mail Adresse",
+                        "email_error_msg": "Ongëlteg E-Mail",
+                        "password": "Passwuert",
+                        "password_error_msg": "Passwierder hunn op mannst 8 Charakteren",
+                        "start_trial": "Testperiod starten",
+                        "resend_confirm_email": "Bestätegung's E-Mail nach emol verschécken",
+                        "account_created": "Kont erstallt! Kuckt är E-Mailen fir Uweisungen wéi den Kont aktivéiert gëtt."
+                    },
+                    "account": {
+                        "thank_you_note": "Merci dass dir Deel sidd vun der Home Assistant Cloud. Et ass wéinst iech dass mir sou eng groussaarteg Home Automation Erfarung fir jiddweree kënne maachen. Villmools Merci!",
+                        "nabu_casa_account": "Nabu Casa Kont",
+                        "connection_status": "Cloud Verbindungs Status",
+                        "manage_account": "Kont verwalten",
+                        "sign_out": "Ofmellen",
+                        "integrations": "Integratioune",
+                        "integrations_introduction": "Integratioune fir Home Assistant Cloud erlaben iech mat Servicer an der Cloud ze verbannen ouni dass är Home Assistant Instanz ëffentlech um Internet ass.",
+                        "integrations_introduction2": "Kuckt d'Websäit fir ",
+                        "integrations_link_all_features": " all verfügbar Eegeschafte",
+                        "connected": "Verbonnen",
+                        "not_connected": "Net verbonnen",
+                        "fetching_subscription": "Abonnement gëtt ausgelies...",
+                        "remote": {
+                            "title": "Fernsteierung",
+                            "access_is_being_prepared": "Remote Accès gëtt virbereet. Mir ginn iech Bescheed wann et prett ass.",
+                            "info": "Home Assistant Cloud stellt eng sécher Verbindung zu ärer Instanz bereet wann dir ënnerwee sidd.",
+                            "instance_is_available": "Är Instanz ass disponibel op",
+                            "instance_will_be_available": "Är Instanz gëtt disponibel op",
+                            "link_learn_how_it_works": "Léier wéi et funktionéiert",
+                            "certificate_info": "Zertifikat Informatiounen"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Mat der Alexa Integratioun fir Home Assistant Cloud könnt dir all är Home Assistant Apparater via Alexa supportéiert Apparater steieren.",
+                            "enable_ha_skill": "Aktivéiert Home Assistant Fäegkeet fir Alexa",
+                            "config_documentation": "Dokumentatioun iwwert d'Konfiguration",
+                            "enable_state_reporting": "Zostand Berichterstattung aktivéieren",
+                            "info_state_reporting": "Wann dir de Rapport vun den Zoustänn aktivéiert schéckt Home Assistant all Ännerung vum Zoustand vun exposéierten Entitéiten op Amazon. Dës erlaabt iech ëmmer déi leschten Zoustänn an der Alexa App ze gesinn an d'Ännerunge vun den Zoustänn ze benotze fir Ofleef z'erstellen.",
+                            "sync_entities": "Entitéite synchroniséieren",
+                            "manage_entities": "Entitéite verwalten",
+                            "sync_entities_error": "Feeler beim synchroniséieren vun den Entitéite:",
+                            "state_reporting_error": "Kann net den Rapport vum Zoustand {enable_disable}",
+                            "enable": "Aktivéieren",
+                            "disable": "Desaktivéieren"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "Mat der Google Assistant Integratioun fir Home Assistant Cloud könnt dir all är Home Assistant Apparater via Google Assistant supportéiert Apparater steieren.",
+                            "enable_ha_skill": "Aktivéiert Home Assistant Fäegkeet fir Google Assistant",
+                            "config_documentation": "Dokumentatioun iwwert d'Konfiguration",
+                            "enable_state_reporting": "Zostand Berichterstattung aktivéieren",
+                            "info_state_reporting": "Wann dir de Rapport vun den Zoustänn aktivéiert schéckt Home Assistant all Ännerung vum Zoustand vun exposéierten Entitéiten op Google. Dës erlaabt iech ëmmer déi leschten Zoustänn an der Google App ze gesinn.",
+                            "security_devices": "Sécherheets Apparater",
+                            "enter_pin_info": "Gitt w.e.g en Pin un fir d'Interaktioun mat Sécherheets Apparater. Sécherheets Apparater kënnen Dieren, Garagen a Schlässer sinn. Dir gitt de PIN gefrot fir ze soen oder anzegi fir d'Interaktioun mat Service wéi Google Assistant.",
+                            "devices_pin": "Sécherheets Apparater Pin",
+                            "enter_pin_hint": "Gitt ee Pin an fir Sécherheets Apparater ze benotzen",
+                            "sync_entities": "Entitéiten mat Google synchroniséieren",
+                            "manage_entities": "Entitéiten verwalten",
+                            "enter_pin_error": "Kann net de Pin späicheren:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Alles wat konfiguréiert ass fir duerch e Webhook ausgeléist ze ginn, kann eng ëffentlech zougänglech URL kréien, fir datt Dir Är Donnéeën zréck un den Home Assistant vun iergendwou kënnt zréckschécken, ouni Är Instanz um Internet z'exposéieren",
+                            "no_hooks_yet": "Et gesäit sou aus wéi wann nach keng webhooks benotzt ginn. Fänkt mam erstellen vun enger ",
+                            "no_hooks_yet_link_integration": "webhook baséierter Integratioun",
+                            "no_hooks_yet2": " oder via erstellen vun ",
+                            "no_hooks_yet_link_automation": "Webhook Automatisme",
+                            "link_learn_more": "Méi iwwert wéi ee webhook-baséiert Automatismen erstellt léieren",
+                            "loading": "Lued ...",
+                            "manage": "Verwalten",
+                            "disable_hook_error_msg": "Feeler beim désaktivéieren vum Webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "D'Ännere vun den Entitéiten déi iwwert dës UI exposéiert sinn ass desaktivéiert well Entitéite Filter an der configuration.yaml konfiguréiert sinn.",
+                        "exposed_entities": "Exposéiert Entitéiten",
+                        "not_exposed_entities": "Keng exposéiert Entitéiten",
+                        "expose": "Op Alexa exposéieren"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Zertifikat Informatiounen",
+                        "certificate_expiration_date": "Zertifikat Verfallsdatum",
+                        "will_be_auto_renewed": "Gëtt automatesch verlängert",
+                        "fingerprint": "Zertifikat Fanger Ofdrock",
+                        "close": "Zoumaachen"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Op Google Assistant exposéieren",
+                        "disable_2FA": "2-Faktor-Authentifikatioun désaktivéieren",
+                        "banner": "D'Ännere vun den Entitéiten déi iwwert dës UI exposéiert sinn ass desaktivéiert well Entitéite Filter an der configuration.yaml konfiguréiert sinn.",
+                        "exposed_entities": "Exposéiert Entitéiten",
+                        "not_exposed_entities": "Keng exposéiert Entitéiten",
+                        "sync_to_google": "Ännerungen ginn mat Google synchroniséiert"
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook fir {name}",
+                        "available_at": "De Webhook ass disponibel op der folgender url:",
+                        "managed_by_integration": "Dëse Webhook gëtt vun enger Integratioun verwalt a kann net desaktivéiert ginn.",
+                        "info_disable_webhook": "Wann dir dëse Webhook net wëllt länger benotzen, kënnt dir",
+                        "link_disable_webhook": "Desaktivéieren",
+                        "view_documentation": "Dokumentatioun kucken",
+                        "close": "Zoumaachen",
+                        "confirm_disable": "Sécher fir dëse Webhook ze desaktivéieren?",
+                        "copied_to_clipboard": "An de Tëschespäicher kopéiert"
+                    }
                 },
                 "integrations": {
                     "caption": "Integratiounen",
@@ -720,7 +907,10 @@
                             "description": "Fir dës Etapp ofzeschléisse muss dir eng externe Internetsäit besichen.",
                             "open_site": "Internetsäit opmaachen"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Net all Integratioune könne nach via den Benotzer Interface konfiguréiert ginn.",
+                    "note_about_website_reference": "Méi sin der disponibel op der ",
+                    "home_assistant_website": "Home Assistant Websäit"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Apparater dobäisetzen",
                         "spinner": "Sicht no ZHA Zigbee Apparater...",
-                        "discovery_text": "Entdeckten Apparater tauchen op dëser Platz op. Suivéiert d'Instruktiounen fir är Apparater an aktivéiert den Kupplung's Mod."
+                        "discovery_text": "Entdeckten Apparater tauchen op dëser Platz op. Suivéiert d'Instruktiounen fir är Apparater an aktivéiert den Kupplung's Mod.",
+                        "search_again": "Nach emol sichen"
+                    },
+                    "common": {
+                        "add_devices": "Apparater dobäisetzen",
+                        "clusters": "Cluster",
+                        "devices": "Apparater",
+                        "manufacturer_code_override": "Hiersteller Code Override",
+                        "value": "Wäert"
+                    },
+                    "network_management": {
+                        "header": "Verwaltung vum Netzwierk",
+                        "introduction": "Kommandoe mat Impakt op d'gesamt Netzwierk"
+                    },
+                    "node_management": {
+                        "header": "Verwaltung vun den Apparaten",
+                        "introduction": "ZHA Kommandoe ausféieren déi nëmmen een Apparat betreffen. Wielt een Apparat aus fir seng Lëscht vun verfügbare Kommandoe ze gesinn.",
+                        "hint_battery_devices": "Note: (Batterie gedriwwen) Apparater déi an de Stand-by gi mussen un si fir Kommandoen unzehuelen. Dir kënnt solch Apparater gewéinlech aus dem Stand-by huelen andeems se ausgeléist ginn.",
+                        "hint_wakeup": "Verschidden Apparater wéi Xiaomi Sensoren hunn ee klenge Knäppchen deen een an Intervalle vu ~5s drécke ka fir dass den Apparat un bléift wärend der Interaktioun.",
+                        "help_node_dropdown": "Wielt een Apparat aus fir seng spezifesch Optioune ze gesinn."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Wielt ee Cluster aus fir Attributer anKommandoe ze gesinn."
+                    },
+                    "cluster_attributes": {
+                        "header": "Cluster Attributer",
+                        "introduction": "Cluster Attributer kucken an änneren.",
+                        "attributes_of_cluster": "Attributer vum ausgewielten Cluster",
+                        "get_zigbee_attribute": "Zigbee Attribut liesen",
+                        "set_zigbee_attribute": "Zigbee Attribut definéieren",
+                        "help_attribute_dropdown": "Attribut auswielen fir säin Wärt ze kucken oder ze setzen.",
+                        "help_get_zigbee_attribute": "Wäert fir dat gewielten Attribut liesen",
+                        "help_set_zigbee_attribute": "Definéiert ee Wäert fir den Attribut fir de spezifizéierte Cluster op der spezifizéierter Entitéit."
+                    },
+                    "cluster_commands": {
+                        "header": "Cluster Kommandoe",
+                        "introduction": "Cluster Kommandoe kucken an ausginn",
+                        "commands_of_cluster": "Kommandoe vum ausgewielten Cluster",
+                        "issue_zigbee_command": "Zigbee Kommando ausginn",
+                        "help_command_dropdown": "Wielt ee Kommando eraus fir z'interagéieren."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant hält eng Lëscht vun all Entitéit's ID déi eenzel erkennbar ass a bis elo vum System erkannt gouf. All eenzel vun dësen Entitéite kritt eng ID zougewise welch nëmme fir dës Entitéit reservéiert ass.",
                         "introduction2": "Benotzt d'Lëscht vun den Entitéite fir d'Nimm z'änneren, d'Entitéits ID z'änneren oder d'Entrée aus dem Home Assistant ze läschen. Remarque: Läsche vun der Entitéit aus der Lëscht läscht d'Entitéit selwer net. Fir dës ze läsche follegt dem Link ënnen a läscht et op der Integratiouns Säit.",
                         "integrations_page": "Integratiouns Säit",
-                        "show_disabled": "Desaktivéiert Entitéiten uweisen"
+                        "show_disabled": "Desaktivéiert Entitéiten uweisen",
+                        "headers": {
+                            "name": "Numm",
+                            "entity_id": "ID vun der Entitéit",
+                            "integration": "Integratioun",
+                            "enabled": "Aktivéiert"
+                        }
                     },
                     "editor": {
                         "unavailable": "Dës Entitéit ass net erreechbar fir de Moment.",
@@ -791,8 +1026,24 @@
                         "name": "Numm",
                         "device_tracker_intro": "Wiel d'Apparater aus déi zu dëser Persoun gehéieren.",
                         "device_tracker_picked": "Aparat suivéieren",
-                        "device_tracker_pick": "Wielt den Apparat aus fir ze suivéieren"
-                    }
+                        "device_tracker_pick": "Wielt den Apparat aus fir ze suivéieren",
+                        "new_person": "Nei Persoun",
+                        "name_error_msg": "Numm ass obligatoresch",
+                        "linked_user": "Verbonne Benotzer",
+                        "no_device_tracker_available_intro": "Wann dir Apparater hutt déi d'Präsenz vun enger Persoun uweisen, kënnt dir déi enger Persoun zouweisen. Dir kënnt ären éischten Apparat bäisetzen andeems dir eng Präsenz Detektioun Integratioun vun der Integratiouns Säit dobäisetzt.",
+                        "link_presence_detection_integrations": "Präsenz Detektioun Integratioune",
+                        "link_integrations_page": "Integratiouns Säit",
+                        "delete": "Läschen",
+                        "create": "Erstellen",
+                        "update": "Aktualiséieren"
+                    },
+                    "introduction": "Hei kënnt dir all wichteg Persoun am Home Assistant definéieren.",
+                    "note_about_persons_configured_in_yaml": "Note: Persounen konfiguréiert via configuration.yaml können net via den UI geännert ginn.",
+                    "no_persons_created_yet": "Et gesäit sou aus wéi wann nach keng Persounen erstallt goufen.",
+                    "create_person": "Persoun erstellen",
+                    "add_person": "Persoun dobäisetzen",
+                    "confirm_delete": "Sécher fir dës Persoun ze läsche?",
+                    "confirm_delete2": "All Apparater déi zu dëser Persoun gehéiere ginn néirens zougewisen"
                 },
                 "server_control": {
                     "caption": "Kontroll vum Server",
@@ -838,6 +1089,11 @@
                             "caption": "Wann eppes ausgeléist gëtt"
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Net gespäichert Ännerungen. Trotzdeem verloossen?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Vibréieren",
                     "description": "Vibratioun op dësem Apparat un oder ausschalte wann aner Apparater gesteiert ginn."
+                },
+                "advanced_mode": {
+                    "title": "Avancéierte Modus",
+                    "description": "Home Assistant verstoppt standardméisseg avancéiert Features an Optiounen. Dir kënnt dës Funktiounen zougänglech maachen andeems Dir dës Optioun aktivéiert. Dës ass eng Benotzer spezifesch Astellung an huet keen Impakt op aner Home Assistant Benotzer."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Kaart dobäisetzen",
                         "edit": "Änneren",
                         "delete": "Läschen",
-                        "move": "Réckelen"
+                        "move": "Réckelen",
+                        "show_visual_editor": "Visuellen Editeur uweisen",
+                        "show_code_editor": "Code Editeur uweisen"
                     },
                     "migrate": {
                         "header": "Konfiguratioun net kompatibel",
@@ -1121,7 +1383,8 @@
                             "optional": "Optional"
                         },
                         "entities": {
-                            "show_header_toggle": "Titel Schalter uweisen?"
+                            "show_header_toggle": "Titel Schalter uweisen?",
+                            "name": "Entitéiten"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Gréng",
                                 "red": "Roud",
                                 "yellow": "Giel"
-                            }
+                            },
+                            "name": "Skala"
                         },
                         "glance": {
-                            "columns": "Kolonnen"
+                            "columns": "Kolonnen",
+                            "name": "Usiicht"
                         },
                         "generic": {
                             "aspect_ratio": "Säiteverhältnis",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Quell vun der Geolokalisatioun",
                             "dark_mode": "Däischteren Modus",
                             "default_zoom": "Standard Zoom",
-                            "source": "Quell"
+                            "source": "Quell",
+                            "name": "Kaart"
                         },
                         "markdown": {
-                            "content": "Contenu"
+                            "content": "Contenu",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Detail Diagramm",
-                            "graph_type": "Typ vun Graph."
+                            "graph_type": "Typ vun Graph.",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Alarm Zentral",
+                            "available_states": "Verfügbar Zoustänn"
+                        },
+                        "conditional": {
+                            "name": "Bedingungen"
+                        },
+                        "entity-button": {
+                            "name": "Entitéite Knäppchen"
+                        },
+                        "entity-filter": {
+                            "name": "Entitéite Filter"
+                        },
+                        "history-graph": {
+                            "name": "Verlaf Diagramm"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horizontale Stapel"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Luucht"
+                        },
+                        "media-control": {
+                            "name": "Medie Kontroll"
+                        },
+                        "picture": {
+                            "name": "Bild"
+                        },
+                        "picture-elements": {
+                            "name": "Biller Elementer"
+                        },
+                        "picture-entity": {
+                            "name": "Biller Entitéit"
+                        },
+                        "picture-glance": {
+                            "name": "Biller Usiicht"
+                        },
+                        "plant-status": {
+                            "name": "Status vun der Planz"
+                        },
+                        "shopping-list": {
+                            "name": "Akafslëscht"
+                        },
+                        "thermostat": {
+                            "name": "Thermostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Vertikale Stapel"
+                        },
+                        "weather-forecast": {
+                            "name": "Wiederprevisioune"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "{entity} gouf ausgeschalt",
             "service_called": "Service {service} operuff",
             "service_call_failed": "Feeler beim opruffen vun {service}",
-            "connection_lost": "Verbindung verluer. Verbindung gëtt nees opgebaut..."
+            "connection_lost": "Verbindung verluer. Verbindung gëtt nees opgebaut...",
+            "triggered": "{name} ausgeléist"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "Virnumm",
                     "area_picker_label": "Beräich",
                     "update_name_button": "Numm änneren"
-                }
+                },
+                "buttons": {
+                    "add": "Apparater dobäisetzen",
+                    "remove": "Apparat läschen",
+                    "reconfigure": "Apparat frësch konfiguréieren"
+                },
+                "quirk": "Quirk",
+                "last_seen": "Fir d'läscht gesinn",
+                "power_source": "Energie Quell",
+                "unknown": "Onbekannt"
             }
         },
         "auth_store": {
diff --git a/translations/nb.json b/translations/nb.json
index 25d8bf2f00..8f4e927266 100644
--- a/translations/nb.json
+++ b/translations/nb.json
@@ -558,7 +558,12 @@
                                     "zone": "Sone"
                                 },
                                 "device": {
-                                    "label": "Enhet"
+                                    "label": "Enhet",
+                                    "extra_fields": {
+                                        "above": "Over",
+                                        "below": "Under",
+                                        "for": "Varighet"
+                                    }
                                 },
                                 "and": {
                                     "label": "Og"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Enhet"
+                                },
+                                "scene": {
+                                    "label": "Aktiver scene"
                                 }
                             },
                             "learn_more": "Lær mer om handlinger"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Skript",
-                    "description": "Opprett og rediger skript"
+                    "description": "Opprett og rediger skript",
+                    "picker": {
+                        "header": "Skriptredigering",
+                        "introduction": "Skripteditoren lar deg lage og redigere skript. Følg lenken nedenfor for å lese instruksjonene for å forsikre deg om at du har konfigurert Home Assistant riktig.",
+                        "learn_more": "Lær mer om skript",
+                        "no_scripts": "Vi kunne ikke finne noen redigerbare skript",
+                        "add_script": "Legg til skript"
+                    },
+                    "editor": {
+                        "header": "Skript: {navn}",
+                        "default_name": "Nytt skript",
+                        "load_error_not_editable": "Bare skript inne i skript.yaml kan redigeres.",
+                        "delete_confirm": "Er du sikker på at du vil slette dette skriptet?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Sant",
                         "false": "Usant",
                         "set_config_parameter": "Angi konfigurasjons parameter"
+                    },
+                    "learn_more": "Lær mer om Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW-logg",
+                        "introduction": "Vis loggen. 0 er minimum (laster hele loggen) og 1000 er maksimum. Load vil vise en statisk logg og halen vil automatisk oppdatere med det siste spesifiserte antall linjer av loggen."
                     }
                 },
                 "users": {
                     "caption": "Brukere",
                     "description": "Administrer brukere",
                     "picker": {
-                        "title": "Brukere"
+                        "title": "Brukere",
+                        "system_generated": "System generert"
                     },
                     "editor": {
                         "rename_user": "Gi nytt navn til bruker",
@@ -678,7 +705,18 @@
                         "activate_user": "Aktiver bruker",
                         "deactivate_user": "Deaktiver bruker",
                         "delete_user": "Slett bruker",
-                        "caption": "Vis bruker"
+                        "caption": "Vis bruker",
+                        "id": "ID",
+                        "owner": "Eier",
+                        "group": "Gruppe",
+                        "active": "Aktiv",
+                        "system_generated": "System generert",
+                        "system_generated_users_not_removable": "Kan ikke fjerne systemgenererte brukere.",
+                        "unnamed_user": "Bruker uten navn",
+                        "enter_new_name": "Skriv inn nytt navn",
+                        "user_rename_failed": "Brukernavn mislyktes:",
+                        "group_update_failed": "Gruppeoppdatering mislyktes:",
+                        "confirm_user_deletion": "Er du sikker på at du vil slette {name} ?"
                     },
                     "add_user": {
                         "caption": "Legg til bruker",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Logget inn som {email}",
                     "description_not_login": "Ikke pålogget",
-                    "description_features": "Kontroller borte fra hjemmet, integrere med Alexa og Google Assistant."
+                    "description_features": "Kontroller borte fra hjemmet, integrere med Alexa og Google Assistant.",
+                    "login": {
+                        "title": "Cloud Logg inn",
+                        "introduction": "Home Assistant Cloud gir deg en sikker ekstern tilkobling til din forekomst mens du er borte fra hjemmet. Du kan også koble til med skytjenester: Amazon Alexa og Google Assistant.",
+                        "introduction2": "Denne tjenesten drives av vår partner",
+                        "introduction2a": ", et selskap av grunnleggerne av Home Assistant og Hass.io.",
+                        "introduction3": "Home Assistant Cloud er en abonnementstjeneste med en gratis prøveperiode på en måned. Ingen betalingsinformasjon nødvendig.",
+                        "learn_more_link": "Lær mer om Home Assistant Cloud",
+                        "dismiss": "Avvis",
+                        "sign_in": "Logg inn",
+                        "email": "E-post",
+                        "email_error_msg": "Ugyldig e-postadresse",
+                        "password": "Passord",
+                        "password_error_msg": "Passord er minst 8 tegn",
+                        "forgot_password": "glemt passord?",
+                        "start_trial": "Start en gratis prøveperiode på 1 måned",
+                        "trial_info": "Ingen betalingsinformasjon er nødvendig",
+                        "alert_password_change_required": "Du må endre passordet før du logger inn.",
+                        "alert_email_confirm_necessary": "Du må bekrefte e-posten din før du logger inn."
+                    },
+                    "forgot_password": {
+                        "title": "Glemt passord",
+                        "subtitle": "Glemt passord",
+                        "instructions": "Skriv inn din e-postadresse og vi vil sende deg en link for å tilbakestille passordet ditt.",
+                        "email": "E-post",
+                        "email_error_msg": "Ugyldig e-postadresse",
+                        "send_reset_email": "Send tilbakestilling av passord via e-post",
+                        "check_your_email": "Sjekk e-posten din for instruksjoner om hvordan du tilbakestiller passordet."
+                    },
+                    "register": {
+                        "title": "Registrer konto",
+                        "headline": "Start prøveversjon",
+                        "information": "Opprett en konto for å starte en gratis prøveperiode på en måned med Home Assistant Cloud. Ingen betalingsinformasjon nødvendig.",
+                        "information2": "Prøveperioden vil gi deg tilgang til alle fordelene med Home Assistant Cloud, inkludert:",
+                        "feature_remote_control": "Kontroller Home Assistent når du er borte fra hjemmet",
+                        "feature_google_home": "Integrasjon med Google Assistant",
+                        "feature_amazon_alexa": "Integrasjon med Amazon Alexa",
+                        "feature_webhook_apps": "Enkel integrasjon med nettbaserte apper som OwnTracks",
+                        "information3": "Denne tjenesten drives av vår partner",
+                        "information3a": ", et selskap av grunnleggerne av Home Assistant og Hass.io.",
+                        "information4": "Ved å registrere en konto samtykker du til følgende vilkår og betingelser.",
+                        "link_terms_conditions": "Vilkår og betingelser",
+                        "link_privacy_policy": "Personvern",
+                        "create_account": "Opprett konto",
+                        "email_address": "Epostadresse",
+                        "email_error_msg": "Ugyldig e-postadresse",
+                        "password": "Passord",
+                        "password_error_msg": "Passord er minst 8 tegn",
+                        "start_trial": "Start prøveversjon",
+                        "resend_confirm_email": "Send bekreftelses e-post på nytt",
+                        "account_created": "Konto opprettet! Sjekk e-posten din for instruksjoner om hvordan du aktiverer kontoen din."
+                    },
+                    "account": {
+                        "thank_you_note": "Takk for at du er en del av Home Assistant Cloud. Det er på grunn av personer som deg at vi er i stand til å lage en flott hjemme automasjon opplevelse for alle. takk!",
+                        "nabu_casa_account": "Nabu Casa konto",
+                        "connection_status": "Status for skytilkobling",
+                        "manage_account": "Administrer konto",
+                        "sign_out": "Logg ut",
+                        "integrations": "Integrasjoner",
+                        "integrations_introduction": "Integrasjoner for Home Assistant Cloud lar deg koble til tjenester i skyen uten å måtte avsløre Home Assistant-forekomsten offentlig på internett.",
+                        "integrations_introduction2": "Sjekk nettstedet for",
+                        "integrations_link_all_features": " alle tilgjengelige funksjoner",
+                        "connected": "Tilkoblet",
+                        "not_connected": "Ikke tilkoblet",
+                        "fetching_subscription": "Henter abonnement...",
+                        "remote": {
+                            "title": "Fjernkontroll",
+                            "access_is_being_prepared": "Ekstern tilgang forberedes. Vi vil varsle deg når den er klar.",
+                            "info": "Home Assistant Cloud gir en sikker ekstern tilkobling til forekomsten din mens du er borte fra hjemmet.",
+                            "instance_is_available": "Din forekomst er tilgjengelig på",
+                            "instance_will_be_available": "Din forekomst vil være tilgjengelig på",
+                            "link_learn_how_it_works": "Lær hvordan det fungerer",
+                            "certificate_info": "Sertifikatinformasjon"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Med Alexa-integrasjonen for Home Assistant Cloud vil du kunne kontrollere alle dine Home Assistant-enheter via hvilken som helst Alexa-aktivert enhet.",
+                            "enable_ha_skill": "Aktivere Home Assistant-ferdigheten for Alexa",
+                            "config_documentation": "Konfigurer dokumentasjon",
+                            "enable_state_reporting": "Aktiver tilstandsrapportering",
+                            "info_state_reporting": "Hvis du aktiverer tilstandsrapportering, vil Home Assistant sende alle tilstandsendringer av utsatte enheter til Amazon. Dette lar deg alltid se de siste tilstandene i Alexa-appen og bruke tilstandsendringene til å lage rutiner.",
+                            "sync_entities": "Synkroniser enheter",
+                            "manage_entities": "Administrer enheter",
+                            "sync_entities_error": "Kunne ikke synkronisere enheter:",
+                            "state_reporting_error": "Kan ikke {enable_disable} rapportere status.",
+                            "enable": "aktiver",
+                            "disable": "deaktiver"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "Med Google Assistant-integrasjonen for Home Assistant Cloud vil du kunne kontrollere alle dine Home Assistant-enheter via hvilken som helst Google Assistant-aktivert enhet.",
+                            "enable_ha_skill": "Aktivere Home Assistant-ferdigheten for Google Assistant",
+                            "config_documentation": "Konfigurer dokumentasjon",
+                            "enable_state_reporting": "Aktiver tilstandsrapportering",
+                            "info_state_reporting": "Hvis du aktiverer tilstandsrapportering, vil Home Assistant sende alle tilstandsendringer av utsatte enheter til Google. Dette lar deg alltid se de nyeste delene av Google-appen.",
+                            "security_devices": "Sikkerhetsenheter",
+                            "enter_pin_info": "Angi en PIN-kode for å samhandle med sikkerhetsenheter. Sikkerhetsanordninger er dører, garasjeporter og låser. Du vil bli bedt om å si\/angi denne PIN-koden når du samhandler med slike enheter via Google Assistant.",
+                            "devices_pin": "PIN-kode for sikkerhetsenheter",
+                            "enter_pin_hint": "Angi en PIN-kode for å bruke sikkerhetsenheter",
+                            "sync_entities": "Synkroniser enheter til Google",
+                            "manage_entities": "Administrer enheter",
+                            "enter_pin_error": "Kunne ikke lagre PIN-kode:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Alt som er konfigurert til å utløses av en webhook, kan gis en offentlig tilgjengelig URL-adresse for å tillate deg å sende data tilbake til Home Assistent fra hvor som helst, uten å utsette forekomsten din for Internett.",
+                            "no_hooks_yet": "Ser ut som du ikke har noen webhooks ennå. Kom i gang ved å konfigurere en ",
+                            "no_hooks_yet_link_integration": "webhook-basert integrasjon",
+                            "no_hooks_yet2": " eller ved å opprette en ",
+                            "no_hooks_yet_link_automation": "webhook automatisering",
+                            "link_learn_more": "Finn ut mer om hvordan du oppretter webhook-drevne automatiseringer.",
+                            "loading": "Laster inn ...",
+                            "manage": "Administrer",
+                            "disable_hook_error_msg": "Kan ikke deaktivere webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "Redigere hvilke enheter som vises via dette grensesnittet er deaktivert fordi du har konfigurert enhetsfiltre i configuration.yaml.",
+                        "exposed_entities": "Eksponerte enheter",
+                        "not_exposed_entities": "Ikke eksponerte enheter",
+                        "expose": "Eksponer til Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Sertifikatinformasjon",
+                        "certificate_expiration_date": "Utløpsdato for sertifikat",
+                        "will_be_auto_renewed": "Vil automatisk bli fornyet",
+                        "fingerprint": "Fingeravtrykk for sertifikat:",
+                        "close": "Lukk"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Eksponer til Google Assistant",
+                        "disable_2FA": "Deaktiver tofaktorautentisering",
+                        "banner": "Redigere hvilke enheter som vises via dette grensesnittet er deaktivert fordi du har konfigurert enhetsfiltre i configuration.yaml.",
+                        "exposed_entities": "Eksponerte enheter",
+                        "not_exposed_entities": "Ikke eksponerte enheter",
+                        "sync_to_google": "Synkroniserer endringer til Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook for {name}",
+                        "available_at": "Webhook er tilgjengelig på følgende URL:",
+                        "managed_by_integration": "Denne webhook administreres av en integrasjon og kan ikke deaktiveres.",
+                        "info_disable_webhook": "Hvis du ikke lenger ønsker å bruke denne webhook, kan du",
+                        "link_disable_webhook": "deaktiver den",
+                        "view_documentation": "Vis dokumentasjon",
+                        "close": "Lukk",
+                        "confirm_disable": "Er du sikker på at du vil deaktivere denne webhook?",
+                        "copied_to_clipboard": "Kopiert til utklippstavle"
+                    }
                 },
                 "integrations": {
                     "caption": "Integrasjoner",
@@ -720,7 +907,10 @@
                             "description": "Dette trinnet krever at du besøker et eksternt nettsted som skal fylles ut.",
                             "open_site": "Åpne nettsted"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Ikke alle integrasjoner kan konfigureres via brukergrensesnittet ennå.",
+                    "note_about_website_reference": "Flere er tilgjengelige på",
+                    "home_assistant_website": "Nettsted for Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Legg til enheter",
                         "spinner": "Søker etter ZHA Zigbee-enheter...",
-                        "discovery_text": "Oppdagede enheter vises her. Følg instruksjonene for enheten(e) og sett enheten(e) i paringsmodus."
+                        "discovery_text": "Oppdagede enheter vises her. Følg instruksjonene for enheten(e) og sett enheten(e) i paringsmodus.",
+                        "search_again": "Søk på nytt"
+                    },
+                    "common": {
+                        "add_devices": "Legg til enheter",
+                        "clusters": "Klynger",
+                        "devices": "Enheter",
+                        "manufacturer_code_override": "Overstyring av produsent kode",
+                        "value": "Verdi"
+                    },
+                    "network_management": {
+                        "header": "Nettverksadministrasjon",
+                        "introduction": "Kommandoer som påvirker hele nettverket"
+                    },
+                    "node_management": {
+                        "header": "Enhetshåndtering",
+                        "introduction": "Kjør ZHA-kommandoer som påvirker en enkelt enhet. Velg en enhet for å se en liste over tilgjengelige kommandoer.",
+                        "hint_battery_devices": "Merk: Søvnige (batteridrevne) enheter må være våkne når du utfører kommandoer mot dem. Du kan vanligvis vekke en søvnig enhet ved å utløse den.",
+                        "hint_wakeup": "Noen enheter, for eksempel Xiaomi-sensorer, har en vekkingsknapp som du kan trykke på med intervaller på ~ 5 sekunder for å holde enheter våkne mens du samhandler med dem.",
+                        "help_node_dropdown": "Velg en enhet for å vise alternativer per enhet."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Velg en klynge for å vise attributter og kommandoer."
+                    },
+                    "cluster_attributes": {
+                        "header": "Attributter for klynge",
+                        "introduction": "Se og rediger klyngeattributter.",
+                        "attributes_of_cluster": "Attributter for den valgte klyngen",
+                        "get_zigbee_attribute": "Hent ZigBee-attributt",
+                        "set_zigbee_attribute": "Angi Zigbee-attributt",
+                        "help_attribute_dropdown": "Velg en attributt for å se eller angi verdien.",
+                        "help_get_zigbee_attribute": "Hent verdien for det valgte attributtet.",
+                        "help_set_zigbee_attribute": "Angi attributtverdi for den spesifiserte klyngen på den angitte enheten."
+                    },
+                    "cluster_commands": {
+                        "header": "Klynge kommandoer",
+                        "introduction": "Se og utgi klyngekommandoer.",
+                        "commands_of_cluster": "Kommandoer for den valgte klyngen",
+                        "issue_zigbee_command": "Send Zigbee-kommando",
+                        "help_command_dropdown": "Velg en kommando du vil samhandle med."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant bygger opp et register over hver enhet den har sett som kan identifiseres unikt. Hver av disse enhetene vil ha en enhets-ID tilknyttet som vil bli reservert for bare denne enheten.",
                         "introduction2": "Bruk entitetsregisteret for å overskrive navnet, endre enhets ID eller fjern oppføringen fra Home Assistant. Merk at fjerning av enhetsregisteroppføringer ikke fjerner enheten. For å gjøre det, følg linken under og fjern den fra integrasjonssiden.",
                         "integrations_page": "Integrasjonsside",
-                        "show_disabled": "Vis deaktiverte enheter"
+                        "show_disabled": "Vis deaktiverte enheter",
+                        "headers": {
+                            "name": "Navn",
+                            "entity_id": "Enhet-ID",
+                            "integration": "Integrering",
+                            "enabled": "Aktivert"
+                        }
                     },
                     "editor": {
                         "unavailable": "Denne enheten er ikke tilgjengelig for øyeblikket.",
@@ -791,8 +1026,24 @@
                         "name": "Navn",
                         "device_tracker_intro": "Velg enhetene som tilhører denne personen.",
                         "device_tracker_picked": "Spor enhet",
-                        "device_tracker_pick": "Velg en enhet å spore"
-                    }
+                        "device_tracker_pick": "Velg en enhet å spore",
+                        "new_person": "Ny person",
+                        "name_error_msg": "Navn er påkrevd",
+                        "linked_user": "Koblet bruker",
+                        "no_device_tracker_available_intro": "Når du har enheter som indikerer tilstedeværelsen av en person, vil du kunne tilordne dem til en person her. Du kan legge til den første enheten ved å legge til en integrering av tilstedeværelses gjenkjenning fra integrerings siden.",
+                        "link_presence_detection_integrations": "Integrering av tilstedeværelses deteksjon",
+                        "link_integrations_page": "Integrasjonsside",
+                        "delete": "Slett",
+                        "create": "Opprett",
+                        "update": "Oppdater"
+                    },
+                    "introduction": "Her kan du definere hver person av interesse i Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Merk: personer konfigurert via configuration.yaml kan ikke redigeres via UI.",
+                    "no_persons_created_yet": "Ser ut som du ikke har opprettet noen personer ennå.",
+                    "create_person": "Opprett person",
+                    "add_person": "Legg til person",
+                    "confirm_delete": "Er du sikker på at du vil slette denne personen?",
+                    "confirm_delete2": "Alle enheter som tilhører denne personen vil ikke bli tildelt."
                 },
                 "server_control": {
                     "caption": "Server-kontroll",
@@ -838,6 +1089,11 @@
                             "caption": "Når noe er utløst..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Du har ulagrede endringer. Er du sikker på at du vil lukke?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Vibrere",
                     "description": "Aktiver eller deaktiver vibrasjoner på denne enheten når du kontrollerer enheter."
+                },
+                "advanced_mode": {
+                    "title": "Avansert modus",
+                    "description": "Home Assistant skjuler avanserte funksjoner og alternativer som standard. Du kan gjøre disse funksjonene tilgjengelige ved å merke av i denne veksleknappen. Dette er en brukerspesifikk innstilling som ikke påvirker andre brukere ved hjelp av Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Legg til kort",
                         "edit": "Rediger",
                         "delete": "Slett",
-                        "move": "Flytt"
+                        "move": "Flytt",
+                        "show_visual_editor": "Vis visuell redigering",
+                        "show_code_editor": "Vis koderedigering"
                     },
                     "migrate": {
                         "header": "Inkompatibel Konfigurasjon",
@@ -1121,7 +1383,8 @@
                             "optional": "Valgfritt"
                         },
                         "entities": {
-                            "show_header_toggle": "Vise topptekst veksling?"
+                            "show_header_toggle": "Vise topptekst veksling?",
+                            "name": "Enheter"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Grønn",
                                 "red": "Rød",
                                 "yellow": "Gul"
-                            }
+                            },
+                            "name": "Måler"
                         },
                         "glance": {
-                            "columns": "kolonner"
+                            "columns": "kolonner",
+                            "name": "Glance"
                         },
                         "generic": {
                             "aspect_ratio": "Størrelsesforholdet",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Kilder for geolokasjon",
                             "dark_mode": "Mørk modus?",
                             "default_zoom": "Standard zoom",
-                            "source": "Kilde"
+                            "source": "Kilde",
+                            "name": "Kart"
                         },
                         "markdown": {
-                            "content": "Innhold"
+                            "content": "Innhold",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Detaljer for graf",
-                            "graph_type": "Grafstype"
+                            "graph_type": "Grafstype",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Alarmpanel",
+                            "available_states": "Tilgjengelige tilstander"
+                        },
+                        "conditional": {
+                            "name": "Betinget"
+                        },
+                        "entity-button": {
+                            "name": "Enhetsknapp"
+                        },
+                        "entity-filter": {
+                            "name": "Enhetsfilter"
+                        },
+                        "history-graph": {
+                            "name": "Historikk graf"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horisontal Stack"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Lys"
+                        },
+                        "media-control": {
+                            "name": "Mediekontroll"
+                        },
+                        "picture": {
+                            "name": "Bilde"
+                        },
+                        "picture-elements": {
+                            "name": "Bilde Elements"
+                        },
+                        "picture-entity": {
+                            "name": "Bildeenhet"
+                        },
+                        "picture-glance": {
+                            "name": "Bilde Glance"
+                        },
+                        "plant-status": {
+                            "name": "Plant status"
+                        },
+                        "shopping-list": {
+                            "name": "Handleliste"
+                        },
+                        "thermostat": {
+                            "name": "Termostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Vertikal stabel"
+                        },
+                        "weather-forecast": {
+                            "name": "Værmelding"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "Slått av: {entity}",
             "service_called": "Tilkalte tjenesten: {service}",
             "service_call_failed": "Kunne ikke tilkalle tjenesten: {service}",
-            "connection_lost": "Forbindelsen ble brutt. Kobler til på nytt..."
+            "connection_lost": "Forbindelsen ble brutt. Kobler til på nytt...",
+            "triggered": "Utløst {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "Brukers navn",
                     "area_picker_label": "Område",
                     "update_name_button": "Oppdater navn"
-                }
+                },
+                "buttons": {
+                    "add": "Legg til enheter",
+                    "remove": "Fjern enhet",
+                    "reconfigure": "Rekonfigurer enhet"
+                },
+                "quirk": "Quirk",
+                "last_seen": "Sist sett",
+                "power_source": "Strømkilde",
+                "unknown": "Ukjent"
             }
         },
         "auth_store": {
diff --git a/translations/nl.json b/translations/nl.json
index 05b145d38b..b79e26b2aa 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -419,7 +419,7 @@
                         "learn_more": "Meer informatie over automatiseringen"
                     },
                     "editor": {
-                        "introduction": "Gebruik automatiseringen om je huis tot leven te brengen",
+                        "introduction": "Gebruik automatiseringen om je huis tot leven te brengen.",
                         "default_name": "Nieuwe automatisering",
                         "save": "Opslaan",
                         "unsaved_confirm": "Je hebt niet-opgeslagen wijzigingen. Weet je zeker dat je wilt afsluiten?",
@@ -558,7 +558,12 @@
                                     "zone": "Zone"
                                 },
                                 "device": {
-                                    "label": "Apparaat"
+                                    "label": "Apparaat",
+                                    "extra_fields": {
+                                        "above": "Boven",
+                                        "below": "Onder",
+                                        "for": "Duur"
+                                    }
                                 },
                                 "and": {
                                     "label": "En"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Apparaat"
+                                },
+                                "scene": {
+                                    "label": "Activeer scène"
                                 }
                             },
                             "learn_more": "Meer informatie over acties"
@@ -616,7 +624,18 @@
                 },
                 "script": {
                     "caption": "Script",
-                    "description": "Maak en bewerk scripts"
+                    "description": "Maak en bewerk scripts",
+                    "picker": {
+                        "header": "Script Editor",
+                        "learn_more": "Meer informatie over scripts",
+                        "add_script": "Script toevoegen"
+                    },
+                    "editor": {
+                        "header": "Script: {name}",
+                        "default_name": "Nieuw script",
+                        "load_error_not_editable": "Alleen scripts in scripts.yaml kunnen worden bewerkt.",
+                        "delete_confirm": "Weet je zeker dat je dit script wilt verwijderen?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +683,18 @@
                         "true": "Waar",
                         "false": "Niet waar",
                         "set_config_parameter": "Stel de configuratieparameter in"
+                    },
+                    "learn_more": "Meer informatie over Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW-logboek"
                     }
                 },
                 "users": {
                     "caption": "Gebruikers",
                     "description": "Gebruikers beheren",
                     "picker": {
-                        "title": "Gebruikers"
+                        "title": "Gebruikers",
+                        "system_generated": "Gemaakt door het systeem"
                     },
                     "editor": {
                         "rename_user": "Naam wijzigen",
@@ -678,7 +702,13 @@
                         "activate_user": "Activeer gebruiker",
                         "deactivate_user": "Deactiveer gebruiker",
                         "delete_user": "Verwijder gebruiker",
-                        "caption": "Bekijk gebruiker"
+                        "caption": "Bekijk gebruiker",
+                        "id": "ID",
+                        "owner": "Eigenaar",
+                        "group": "Groep",
+                        "active": "Actief",
+                        "enter_new_name": "Voer een nieuwe naam in",
+                        "confirm_user_deletion": "Weet je zeker dat je {name} wilt verwijderen?"
                     },
                     "add_user": {
                         "caption": "Gebruiker toevoegen",
@@ -692,7 +722,50 @@
                     "caption": "Home Assistent Cloud",
                     "description_login": "Ingelogd als {email}",
                     "description_not_login": "Niet ingelogd",
-                    "description_features": "Bestuur weg van huis, verbind met Alexa en Google Assistant."
+                    "description_features": "Bestuur weg van huis, verbind met Alexa en Google Assistant.",
+                    "forgot_password": {
+                        "email": "E-mail",
+                        "email_error_msg": "Ongeldig e-mail"
+                    },
+                    "account": {
+                        "sign_out": "Afmelden",
+                        "alexa": {
+                            "info": "Met de Alexa integratie voor Home Assistant Cloud kun je al je Home Assistant apparaten bedienen via elk apparaat met Alexa-ondersteuning",
+                            "enable_ha_skill": "Schakel de Home Assistant skill voor Alexa",
+                            "config_documentation": "Configuratie documentatie",
+                            "enable_state_reporting": "Statusrapportage inschakelen",
+                            "info_state_reporting": "Als u statusrapportage inschakelt, stuurt Home Assistant alle statuswijzingen van opengestelde entiteiten naar Amazon. Hiermee kunt u altijd de laatste status zien in de Alexa app en kunt u de statuswijzgingen gebruiken om routines te maken.",
+                            "enable": "inschakelen",
+                            "disable": "uitschakelen"
+                        },
+                        "google": {
+                            "enable_state_reporting": "Statusrapportage inschakelen",
+                            "enter_pin_error": "Kan pincode niet opslaan:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "no_hooks_yet": "Het lijkt erop dat je nog geen webhooks hebt. Ga aan de slag door het configureren van een ",
+                            "no_hooks_yet_link_integration": "webhook gebaseerde integratie",
+                            "no_hooks_yet2": " of door het maken van een ",
+                            "no_hooks_yet_link_automation": "webhook automatisering",
+                            "loading": "Laden ...",
+                            "manage": "Beheer"
+                        }
+                    },
+                    "dialog_certificate": {
+                        "close": "Sluiten"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "sync_to_google": "Wijzigingen synchroniseren met Google."
+                    },
+                    "dialog_cloudhook": {
+                        "managed_by_integration": "Deze webhook wordt beheerd door een integratie en kan niet worden uitgeschakeld.",
+                        "info_disable_webhook": "Als je deze webhook niet langer wilt gebruiken, kun je het",
+                        "link_disable_webhook": "uitschakelen",
+                        "view_documentation": "Bekijk documentatie",
+                        "close": "Sluiten"
+                    }
                 },
                 "integrations": {
                     "caption": "Integraties",
@@ -720,7 +793,9 @@
                             "description": "Deze stap vereist dat je een externe website bezoekt om dit te voltooien.",
                             "open_site": "Open website"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Nog niet alle integraties kunnen via de UI worden geconfigureerd.",
+                    "home_assistant_website": "Home Assistant-website"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +813,22 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Apparaten toevoegen",
                         "spinner": "Zoeken naar ZHA Zigbee-apparaten ...",
-                        "discovery_text": "Gevonden apparaten worden hier weergegeven. Volg de instructies voor je apparaat of apparaten en plaats het apparaat of de apparaten in de koppelingsmodus."
+                        "discovery_text": "Gevonden apparaten worden hier weergegeven. Volg de instructies voor je apparaat of apparaten en plaats het apparaat of de apparaten in de koppelingsmodus.",
+                        "search_again": "Opnieuw zoeken"
+                    },
+                    "common": {
+                        "add_devices": "Apparaten toevoegen",
+                        "clusters": "Clusters",
+                        "devices": "Apparaten",
+                        "value": "Waarde"
+                    },
+                    "network_management": {
+                        "header": "Netwerkbeheer",
+                        "introduction": "Commando's die het hele netwerk beïnvloeden"
+                    },
+                    "node_management": {
+                        "header": "Apparaatbeheer",
+                        "hint_wakeup": "Sommige apparaten, zoals Xiaomi-sensoren hebben een wekknop die u met tussenpozen van 5 seconden kunt indrukken om het apparaat wakker te houden terwijl u ermee communiceert"
                     }
                 },
                 "area_registry": {
@@ -768,9 +858,15 @@
                         "header": "Entiteitenregister",
                         "unavailable": "(niet beschikbaar)",
                         "introduction": "Home Assistant houdt een register bij van elke entiteit die het ooit heeft gezien en die uniek kan worden geïdentificeerd. Elk van deze entiteiten krijgt een entiteit-ID toegewezen die alleen voor deze entiteit wordt gereserveerd.",
-                        "introduction2": "Gebruik het entiteitenregister om de naam te overschrijven, de entiteits-ID te wijzigen of het item te verwijderen uit de Home Assistant. Opmerking: als u de entiteitsregistervermelding verwijdert, wordt de entiteit niet verwijderd. Hiertoe volgt u de onderstaande koppeling en verwijdert u deze van de integratiespagina.",
+                        "introduction2": "Gebruik het entiteitenregister om de naam te overschrijven, de entiteits-ID te wijzigen of het item te verwijderen uit Home Assistant. Opmerking: als u de entiteitsregistervermelding verwijdert, wordt de entiteit niet verwijderd. Hiertoe volgt u de onderstaande koppeling en verwijdert u deze van de integratiespagina.",
                         "integrations_page": "Integratiespagina",
-                        "show_disabled": "Uitgeschakelde entiteiten weergeven"
+                        "show_disabled": "Uitgeschakelde entiteiten weergeven",
+                        "headers": {
+                            "name": "Naam",
+                            "entity_id": "Entiteits-ID",
+                            "integration": "Integratie",
+                            "enabled": "Ingeschakeld"
+                        }
                     },
                     "editor": {
                         "unavailable": "Deze entiteit is momenteel niet beschikbaar.",
@@ -791,8 +887,20 @@
                         "name": "Naam",
                         "device_tracker_intro": "Selecteer de apparaten die bij deze persoon horen.",
                         "device_tracker_picked": "Volg apparaat",
-                        "device_tracker_pick": "Kies apparaat om te volgen"
-                    }
+                        "device_tracker_pick": "Kies apparaat om te volgen",
+                        "new_person": "Nieuw persoon",
+                        "name_error_msg": "Naam is vereist",
+                        "linked_user": "Gekoppelde gebruiker",
+                        "link_presence_detection_integrations": "Aanwezigheidsdetectie-integraties",
+                        "link_integrations_page": "Integratiespagina",
+                        "delete": "Verwijderen",
+                        "create": "Aanmaken",
+                        "update": "Bijwerken"
+                    },
+                    "note_about_persons_configured_in_yaml": "Opmerking: personen die zijn geconfigureerd via configuration.yaml kunnen niet worden bewerkt via de UI.",
+                    "no_persons_created_yet": "Het lijkt erop dat je nog geen personen hebt aangemaakt.",
+                    "create_person": "Persoon aanmaken",
+                    "add_person": "Persoon toevoegen"
                 },
                 "server_control": {
                     "caption": "Serverbeheer",
@@ -917,6 +1025,10 @@
                 "vibrate": {
                     "header": "Trillen",
                     "description": "Schakel trillingen op dit apparaat in of uit wanneer u apparaten bestuurt."
+                },
+                "advanced_mode": {
+                    "title": "Geavanceerde modus",
+                    "description": "Home Assistant verbergt standaard geavanceerde functies en opties. U kunt deze functies toegankelijk maken door deze schakelaar aan te zetten. Dit is een gebruikersspecifieke instelling en heeft geen invloed op andere gebruikers die Home Assistant gebruiken."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1189,9 @@
                         "add": "Kaart toevoegen",
                         "edit": "Bewerken",
                         "delete": "Verwijder",
-                        "move": "Verplaatsen"
+                        "move": "Verplaatsen",
+                        "show_visual_editor": "Visual Editor weergeven",
+                        "show_code_editor": "Code-editor weergeven"
                     },
                     "migrate": {
                         "header": "Configuratie incompatibel",
@@ -1121,7 +1235,8 @@
                             "optional": "Optioneel"
                         },
                         "entities": {
-                            "show_header_toggle": "Koptekst weergeven wisselen?"
+                            "show_header_toggle": "Koptekst weergeven wisselen?",
+                            "name": "Entiteiten"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1244,12 @@
                                 "green": "Groen",
                                 "red": "Rood",
                                 "yellow": "Geel"
-                            }
+                            },
+                            "name": "Meter"
                         },
                         "glance": {
-                            "columns": "Kolommen"
+                            "columns": "Kolommen",
+                            "name": "Oogopslag"
                         },
                         "generic": {
                             "aspect_ratio": "Beeldverhouding",
@@ -1162,14 +1279,72 @@
                             "geo_location_sources": "Geolocatiebronnen",
                             "dark_mode": "Donkere modus?",
                             "default_zoom": "Standaard zoom",
-                            "source": "Bron"
+                            "source": "Bron",
+                            "name": "Kaart"
                         },
                         "markdown": {
-                            "content": "Inhoud"
+                            "content": "Inhoud",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Grafiek Detail",
-                            "graph_type": "Grafiektype"
+                            "graph_type": "Grafiektype",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Alarm paneel",
+                            "available_states": "Beschikbare statussen"
+                        },
+                        "conditional": {
+                            "name": "Conditioneel"
+                        },
+                        "entity-button": {
+                            "name": "Entiteit-knop"
+                        },
+                        "entity-filter": {
+                            "name": "Entiteit-filter"
+                        },
+                        "history-graph": {
+                            "name": "Geschiedenis grafiek"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horizontale stapel"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Lamp"
+                        },
+                        "media-control": {
+                            "name": "Mediaspeler"
+                        },
+                        "picture": {
+                            "name": "Afbeelding"
+                        },
+                        "picture-elements": {
+                            "name": "Afbeeldingselementen"
+                        },
+                        "picture-entity": {
+                            "name": "Afbeelding-entiteit"
+                        },
+                        "picture-glance": {
+                            "name": "Afbeelding oogopslag"
+                        },
+                        "plant-status": {
+                            "name": "toestand plant"
+                        },
+                        "shopping-list": {
+                            "name": "Boodschappenlijst"
+                        },
+                        "thermostat": {
+                            "name": "Thermostaat"
+                        },
+                        "vertical-stack": {
+                            "name": "Verticale stapel"
+                        },
+                        "weather-forecast": {
+                            "name": "Weersverwachting"
                         }
                     }
                 },
@@ -1451,7 +1626,15 @@
                     "device_name_placeholder": "Door gebruiker ingegeven naam",
                     "area_picker_label": "Gebied",
                     "update_name_button": "Naam bijwerken"
-                }
+                },
+                "buttons": {
+                    "add": "Apparaten toevoegen",
+                    "remove": "Verwijder apparaat",
+                    "reconfigure": "Apparaat opnieuw configureren"
+                },
+                "last_seen": "Laatst gezien",
+                "power_source": "Stroombron",
+                "unknown": "Onbekend"
             }
         },
         "auth_store": {
diff --git a/translations/pl.json b/translations/pl.json
index 43a3050a76..27e94a650b 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -82,7 +82,7 @@
             },
             "battery": {
                 "off": "naładowana",
-                "on": "Rozładowana"
+                "on": "rozładowana"
             },
             "problem": {
                 "off": "ok",
@@ -113,8 +113,8 @@
                 "on": "otwarte"
             },
             "lock": {
-                "off": "zamknięty",
-                "on": "otwarty"
+                "off": "zablokowany",
+                "on": "odblokowany"
             }
         },
         "calendar": {
@@ -168,7 +168,7 @@
             "on": "włączony",
             "home": "w domu",
             "not_home": "poza domem",
-            "open": "otwarta",
+            "open": "otwarte",
             "opening": "otwieranie",
             "closed": "zamknięte",
             "closing": "zamykanie",
@@ -194,7 +194,7 @@
             "off": "wyłączony",
             "on": "włączony",
             "playing": "odtwarzanie",
-            "paused": "pauza",
+            "paused": "wstrzymany",
             "idle": "nieaktywny",
             "standby": "tryb czuwania"
         },
@@ -233,7 +233,7 @@
                 "ready": "gotowy"
             },
             "query_stage": {
-                "initializing": "inicjalizacja ( {query_stage} )",
+                "initializing": "inicjalizacja ({query_stage})",
                 "dead": "martwy ({query_stage})"
             }
         },
@@ -290,7 +290,7 @@
             "pending": "oczek",
             "arming": "uzbr",
             "disarming": "rozbr",
-            "triggered": "wyzwol",
+            "triggered": "wyzw",
             "armed_custom_bypass": "uzbr"
         },
         "device_tracker": {
@@ -412,17 +412,17 @@
                     "description": "Twórz i edytuj automatyzacje",
                     "picker": {
                         "header": "Edytor automatyzacji",
-                        "introduction": "Edytor automatyzacji pozwala tworzyć i edytować automatyzacje Kliknij poniższy link, aby przeczytać instrukcję, jak poprawnie skonfigurować automatyzacje w Home Assistant.",
+                        "introduction": "Edytor automatyzacji pozwala tworzyć i edytować automatyzacje Kliknij poniższy link, aby przeczytać instrukcję, jak poprawnie konfigurować automatyzacje w Home Assistant.",
                         "pick_automation": "Wybierz automatyzację do edycji",
                         "no_automations": "Nie znaleziono żadnych edytowalnych automatyzacji",
                         "add_automation": "Dodaj automatyzację",
                         "learn_more": "Dowiedz się więcej o automatyzacjach"
                     },
                     "editor": {
-                        "introduction": "Użyj automatyzacji, aby utrzymać swój dom przy życiu",
+                        "introduction": "Użyj automatyzacji, aby ożywić swój dom",
                         "default_name": "Nowa automatyzacja",
                         "save": "Zapisz",
-                        "unsaved_confirm": "Masz niezapisane zmiany. Jesteś pewny, że chcesz wyjść?",
+                        "unsaved_confirm": "Masz niezapisane zmiany. Na pewno chcesz wyjść?",
                         "alias": "Nazwa",
                         "triggers": {
                             "header": "Wyzwalacze",
@@ -558,7 +558,12 @@
                                     "zone": "Strefa"
                                 },
                                 "device": {
-                                    "label": "Urządzenie"
+                                    "label": "Urządzenie",
+                                    "extra_fields": {
+                                        "above": "Powyżej",
+                                        "below": "Poniżej",
+                                        "for": "Czas trwania"
+                                    }
                                 },
                                 "and": {
                                     "label": "I"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Urządzenie"
+                                },
+                                "scene": {
+                                    "label": "Aktywuj scenę"
                                 }
                             },
                             "learn_more": "Dowiedz się więcej o akcjach"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Skrypty",
-                    "description": "Twórz i edytuj skrypty"
+                    "description": "Twórz i edytuj skrypty",
+                    "picker": {
+                        "header": "Edytor skryptów",
+                        "introduction": "Edytor skryptów pozwala tworzyć i edytować skrypty. Kliknij poniższy link, aby przeczytać instrukcję, jak poprawnie konfigurować skrypty w Home Assistant.",
+                        "learn_more": "Dowiedz się więcej o skryptach",
+                        "no_scripts": "Nie znaleziono żadnych edytowalnych skryptów",
+                        "add_script": "Dodaj skrypt"
+                    },
+                    "editor": {
+                        "header": "Skrypt: {name}",
+                        "default_name": "Nowy skrypt",
+                        "load_error_not_editable": "Edytowalne są tylko automatyzacje w pliku scripts.yaml.",
+                        "delete_confirm": "Na pewno chcesz usunąć ten skrypt?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Prawda",
                         "false": "Fałsz",
                         "set_config_parameter": "Ustaw parametr konfiguracji"
+                    },
+                    "learn_more": "Dowiedz się więcej o Z-Wave",
+                    "ozw_log": {
+                        "header": "Log OpenZWave",
+                        "introduction": "Określ liczbowo długość loga. 0 to minimum (ładuje całość), a 1000 to maksimum. Klawisz Load ładuje i wyświetla log statyczny.\nKlawisz Tail ładuje i wyświetla określoną liczbę ostatnich linii logu."
                     }
                 },
                 "users": {
                     "caption": "Użytkownicy",
                     "description": "Zarządzaj użytkownikami",
                     "picker": {
-                        "title": "Użytkownicy"
+                        "title": "Użytkownicy",
+                        "system_generated": "Wygenerowany przez system"
                     },
                     "editor": {
                         "rename_user": "Zmień nazwę użytkownika",
@@ -678,7 +705,18 @@
                         "activate_user": "Aktywuj użytkownika",
                         "deactivate_user": "Dezaktywuj użytkownika",
                         "delete_user": "Usuń użytkownika",
-                        "caption": "Wyświetl użytkownika"
+                        "caption": "Wyświetl użytkownika",
+                        "id": "Identyfikator",
+                        "owner": "Właściciel",
+                        "group": "Grupa",
+                        "active": "Aktywny",
+                        "system_generated": "Wygenerowany przez system",
+                        "system_generated_users_not_removable": "Nie można usunąć użytkowników wygenerowanych przez system.",
+                        "unnamed_user": "Nienazwany użytkownik",
+                        "enter_new_name": "Wprowadź nową nazwę",
+                        "user_rename_failed": "Nie powiodła się zmiana nazwy użytkownika:",
+                        "group_update_failed": "Nie powiodła się aktualizacja grupy:",
+                        "confirm_user_deletion": "Na pewno chcesz usunąć {name}?"
                     },
                     "add_user": {
                         "caption": "Dodaj użytkownika",
@@ -692,7 +730,156 @@
                     "caption": "Chmura Home Assistant",
                     "description_login": "Zalogowany jako {email}",
                     "description_not_login": "Nie zalogowany",
-                    "description_features": "Sterowanie spoza domu, integracja z Alexą i Google Assistant."
+                    "description_features": "Sterowanie spoza domu, integracja z Alexą i Google Assistant.",
+                    "login": {
+                        "title": "Logowanie do chmury",
+                        "introduction": "Chmura Home Assistant zapewnia bezpieczne zdalne połączenie z instancją z dala od domu. Umożliwia także łączenie się z usługami w chmurze: Amazon Alexa i Google Assistant.",
+                        "introduction2": "Ta usługa jest prowadzona przez naszego partnera ",
+                        "introduction2a": ", firma założona przez założycieli Home Assistant i Hass.io.",
+                        "introduction3": "Chmura Home Assistant to usługa subskrypcyjna z bezpłatnym miesięcznym okresem próbnym. Informacje o środkach płatności nie są konieczne.",
+                        "learn_more_link": "Dowiedz się więcej o Chmurze Home Assistant",
+                        "dismiss": "Odrzuć",
+                        "sign_in": "Zaloguj",
+                        "email": "Adres e-mail",
+                        "email_error_msg": "Niepoprawny adres e-mail",
+                        "password": "Hasło",
+                        "password_error_msg": "Hasło musi zawierać przynajmniej 8 znaków",
+                        "forgot_password": "Zapomniałeś hasła?",
+                        "start_trial": "Rozpocznij bezpłatny miesięczny okres próbny",
+                        "trial_info": "Informacje o środkach płatności nie są konieczne",
+                        "alert_password_change_required": "Musisz zmienić hasło przed zalogowaniem.",
+                        "alert_email_confirm_necessary": "Przed zalogowaniem musisz potwierdzić swój adres e-mail."
+                    },
+                    "forgot_password": {
+                        "title": "Zapomniane hasło",
+                        "subtitle": "Zapomniałeś hasła",
+                        "instructions": "Wprowadź swój adres e-mail, a my wyślemy Ci link resetowania hasła.",
+                        "email": "Adres e-mail",
+                        "email_error_msg": "Niepoprawny adres e-mail",
+                        "send_reset_email": "Wyślij wiadomość e-mail",
+                        "check_your_email": "Sprawdź pocztę e-mail, aby uzyskać instrukcje dotyczące resetowania hasła."
+                    },
+                    "register": {
+                        "title": "Zarejestruj konto",
+                        "headline": "Rozpocznij darmowy okres próbny",
+                        "information": "Utwórz konto, aby rozpocząć bezpłatny miesięczny okres próbny Chmury Home Assistant. Informacje o środkach płatności nie są konieczne.",
+                        "information2": "Wersja próbna zapewni Ci dostęp do wszystkich zalet Chmury Home Assistant, w tym:",
+                        "feature_remote_control": "kontrola Home Assistant'em z dala od domu",
+                        "feature_google_home": "integracja z Google Assistant",
+                        "feature_amazon_alexa": "integracja z Amazon Alexa",
+                        "feature_webhook_apps": "prosta integracja z aplikacjami opartymi na webhook'ach, takimi jak OwnTracks",
+                        "information3": "Ta usługa jest prowadzona przez naszego partnera ",
+                        "information3a": ", firma założona przez założycieli Home Assistant i Hass.io.",
+                        "information4": "Rejestrując konto, wyrażasz zgodę na następujące warunki.",
+                        "link_terms_conditions": "Zasady i warunki",
+                        "link_privacy_policy": "Polityka prywatności",
+                        "create_account": "Utwórz konto",
+                        "email_address": "Adres e-mail",
+                        "email_error_msg": "Niepoprawny adres e-mail",
+                        "password": "Hasło",
+                        "password_error_msg": "Hasło musi zawierać przynajmniej 8 znaków",
+                        "start_trial": "Rozpocznij darmowy okres próbny",
+                        "resend_confirm_email": "Wyślij ponownie wiadomość e-mail z potwierdzeniem",
+                        "account_created": "Konto utworzone! Sprawdź pocztę e-mail, aby uzyskać instrukcje dotyczące aktywacji konta."
+                    },
+                    "account": {
+                        "thank_you_note": "Dziękujemy, że jesteś częścią Chmury Home Assistant. To dzięki ludziom takim jak Ty jesteśmy w stanie zapewnić wszystkim wspaniałe doświadczenia z automatyzacją domu. Dziękuję Ci!",
+                        "nabu_casa_account": "Konto Nabu Casa",
+                        "connection_status": "Status połączenia z chmurą",
+                        "manage_account": "Zarządzanie kontem",
+                        "sign_out": "Wyloguj",
+                        "integrations": "Integracje",
+                        "integrations_introduction": "Integracje Chmury Home Assistant pozwalają łączyć się z usługami w chmurze bez konieczności publicznego udostępniania instancji Home Assistant w Internecie.",
+                        "integrations_introduction2": "Wejdź na stronę, aby poznać ",
+                        "integrations_link_all_features": "wszystkie dostępne funkcje",
+                        "connected": "połączono",
+                        "not_connected": "brak połączenia",
+                        "fetching_subscription": "Pobieranie subskrypcji…",
+                        "remote": {
+                            "title": "Dostęp zdalny",
+                            "access_is_being_prepared": "Trwa przygotowywanie dostępu zdalnego. Powiadomimy Cię, gdy będzie gotowy.",
+                            "info": "Chmura Home Assistant umożliwia bezpieczny zdalny dostęp do instancji Home Assistant'a z dala od domu.",
+                            "instance_is_available": "Twoja instancja jest dostępna pod adresem",
+                            "instance_will_be_available": "Twoja instancja będzie dostępna pod adresem",
+                            "link_learn_how_it_works": "Dowiedz się, jak to działa",
+                            "certificate_info": "Informacje o certyfikacie"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Dzięki integracji z Alexą dla Chmury Home Assistant będzie możliwe kontrolowanie wszystkich urządzeń Home Assistant'a za pośrednictwem dowolnego urządzenia obsługującego Amazon Alexa.",
+                            "enable_ha_skill": "Włącz skill Home Assistant'a dla Alexy",
+                            "config_documentation": "Dokumentacja konfiguracji",
+                            "enable_state_reporting": "Włącz raportowanie stanów",
+                            "info_state_reporting": "Jeśli włączysz raportowanie stanów, Home Assistant wyśle wszystkie zmiany stanu udostępnionych encji na serwery Amazona. Dzięki temu zawsze możesz zobaczyć najnowsze stany w aplikacji Alexa i używać zmian stanów do tworzenia rutyn.",
+                            "sync_entities": "Synchronizuj encje",
+                            "manage_entities": "Zarządzanie encjami",
+                            "sync_entities_error": "Nie udało się zsynchronizować encji:",
+                            "state_reporting_error": "Nie można przesłać stanu {enable_disable}.",
+                            "enable": "Włącz",
+                            "disable": "Wyłącz"
+                        },
+                        "google": {
+                            "title": "Asystent Google",
+                            "info": "Dzięki integracji z Asystentem Google dla Chmury Home Assistant będzie możliwe kontrolowanie wszystkich urządzeń Home Assistant'a za pośrednictwem dowolnego urządzenia obsługującego Asystenta Google.",
+                            "enable_ha_skill": "Włącz skill Home Assistant'a dla Asystenta Google",
+                            "config_documentation": "Dokumentacja konfiguracji",
+                            "enable_state_reporting": "Włącz raportowanie stanów",
+                            "info_state_reporting": "Jeśli włączysz raportowanie stanów, Home Assistant wyśle wszystkie zmiany stanu udostępnionych encji na serwery Google. Dzięki temu zawsze możesz zobaczyć najnowsze stany w aplikacji Google.",
+                            "security_devices": "Urządzenia bezpieczeństwa",
+                            "enter_pin_info": "Wpisz kod PIN, aby wejść w interakcję z urządzeniami bezpieczeństwa. Urządzeniami bezpieczeństwa są drzwi, drzwi garażowe i zamki. Podczas interakcji z takimi urządzeniami za pośrednictwem Asystenta Google zostaniesz poproszony o wprowadzenie tego kodu PIN.",
+                            "devices_pin": "Kod PIN urządzeń bezpieczeństwa",
+                            "enter_pin_hint": "Wprowadź kod PIN, aby korzystać z urządzeń bezpieczeństwa",
+                            "sync_entities": "Synchronizuj encje",
+                            "manage_entities": "Zarządzanie encjami",
+                            "enter_pin_error": "Nie można zapisać kodu PIN:"
+                        },
+                        "webhooks": {
+                            "title": "Webhook'i",
+                            "info": "Wszystko, co jest skonfigurowane do działania poprzez webhook, może otrzymać publicznie dostępny adres URL, aby umożliwić wysyłanie danych do Home Assistant z dowolnego miejsca, bez narażania instancji na publiczny dostęp z Internetu.",
+                            "no_hooks_yet": "Wygląda na to, że nie masz jeszcze żadnych webhook'ów. Rozpocznij od skonfigurowania ",
+                            "no_hooks_yet_link_integration": "Integracja oparta na webhook'ach",
+                            "no_hooks_yet2": " lub tworząc ",
+                            "no_hooks_yet_link_automation": "Automatyzacja webhook",
+                            "link_learn_more": "Dowiedz się więcej o tworzeniu automatyzacji opartych na webhook'ach.",
+                            "loading": "Wczytywanie...",
+                            "manage": "Zarządzanie",
+                            "disable_hook_error_msg": "Nie udało się wyłączyć webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "Edytowanie, które encje są udostępnione za pomocą interfejsu użytkownika, jest wyłączone, ponieważ skonfigurowano filtry encji w pliku configuration.yaml.",
+                        "exposed_entities": "Udostępnione encje",
+                        "not_exposed_entities": "Nieudostępnione encje",
+                        "expose": "Udostępnione do Alexy"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Informacja o certyfikacie",
+                        "certificate_expiration_date": "Data ważności certyfikatu",
+                        "will_be_auto_renewed": "Będzie automatycznie odnawiany",
+                        "fingerprint": "Odcisk palca certyfikatu:",
+                        "close": "Zamknij"
+                    },
+                    "google": {
+                        "title": "Asystent Google",
+                        "expose": "Udostępnione do Asystenta Google",
+                        "disable_2FA": "Wyłącz uwierzytelnianie dwuskładnikowe",
+                        "banner": "Edytowanie, które encje są udostępnione za pomocą interfejsu użytkownika, jest wyłączone, ponieważ skonfigurowano filtry encji w pliku configuration.yaml.",
+                        "exposed_entities": "Udostępnione encje",
+                        "not_exposed_entities": "Nieudostępnione encje",
+                        "sync_to_google": "Synchronizowanie zmian z Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook dla {name}",
+                        "available_at": "Webhook jest dostępny pod następującym adresem URL:",
+                        "managed_by_integration": "Ten webhook jest zarządzany przez integrację i nie można go wyłączyć.",
+                        "info_disable_webhook": "Jeśli nie chcesz już używać tego webhook'a, możesz",
+                        "link_disable_webhook": "wyłączyć go",
+                        "view_documentation": "Dokumentacja",
+                        "close": "Zamknij",
+                        "confirm_disable": "Na pewno chcesz wyłączyć ten webhook?",
+                        "copied_to_clipboard": "Skopiowano do schowka"
+                    }
                 },
                 "integrations": {
                     "caption": "Integracje",
@@ -705,7 +892,7 @@
                     "config_entry": {
                         "no_devices": "Ta integracja nie ma żadnych urządzeń.",
                         "no_device": "Encje bez urządzeń",
-                        "delete_confirm": "Czy na pewno chcesz usunąć tę integrację?",
+                        "delete_confirm": "Na pewno chcesz usunąć tę integrację?",
                         "restart_confirm": "Zrestartuj Home Assistant'a, aby zakończyć usuwanie tej integracji",
                         "manuf": "przez: {manufacturer}",
                         "via": "Połączony przez",
@@ -720,7 +907,10 @@
                             "description": "Ten krok wymaga od Ciebie odwiedzenia zewnętrznej strony.",
                             "open_site": "Otwórz stronę"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Jeszcze nie wszystkie integracje można skonfigurować za pomocą interfejsu użytkownika.",
+                    "note_about_website_reference": "Więcej jest dostępnych na stronie ",
+                    "home_assistant_website": "Home Assistant'a"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Dodaj urządzenia",
                         "spinner": "Wyszukiwanie urządzeń ZHA Zigbee...",
-                        "discovery_text": "Wykryte urządzenia pojawią się tutaj. Postępuj zgodnie z instrukcjami dla urządzeń, by wprowadzić je w tryb parowania."
+                        "discovery_text": "Wykryte urządzenia pojawią się tutaj. Postępuj zgodnie z instrukcjami dla urządzeń, by wprowadzić je w tryb parowania.",
+                        "search_again": "Szukaj ponownie"
+                    },
+                    "common": {
+                        "add_devices": "Dodaj urządzenia",
+                        "clusters": "Klastry",
+                        "devices": "Urządzenia",
+                        "manufacturer_code_override": "Zastąpienie kodu producenta",
+                        "value": "Wartość"
+                    },
+                    "network_management": {
+                        "header": "Zarządzanie siecią",
+                        "introduction": "Polecenia, które wpływają na całą sieć"
+                    },
+                    "node_management": {
+                        "header": "Zarządzanie urządzeniami",
+                        "introduction": "Uruchom polecenia ZHA, które wpływają na pojedyncze urządzenie. Wybierz urządzenie, aby wyświetlić listę dostępnych poleceń.",
+                        "hint_battery_devices": "Uwaga: usypiane urządzenia (zasilane bateryjnie) muszą się obudzić podczas wykonywania poleceń. Na ogół możesz obudzić uśpione urządzenie, uruchamiając je.",
+                        "hint_wakeup": "Niektóre urządzenia, takie jak czujniki Xiaomi, mają przycisk budzenia, który można naciskać w odstępach co około 5 sekund, dzięki czemu urządzenia pozostają w stanie czuwania podczas interakcji z nimi.",
+                        "help_node_dropdown": "Wybierz urządzenie, aby wyświetlić jego opcje."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Wybierz klaster, aby wyświetlić atrybuty i polecenia."
+                    },
+                    "cluster_attributes": {
+                        "header": "Atrybuty klastra",
+                        "introduction": "Wyświetl i edytuj atrybuty klastra.",
+                        "attributes_of_cluster": "Atrybuty wybranego klastra",
+                        "get_zigbee_attribute": "Wyświetl atrybut Zigbee",
+                        "set_zigbee_attribute": "Ustaw atrybut Zigbee",
+                        "help_attribute_dropdown": "Wybierz atrybut, aby wyświetlić lub ustawić jego wartość",
+                        "help_get_zigbee_attribute": "Wyświetl wartość dla wybranego atrybutu",
+                        "help_set_zigbee_attribute": "Ustaw wartość atrybutu dla określonego klastra i określonej encji"
+                    },
+                    "cluster_commands": {
+                        "header": "Komendy klastra",
+                        "introduction": "Wyświetl i wydaj polecenia klastra",
+                        "commands_of_cluster": "Polecenia wybranego klastra",
+                        "issue_zigbee_command": "Wydaj polecenie Zigbee",
+                        "help_command_dropdown": "Wybierz polecenie do interakcji"
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant prowadzi rejestr każdej encji, jaką kiedykolwiek widział i którą można jednoznacznie zidentyfikować. Każda z tych encji będzie miała przypisany unikalny identyfikator, który będzie zarezerwowany tylko dla niej.",
                         "introduction2": "Użyj rejestru encji, aby nadpisać jej nazwę, zmienić jej identyfikator lub usunąć ją z Home Assistant'a. Uwaga: usunięcie wpisu rejestru encji nie spowoduje usunięcia encji. Aby to zrobić, kliknij poniższy link i usuń integracje encji.",
                         "integrations_page": "Strona integracji",
-                        "show_disabled": "Wyświetl nieużywane encje"
+                        "show_disabled": "Wyświetl nieużywane encje",
+                        "headers": {
+                            "name": "Nazwa",
+                            "entity_id": "Identyfikator encji",
+                            "integration": "Integracja",
+                            "enabled": "Włączone"
+                        }
                     },
                     "editor": {
                         "unavailable": "Ta encja nie jest obecnie dostępna.",
@@ -780,7 +1015,7 @@
                         "enabled_label": "Włącz encję",
                         "enabled_cause": "Wyłączone przez {cause}.",
                         "enabled_description": "Wyłączone encje nie będą dodawane do Home Assistant'a.",
-                        "confirm_delete": "Czy na pewno chcesz usunąć ten wpis?",
+                        "confirm_delete": "Na pewno chcesz usunąć ten wpis?",
                         "confirm_delete2": "Usunięcie wpisu nie spowoduje usunięcia encji z Home Assistant'a. Aby to zrobić, musisz usunąć integrację '{platform}'."
                     }
                 },
@@ -791,8 +1026,24 @@
                         "name": "Imię",
                         "device_tracker_intro": "Wybierz urządzenia należące do tej osoby.",
                         "device_tracker_picked": "Śledź urządzenie",
-                        "device_tracker_pick": "Wybierz urządzenie do śledzenia"
-                    }
+                        "device_tracker_pick": "Wybierz urządzenie do śledzenia",
+                        "new_person": "Nowa osoba",
+                        "name_error_msg": "Nazwa jest wymagana",
+                        "linked_user": "Połączony użytkownik",
+                        "no_device_tracker_available_intro": "Jeśli masz urządzenia wskazujące obecność osoby, możesz tutaj przypisać ją do tej osoby. Możesz dodać swoje pierwsze urządzenie, dodając integrację wykrywania obecności ze strony integracji.",
+                        "link_presence_detection_integrations": "Integracje wykrywania obecności",
+                        "link_integrations_page": "Strona integracji",
+                        "delete": "Usuń",
+                        "create": "Utwórz",
+                        "update": "Aktualizuj"
+                    },
+                    "introduction": "Tutaj można zdefiniować osoby, których obecność będzie śledzona w Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Uwaga: osób skonfigurowanych za pomocą pliku configuration.yaml nie można edytować za pomocą interfejsu użytkownika.",
+                    "no_persons_created_yet": "Wygląda na to, że nie utworzyłeś jeszcze żadnych osób.",
+                    "create_person": "Utwórz osobę",
+                    "add_person": "Dodaj osobę",
+                    "confirm_delete": "Na pewno chcesz usunąć tę osobę?",
+                    "confirm_delete2": "Wszystkie urządzenia należące do tej osoby zostaną nieprzypisane."
                 },
                 "server_control": {
                     "caption": "Kontrola serwera",
@@ -819,8 +1070,8 @@
                             "introduction": "Kontroluj serwer Home Assistant'a.",
                             "restart": "Uruchom ponownie",
                             "stop": "Zatrzymaj",
-                            "confirm_restart": "Czy chcesz ponownie uruchomić Home Assistant?",
-                            "confirm_stop": "Czy chcesz zatrzymać Home Assistant?"
+                            "confirm_restart": "Na pewno chcesz ponownie uruchomić Home Assistant?",
+                            "confirm_stop": "Na pewno chcesz zatrzymać Home Assistant'a?"
                         }
                     }
                 },
@@ -838,6 +1089,11 @@
                             "caption": "Wykonaj akcje..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Masz niezapisane zmiany. Na pewno chcesz wyjść?"
+                    }
                 }
             },
             "profile": {
@@ -865,7 +1121,7 @@
                     "description": "Każdy token reprezentuje sesję logowania. Tokeny zostaną automatycznie usunięte po wylogowaniu. Następujące tokeny są obecnie aktywne dla Twojego konta.",
                     "token_title": "Token dla {clientId}",
                     "created_at": "Utworzony {date}",
-                    "confirm_delete": "Czy na pewno chcesz usunąć token dla {name}?",
+                    "confirm_delete": "Na pewno chcesz usunąć token dla {name}?",
                     "delete_failed": "Nie udało się usunąć tokena.",
                     "last_used": "Ostatnio używany {date} z {location}",
                     "not_used": "Nigdy nie był używany",
@@ -876,7 +1132,7 @@
                     "description": "Długoterminowe tokeny dostępu umożliwiają skryptom interakcję z Home Assistant. Każdy token będzie ważny przez 10 lat od utworzenia. Następujące tokeny są obecnie aktywne.",
                     "learn_auth_requests": "Dowiedz się, jak tworzyć uwierzytelnione żądania.",
                     "created_at": "Utworzony {date}",
-                    "confirm_delete": "Czy na pewno chcesz usunąć token dla {name}?",
+                    "confirm_delete": "Na pewno chcesz usunąć token dla {name}?",
                     "delete_failed": "Nie udało się usunąć tokena.",
                     "create": "Utwórz token",
                     "create_failed": "Nie udało się utworzyć tokena.",
@@ -900,7 +1156,7 @@
                     "header": "Moduły uwierzytelniania wieloskładnikowego",
                     "disable": "Wyłącz",
                     "enable": "Włącz",
-                    "confirm_disable": "Jesteś pewny, że chcesz wyłączyć {name}?"
+                    "confirm_disable": "Na pewno chcesz wyłączyć {name}?"
                 },
                 "mfa_setup": {
                     "title_aborted": "Przerwano",
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Wibracja",
                     "description": "Włącz lub wyłącz wibracje na tym urządzeniu podczas sterowania urządzeniami."
+                },
+                "advanced_mode": {
+                    "title": "Tryb zaawansowany",
+                    "description": "Home Assistant domyślnie ukrywa zaawansowane funkcje i opcje. Możesz włączyć do nich dostęp, włączając tę opcję. Jest to ustawienie specyficzne dla użytkownika i nie wpływa na innych użytkowników korzystających z Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Dodaj kartę",
                         "edit": "Edytuj",
                         "delete": "Usuń",
-                        "move": "Przenieś"
+                        "move": "Przenieś",
+                        "show_visual_editor": "Edytor wizualny",
+                        "show_code_editor": "Edytor kodu"
                     },
                     "migrate": {
                         "header": "Konfiguracja niekompatybilna",
@@ -1095,7 +1357,7 @@
                     "save_config": {
                         "header": "Przejmij kontrolę nad interfejsem użytkownika Lovelace",
                         "para": "Domyślnie asystent domowy będzie utrzymywał interfejs użytkownika, aktualizując go, gdy pojawią się nowe elementy lub komponenty Lovelace. Jeśli przejmiesz kontrolę, nie będziemy już dokonywać zmian automatycznie.",
-                        "para_sure": "Czy na pewno chcesz przejąć kontrolę nad interfejsem użytkownika?",
+                        "para_sure": "Na pewno chcesz przejąć kontrolę nad interfejsem użytkownika?",
                         "cancel": "Nieważne",
                         "save": "Przejmuję kontrolę"
                     },
@@ -1121,7 +1383,8 @@
                             "optional": "Opcjonalne"
                         },
                         "entities": {
-                            "show_header_toggle": "Wyświetlać przełącznik nagłówka?"
+                            "show_header_toggle": "Wyświetlać przełącznik nagłówka?",
+                            "name": "Encje"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Zielony",
                                 "red": "Czerwony",
                                 "yellow": "Żółty"
-                            }
+                            },
+                            "name": "Wskaźnik"
                         },
                         "glance": {
-                            "columns": "Kolumny"
+                            "columns": "Kolumny",
+                            "name": "Glance"
                         },
                         "generic": {
                             "aspect_ratio": "Proporcje obrazu",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Źródła geolokalizacji",
                             "dark_mode": "Tryb ciemny?",
                             "default_zoom": "Domyślne powiększenie",
-                            "source": "Źródło"
+                            "source": "Źródło",
+                            "name": "Mapa"
                         },
                         "markdown": {
-                            "content": "Zawartość"
+                            "content": "Zawartość",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Szczegół wykresu",
-                            "graph_type": "Rodzaj wykresu"
+                            "graph_type": "Rodzaj wykresu",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Panel alarmu",
+                            "available_states": "Dostępne stany"
+                        },
+                        "conditional": {
+                            "name": "Warunkowa"
+                        },
+                        "entity-button": {
+                            "name": "Przycisk encji"
+                        },
+                        "entity-filter": {
+                            "name": "Filtr encji"
+                        },
+                        "history-graph": {
+                            "name": "Wykres historii"
+                        },
+                        "horizontal-stack": {
+                            "name": "Poziomy stos"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Światło"
+                        },
+                        "media-control": {
+                            "name": "Kontrola mediów"
+                        },
+                        "picture": {
+                            "name": "Obraz"
+                        },
+                        "picture-elements": {
+                            "name": "Elementy obrazu"
+                        },
+                        "picture-entity": {
+                            "name": "Obraz"
+                        },
+                        "picture-glance": {
+                            "name": "Obraz (glance)"
+                        },
+                        "plant-status": {
+                            "name": "Stan rośliny"
+                        },
+                        "shopping-list": {
+                            "name": "Lista zakupów"
+                        },
+                        "thermostat": {
+                            "name": "Termostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Pionowy stos"
+                        },
+                        "weather-forecast": {
+                            "name": "Prognoza pogody"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "Wyłączono {entity}.",
             "service_called": "Usługa {service} wywołana.",
             "service_call_failed": "Nie udało się wywołać usługi {service}.",
-            "connection_lost": "Utracono połączenie. Łączę ponownie..."
+            "connection_lost": "Utracono połączenie. Łączę ponownie...",
+            "triggered": "Wyzwolenie {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "Nazwa użytkownika",
                     "area_picker_label": "Obszar",
                     "update_name_button": "Aktualizuj nazwę"
-                }
+                },
+                "buttons": {
+                    "add": "Dodaj urządzenia",
+                    "remove": "Usuń urządzenie",
+                    "reconfigure": "Rekonfiguracja urządzenia"
+                },
+                "quirk": "Quirk",
+                "last_seen": "Ostatnio widziane",
+                "power_source": "Źródło zasilania",
+                "unknown": "Nieznany"
             }
         },
         "auth_store": {
@@ -1474,7 +1807,7 @@
         "climate": "Klimat",
         "configurator": "Konfigurator",
         "conversation": "Rozmowa",
-        "cover": "Roleta",
+        "cover": "Pokrywa",
         "device_tracker": "Śledzenie urządzeń",
         "fan": "Wentylator",
         "history_graph": "Wykres historii",
diff --git a/translations/pt.json b/translations/pt.json
index de2b4b3cb6..7785d74691 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -305,7 +305,7 @@
     "ui": {
         "panel": {
             "shopping-list": {
-                "clear_completed": "Apagar completados",
+                "clear_completed": "Limpar concluídos",
                 "add_item": "Adicionar item",
                 "microphone_tip": "Clique no microfone do canto superior direito e diga “Add candy to my shopping list”"
             },
@@ -419,7 +419,7 @@
                         "learn_more": "Saber mais sobre automações"
                     },
                     "editor": {
-                        "introduction": "Crie automações para tornar a sua casa viva",
+                        "introduction": "Crie automações para dar vida à sua casa",
                         "default_name": "Nova Automação",
                         "save": "Guardar",
                         "unsaved_confirm": "Existem alterações não guardadas. Tem a certeza de que quer sair?",
@@ -504,7 +504,12 @@
                                     "leave": "Sair"
                                 },
                                 "device": {
-                                    "label": "Dispositivo"
+                                    "label": "Dispositivo",
+                                    "extra_fields": {
+                                        "above": "Acima",
+                                        "below": "Abaixo",
+                                        "for": "Duração"
+                                    }
                                 }
                             },
                             "learn_more": "Saber mais sobre acionadores"
@@ -553,7 +558,18 @@
                                     "zone": "Zona"
                                 },
                                 "device": {
-                                    "label": "Dispositivo"
+                                    "label": "Dispositivo",
+                                    "extra_fields": {
+                                        "above": "Acima de",
+                                        "below": "Abaixo de",
+                                        "for": "Duração"
+                                    }
+                                },
+                                "and": {
+                                    "label": "E"
+                                },
+                                "or": {
+                                    "label": "Ou"
                                 }
                             },
                             "learn_more": "Saber mais sobre condições"
@@ -596,7 +612,11 @@
                             "learn_more": "Saber mais sobre ações"
                         },
                         "load_error_not_editable": "Apenas as automações em automations.yaml são editáveis.",
-                        "load_error_unknown": "Erro ao carregar a automação ({err_no})."
+                        "load_error_unknown": "Erro ao carregar a automação ({err_no}).",
+                        "description": {
+                            "label": "Descrição",
+                            "placeholder": "Descrição opcional"
+                        }
                     }
                 },
                 "script": {
@@ -649,13 +669,18 @@
                         "true": "Verdadeiro",
                         "false": "Falso",
                         "set_config_parameter": "Definir o parâmetro de configuração"
+                    },
+                    "learn_more": "Saiba mais sobre o Z-Wave",
+                    "ozw_log": {
+                        "header": "Log OZW"
                     }
                 },
                 "users": {
                     "caption": "Utilizadores",
                     "description": "Gerir utilizadores",
                     "picker": {
-                        "title": "Utilizadores"
+                        "title": "Utilizadores",
+                        "system_generated": "Gerado pelo sistema"
                     },
                     "editor": {
                         "rename_user": "Alterar nome do utilizador",
@@ -663,7 +688,18 @@
                         "activate_user": "Ativar utilizador",
                         "deactivate_user": "Desativar utilizador",
                         "delete_user": "Apagar utilizador",
-                        "caption": "Ver utilizador"
+                        "caption": "Ver utilizador",
+                        "id": "ID",
+                        "owner": "Proprietário",
+                        "group": "Grupo",
+                        "active": "Ativo",
+                        "system_generated": "Gerado pelo sistema",
+                        "system_generated_users_not_removable": "Não é possível remover usuários gerados pelo sistema.",
+                        "unnamed_user": "Utilizador sem nome",
+                        "enter_new_name": "Introduza um novo nome",
+                        "user_rename_failed": "Falha na renomeação do utilizador:",
+                        "group_update_failed": "Falha na atualização do grupo:",
+                        "confirm_user_deletion": "Tem certeza de que deseja apagar {name} ?"
                     },
                     "add_user": {
                         "caption": "Adicionar Utilizador",
@@ -677,7 +713,70 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Ligado como {email}",
                     "description_not_login": "Não está ligado",
-                    "description_features": "Controle fora de casa, integre com a Alexa e o Google Assistant."
+                    "description_features": "Controle fora de casa, integre com a Alexa e o Google Assistant.",
+                    "login": {
+                        "email": "",
+                        "email_error_msg": "E-mail inválido",
+                        "alert_email_confirm_necessary": "É necessário confirmar o seu e-mail antes de fazer login."
+                    },
+                    "forgot_password": {
+                        "instructions": "Introduza o seu endereço de e-mail e nós lhe enviaremos um link para redefinir sua password.",
+                        "email": ""
+                    },
+                    "register": {
+                        "link_terms_conditions": "Termos e condições",
+                        "email_address": "Endereço de e-mail",
+                        "email_error_msg": "E-mail inválido",
+                        "start_trial": "Iniciar avaliação",
+                        "resend_confirm_email": "Reenviar e-mail de confirmação"
+                    },
+                    "account": {
+                        "integrations": "Integrações",
+                        "connected": "Ligado",
+                        "alexa": {
+                            "enable": "Ativar",
+                            "disable": "Desativar"
+                        },
+                        "webhooks": {
+                            "title": "",
+                            "no_hooks_yet2": " ou criando um ",
+                            "no_hooks_yet_link_automation": "automação de webhook",
+                            "loading": "A carregar...",
+                            "manage": "Gerir"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "exposed_entities": "Entidades expostas",
+                        "not_exposed_entities": "Entidades não expostas",
+                        "expose": "Expor para Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Informações do certificado",
+                        "certificate_expiration_date": "Data de validade do certificado",
+                        "will_be_auto_renewed": "Será renovado automaticamente",
+                        "fingerprint": "Certificado digital:",
+                        "close": "Fechar"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "Expor ao Google Assistant",
+                        "disable_2FA": "Desativar a autenticação de dois fatores",
+                        "exposed_entities": "Entidades expostas",
+                        "not_exposed_entities": "Entidades não expostas",
+                        "sync_to_google": "A sincronizar alterações para o Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook para {nome}",
+                        "available_at": "O webhook está disponível na seguinte URL:",
+                        "managed_by_integration": "Este webhook é gerido por uma integração e não pode ser desabilitado.",
+                        "info_disable_webhook": "Se não quiser utilizar mais este webhook, poderá",
+                        "link_disable_webhook": "desativá-lo",
+                        "view_documentation": "Ver documentação",
+                        "close": "Fechar",
+                        "confirm_disable": "Tem certeza de que deseja desativar este webhook?",
+                        "copied_to_clipboard": "Copiado para a área de transferência"
+                    }
                 },
                 "integrations": {
                     "caption": "Integrações",
@@ -705,7 +804,10 @@
                             "description": "Para ser concluída, esta etapa exige que visite um sítio web externo.",
                             "open_site": "Abrir site"
                         }
-                    }
+                    },
+                    "note_about_integrations": "De momento nem todas as integrações podem ser configuradas via UI.",
+                    "note_about_website_reference": "Existem mais disponíveis no",
+                    "home_assistant_website": "Site do Home Assistant "
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -723,7 +825,32 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Adicionar dispositivos",
                         "spinner": "À procura de dispositivos ZHA Zigbee...",
-                        "discovery_text": "Os dispositivos descobertos aparecerão aqui. Siga as instruções para o(s) seu(s) dispositivo(s) e coloque o(s) dispositivo(s) em modo de emparelhamento."
+                        "discovery_text": "Os dispositivos descobertos aparecerão aqui. Siga as instruções para o(s) seu(s) dispositivo(s) e coloque o(s) dispositivo(s) em modo de emparelhamento.",
+                        "search_again": "Pesquisar Novamente"
+                    },
+                    "common": {
+                        "add_devices": "Adicionar dispositivos",
+                        "clusters": "Grupos",
+                        "devices": "Dispositivos",
+                        "manufacturer_code_override": "Substituição do código do fabricante",
+                        "value": "Valor"
+                    },
+                    "network_management": {
+                        "header": "Gestão ",
+                        "introduction": "Comandos que afetam toda a rede"
+                    },
+                    "node_management": {
+                        "header": "Gestão dispositivos",
+                        "help_node_dropdown": "Selecione um dispositivo para visualizar as opções por dispositivo."
+                    },
+                    "cluster_attributes": {
+                        "get_zigbee_attribute": "Obter atributo Zigbee",
+                        "set_zigbee_attribute": "Definir atributo Zigbee",
+                        "help_get_zigbee_attribute": "Obter o valor para o atributo selecionado."
+                    },
+                    "cluster_commands": {
+                        "issue_zigbee_command": "Emitir comando ZigBee",
+                        "help_command_dropdown": "Selecione um comando com o qual interagir."
                     }
                 },
                 "area_registry": {
@@ -754,7 +881,13 @@
                         "unavailable": "(indisponível)",
                         "introduction": "O Home Assistant mantém um registo de todas as entidades que foram alguma vez detetadas e que podem ser identificadas de uma forma única. Cada uma dessas entidades terá um ID de entidade atribuído, que será reservado apenas para essa entidade.",
                         "introduction2": "Use o registo da entidade para substituir o nome, alterar o ID da entidade ou remover a entrada do Home Assistant. Note que a remoção da entrada do registo de entidade não removerá a entidade. Para fazer isso, siga o link abaixo e remova-o da página de integrações.",
-                        "integrations_page": "Página de Integrações"
+                        "integrations_page": "Página de Integrações",
+                        "headers": {
+                            "name": "Nome",
+                            "entity_id": "ID da Entidade",
+                            "integration": "Integração",
+                            "enabled": "Ativado"
+                        }
                     },
                     "editor": {
                         "unavailable": "Esta entidade não está atualmente disponível.",
@@ -763,7 +896,8 @@
                         "update": "ATUALIZAR",
                         "enabled_label": "Entidade permitida",
                         "enabled_cause": "Desativado por {cause}.",
-                        "enabled_description": "Entidades desativadas não serão adicionadas ao Home Assistant."
+                        "enabled_description": "Entidades desativadas não serão adicionadas ao Home Assistant.",
+                        "confirm_delete": "Tem certeza de que deseja apagar esta entrada?"
                     }
                 },
                 "person": {
@@ -773,8 +907,19 @@
                         "name": "Nome",
                         "device_tracker_intro": "Selecione os dispositivos que pertencem a esta pessoa.",
                         "device_tracker_picked": "Seguir dispositivo",
-                        "device_tracker_pick": "Escolha o dispositivo a seguir"
-                    }
+                        "device_tracker_pick": "Escolha o dispositivo a seguir",
+                        "new_person": "Nova Pessoa",
+                        "name_error_msg": "Nome é obrigatório",
+                        "link_presence_detection_integrations": "Integrações de detecção de presença",
+                        "link_integrations_page": "Página de Integrações",
+                        "delete": "Apagar",
+                        "create": "Criar",
+                        "update": "Atualizar"
+                    },
+                    "no_persons_created_yet": "Parece que você ainda não criou nenhuma pessoa.",
+                    "create_person": "Criar pessoa",
+                    "add_person": "Adicionar Pessoa",
+                    "confirm_delete": "Tens a certeza que queres eliminar esta pessoa?"
                 },
                 "server_control": {
                     "caption": "Controlo do servidor",
@@ -884,6 +1029,12 @@
                 "force_narrow": {
                     "header": "Esconder sempre a barra lateral.",
                     "description": "Isto esconderá por defeito a barra lateral, semelhante à experiência no telemóvel."
+                },
+                "vibrate": {
+                    "header": "Vibrar"
+                },
+                "advanced_mode": {
+                    "title": "Modo avançado"
                 }
             },
             "page-authorize": {
@@ -1043,7 +1194,9 @@
                         "add": "Adicionar Cartão",
                         "edit": "Editar",
                         "delete": "Apagar",
-                        "move": "Mover"
+                        "move": "Mover",
+                        "show_visual_editor": "Mostrar Editor Visual",
+                        "show_code_editor": "Mostrar Editor de Código"
                     },
                     "migrate": {
                         "header": "Configuração Incompatível",
@@ -1077,6 +1230,100 @@
                     "edit_lovelace": {
                         "header": "Título da sua interface do Lovelace",
                         "explanation": "Este título é mostrado acima de todas as vista em Lovelace."
+                    },
+                    "card": {
+                        "alarm_panel": {
+                            "available_states": "Estados Disponíveis"
+                        },
+                        "config": {
+                            "required": "Obrigatório",
+                            "optional": "Opcional"
+                        },
+                        "gauge": {
+                            "severity": {
+                                "green": "Verde",
+                                "red": "Vermelho",
+                                "yellow": "Amarelo"
+                            },
+                            "name": "Manómetro"
+                        },
+                        "glance": {
+                            "columns": "Colunas"
+                        },
+                        "generic": {
+                            "entities": "Entidades",
+                            "entity": "Entidade",
+                            "icon": "Ícone",
+                            "icon_height": "Altura do ícone",
+                            "maximum": "Máximo",
+                            "minimum": "Mínimo",
+                            "name": "Nome",
+                            "show_icon": "Mostrar Ícone?",
+                            "show_name": "Mostrar nome?",
+                            "show_state": "Mostrar Estado?",
+                            "title": "Título",
+                            "theme": "Tema",
+                            "unit": "Unidade",
+                            "url": "Url"
+                        },
+                        "map": {
+                            "source": "Fonte",
+                            "name": "Mapa"
+                        },
+                        "sensor": {
+                            "graph_detail": "Detalhe do Gráfico",
+                            "graph_type": "Tipo De Gráfico",
+                            "name": "Sensor"
+                        },
+                        "alarm-panel": {
+                            "name": "Painel de alarme",
+                            "available_states": "Estados Disponíveis"
+                        },
+                        "conditional": {
+                            "name": "Condicional"
+                        },
+                        "entities": {
+                            "name": "Entidades"
+                        },
+                        "entity-button": {
+                            "name": "Botão Entidade"
+                        },
+                        "entity-filter": {
+                            "name": "Filtro de entidade"
+                        },
+                        "history-graph": {
+                            "name": "Gráfico de histórico"
+                        },
+                        "horizontal-stack": {
+                            "name": "Pilha Horizontal"
+                        },
+                        "iframe": {
+                            "name": ""
+                        },
+                        "light": {
+                            "name": "Luz"
+                        },
+                        "markdown": {
+                            "name": ""
+                        },
+                        "picture": {
+                            "name": "Imagem"
+                        },
+                        "plant-status": {
+                            "name": "Estado da planta"
+                        },
+                        "shopping-list": {
+                            "name": "Lista de compras"
+                        },
+                        "thermostat": {
+                            "name": "Termóstato"
+                        },
+                        "vertical-stack": {
+                            "name": "Pilha Vertical"
+                        },
+                        "weather-forecast": {
+                            "name": "Previsão do tempo"
+                        }
                     }
                 },
                 "menu": {
@@ -1357,6 +1604,11 @@
                     "device_name_placeholder": "Nome do utilizador",
                     "area_picker_label": "Área",
                     "update_name_button": "Atualizar Nome"
+                },
+                "buttons": {
+                    "add": "Adicionar Dispositivos",
+                    "remove": "Remover Dispositivo",
+                    "reconfigure": "Reconfigurar Dispositivo"
                 }
             }
         },
@@ -1372,7 +1624,7 @@
         }
     },
     "domain": {
-        "alarm_control_panel": "Painel de controle do alarme",
+        "alarm_control_panel": "Painel de controlo do alarme",
         "automation": "Automação",
         "binary_sensor": "Sensor binário",
         "calendar": "Calendário",
diff --git a/translations/ru.json b/translations/ru.json
index a834ed0e9a..cb1bdc0476 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -113,7 +113,7 @@
                 "on": "Открыто"
             },
             "lock": {
-                "off": "Закрыто",
+                "off": "Закрыт",
                 "on": "Открыт"
             }
         },
@@ -388,7 +388,7 @@
                                 "core": "Перезагрузить ядро",
                                 "group": "Перезагрузить группы",
                                 "automation": "Перезагрузить автоматизации",
-                                "script": "Перезагрузить скрипты"
+                                "script": "Перезагрузить сценарии"
                             },
                             "server_management": {
                                 "heading": "Управление сервером",
@@ -412,7 +412,7 @@
                     "description": "Создавайте и редактируйте правила автоматизации",
                     "picker": {
                         "header": "Редактор автоматизаций",
-                        "introduction": "Редактор автоматизаций позволяет создавать и редактировать автоматизации.\nПожалуйста, ознакомьтесь с инструкциями по указанной ниже ссылке и убедитесь, что правильно настроили Home Assistant.",
+                        "introduction": "Этот редактор позволяет создавать и редактировать автоматизации.\nПожалуйста, ознакомьтесь с инструкциями по указанной ниже ссылке и убедитесь, что правильно настроили Home Assistant.",
                         "pick_automation": "Выберите автоматизацию для редактирования",
                         "no_automations": "Мы не нашли редактируемые автоматизации",
                         "add_automation": "Добавить автоматизацию",
@@ -558,7 +558,12 @@
                                     "zone": "Зона"
                                 },
                                 "device": {
-                                    "label": "Устройство"
+                                    "label": "Устройство",
+                                    "extra_fields": {
+                                        "above": "Выше",
+                                        "below": "Ниже",
+                                        "for": "Продолжительность"
+                                    }
                                 },
                                 "and": {
                                     "label": "И"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Устройство"
+                                },
+                                "scene": {
+                                    "label": "Активировать сцену"
                                 }
                             },
                             "learn_more": "Узнайте больше о действиях"
@@ -615,8 +623,21 @@
                     }
                 },
                 "script": {
-                    "caption": "Скрипты",
-                    "description": "Создавайте и редактируйте скрипты"
+                    "caption": "Сценарии",
+                    "description": "Создавайте и редактируйте сценарии",
+                    "picker": {
+                        "header": "Редактор сценариев",
+                        "introduction": "Этот редактор позволяет создавать и редактировать сценарии.\nПожалуйста, ознакомьтесь с инструкциями по указанной ниже ссылке и убедитесь, что правильно настроили Home Assistant.",
+                        "learn_more": "Узнайте больше о сценариях",
+                        "no_scripts": "Мы не нашли редактируемые сценарии",
+                        "add_script": "Добавить сценарий"
+                    },
+                    "editor": {
+                        "header": "Сценарий: {name}",
+                        "default_name": "Новый сценарий",
+                        "load_error_not_editable": "Доступны для редактирования только сценарии из scripts.yaml.",
+                        "delete_confirm": "Вы уверены, что хотите удалить этот сценарий?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Истина",
                         "false": "Ложь",
                         "set_config_parameter": "Установить параметр конфигурации"
+                    },
+                    "learn_more": "Узнайте больше о Z-Wave",
+                    "ozw_log": {
+                        "header": "Журнал OZW",
+                        "introduction": "Просмотр журнала событий. 0 - минимум (загружает весь журнал), 1000 - максимум. Журнал обновляется автоматически."
                     }
                 },
                 "users": {
                     "caption": "Пользователи",
                     "description": "Управляйте учетными записями пользователей",
                     "picker": {
-                        "title": "Пользователи"
+                        "title": "Пользователи",
+                        "system_generated": "Создан системой"
                     },
                     "editor": {
                         "rename_user": "Изменить имя",
@@ -678,7 +705,18 @@
                         "activate_user": "Активировать",
                         "deactivate_user": "Деактивировать",
                         "delete_user": "Удалить",
-                        "caption": "Просмотр пользователя"
+                        "caption": "Просмотр пользователя",
+                        "id": "ID",
+                        "owner": "Владелец",
+                        "group": "Группа",
+                        "active": "Активный",
+                        "system_generated": "Сгенерировано системой",
+                        "system_generated_users_not_removable": "Системные пользователи защищены от удаления.",
+                        "unnamed_user": "Безымянный пользователь",
+                        "enter_new_name": "Введите новое имя",
+                        "user_rename_failed": "Не удалось переименовать пользователя",
+                        "group_update_failed": "Не удалось обновить группу",
+                        "confirm_user_deletion": "Вы уверены, что хотите удалить {name}?"
                     },
                     "add_user": {
                         "caption": "Добавить пользователя",
@@ -692,7 +730,123 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Выполнен вход с учетной записью {email}",
                     "description_not_login": "Вход не выполнен",
-                    "description_features": "Управление вдали от дома, интеграция с Alexa и Google Assistant."
+                    "description_features": "Управление вдали от дома, интеграция с Alexa и Google Assistant.",
+                    "login": {
+                        "title": "Home Assistant Cloud",
+                        "introduction": "Home Assistant Cloud обеспечивает безопасное удаленное подключение к Вашему серверу, даже если Вы находитесь вдали от дома. Также это даёт возможность подключения к функциям облачных сервисов Amazon Alexa и Google Assistant.",
+                        "introduction2": "Эта услуга предоставляется нашим партнером ",
+                        "introduction2a": ", компания от основателей Home Assistant и Hass.io.",
+                        "introduction3": "Home Assistant Cloud предлагает одноразовый бесплатный пробный период продолжительностью один месяц. Информация об оплате не требуется.",
+                        "learn_more_link": "Узнайте больше о Home Assistant Cloud",
+                        "dismiss": "Отклонить",
+                        "sign_in": "Авторизация",
+                        "email": "Адрес электронной почты",
+                        "email_error_msg": "Неверный адрес электронной почты.",
+                        "password": "Пароль",
+                        "password_error_msg": "Пароль должен содержать не менее 8 символов.",
+                        "forgot_password": "забыли пароль?",
+                        "start_trial": "Начать бесплатный пробный период",
+                        "trial_info": "Информация об оплате не требуется. Продолжительность периода - 1 месяц",
+                        "alert_password_change_required": "Вы должны изменить свой пароль перед входом.",
+                        "alert_email_confirm_necessary": "Вам должны подтвердить Вашу электронную почту перед входом."
+                    },
+                    "forgot_password": {
+                        "title": "Восстановление доступа к учетной записи",
+                        "subtitle": "Восстановление пароля",
+                        "instructions": "Введите адрес электронной почты, указанный при регистрации. Мы вышлем на него ссылку для сброса пароля.",
+                        "email": "Адрес электронной почты",
+                        "email_error_msg": "Неверный адрес электронной почты.",
+                        "send_reset_email": "Отправить",
+                        "check_your_email": "Проверьте Вашу электронную почту для получения инструкций по сбросу пароля."
+                    },
+                    "register": {
+                        "title": "Регистрация новой учетной записи",
+                        "headline": "Начните Ваш бесплатный пробный период",
+                        "information": "Создайте учетную запись Home Assistant Cloud, чтобы начать бесплатный пробный период. Информация об оплате не требуется.",
+                        "information2": "В течении пробного периода Вам будет предоставлен доступ ко всем преимуществам Home Assistant Cloud, включая:",
+                        "feature_remote_control": "Безопасный доступ к Вашему Home Assistant, даже вдали от дома",
+                        "feature_google_home": "Интеграция с Google Assistant",
+                        "feature_amazon_alexa": "Интеграция с Amazon Alexa",
+                        "feature_webhook_apps": "Простая интеграция с приложениями на основе webhook, такими как OwnTracks",
+                        "information3": "Эта услуга предоставляется нашим партнером ",
+                        "information3a": ", компания от основателей Home Assistant и Hass.io.",
+                        "information4": "Регистрируя учетную запись, Вы соглашаетесь со следующими условиями:",
+                        "link_terms_conditions": "Правила и условия",
+                        "link_privacy_policy": "Политика конфиденциальности",
+                        "create_account": "Создать учетную запись",
+                        "email_address": "Адрес электронной почты",
+                        "email_error_msg": "Неверный адрес электронной почты.",
+                        "password": "Пароль",
+                        "password_error_msg": "Пароль должен содержать не менее 8 символов.",
+                        "start_trial": "Начать пробный период",
+                        "resend_confirm_email": "Отправить подтверждение повторно",
+                        "account_created": "Учетная запись создана! Проверьте Вашу электронную почту для получения инструкций по активации учетной записи."
+                    },
+                    "account": {
+                        "thank_you_note": "Спасибо за то, что стали частью Home Assistant Cloud. Именно благодаря таким людям, как Вы, мы можем сделать все возможное для того, чтобы домашняя автоматизация была максимально удобной для всех. Спасибо!",
+                        "nabu_casa_account": "Учетная запись Nabu Casa",
+                        "connection_status": "Статус подключения к облаку",
+                        "manage_account": "Управление учетной записью",
+                        "sign_out": "Выйти",
+                        "integrations": "Интеграции",
+                        "remote": {
+                            "info": "Home Assistant Cloud обеспечивает безопасное удаленное подключение к Вашему серверу, даже если Вы находитесь вдали от дома.",
+                            "instance_is_available": "Ваш Home Assistant доступен по адресу",
+                            "instance_will_be_available": "Ваш Home Assistant будет доступен по адресу",
+                            "link_learn_how_it_works": "Узнайте, как это работает",
+                            "certificate_info": "Информация о сертификате"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Благодаря интеграции Alexa для Home Assistant Cloud Вы сможете управлять всеми своими устройствами Home Assistant через любое устройство с поддержкой Alexa.",
+                            "enable_ha_skill": "Активировать навык Home Assistant для Alexa",
+                            "sync_entities": "Синхронизировать объекты",
+                            "manage_entities": "Управление объектами",
+                            "sync_entities_error": "Не удалось синхронизировать объекты:"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "Благодаря интеграции Google Assistant для Home Assistant Cloud Вы сможете управлять всеми своими устройствами Home Assistant через любое устройство с поддержкой Google Assistant.",
+                            "enable_ha_skill": "Активировать навык Home Assistant для Google Assistant",
+                            "manage_entities": "Управление объектами"
+                        },
+                        "webhooks": {
+                            "title": "Webhook",
+                            "info": "Всему, что настроено на срабатывание через Webhook, может быть предоставлен общедоступный URL-адрес. Это позволяет отправлять данные в Home Assistant откуда угодно, не выставляя свой сервер в Интернете.",
+                            "no_hooks_yet": "У Вас еще нет добавленных Webhook. Начните с настройки ",
+                            "no_hooks_yet_link_integration": "интеграции на основе Webhook",
+                            "no_hooks_yet2": " или создайте ",
+                            "no_hooks_yet_link_automation": "Webhook автоматизацию",
+                            "link_learn_more": "Узнайте больше о создании автоматизаций на базе Webhook.",
+                            "loading": "Загрузка ...",
+                            "disable_hook_error_msg": "Не удалось отключить Webhook"
+                        }
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Информация о сертификате",
+                        "certificate_expiration_date": "Срок действия сертификата",
+                        "will_be_auto_renewed": "Будет автоматически продлен",
+                        "fingerprint": "Отпечаток сертификата:",
+                        "close": "Закрыть"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "disable_2FA": "Отключить двухфакторную аутентификацию",
+                        "exposed_entities": "Выставленные объекты",
+                        "not_exposed_entities": "Не выставленные объекты",
+                        "sync_to_google": "Синхронизация изменений с Google."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook для {name}",
+                        "available_at": "Webhook доступен по следующему адресу:",
+                        "managed_by_integration": "Этот Webhook управляется интеграцией и не может быть отключен.",
+                        "info_disable_webhook": "Если Вы больше не хотите использовать этот Webhook, Вы можете",
+                        "link_disable_webhook": "отключить его.",
+                        "view_documentation": "Просмотреть документацию",
+                        "close": "Закрыть",
+                        "confirm_disable": "Вы уверены, что хотите отключить этот Webhook?",
+                        "copied_to_clipboard": "Скопировано в буфер обмена"
+                    }
                 },
                 "integrations": {
                     "caption": "Интеграции",
@@ -720,7 +874,10 @@
                             "description": "Для завершения этого шага требуется посетить внешний веб-сайт.",
                             "open_site": "Открыть веб-сайт"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Пока что не все интеграции могут быть настроены через пользовательский интерфейс.",
+                    "note_about_website_reference": "Все доступные интеграции Вы можете найти на",
+                    "home_assistant_website": "сайте Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +895,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation",
                         "spinner": "Поиск Zigbee устройств...",
-                        "discovery_text": "Здесь будут отображаться обнаруженные устройства. Следуйте инструкциям для Вашего устройства, чтобы включить режим сопряжения."
+                        "discovery_text": "Здесь будут отображаться обнаруженные устройства. Следуйте инструкциям для Вашего устройства, чтобы включить режим сопряжения.",
+                        "search_again": "Повторный поиск"
+                    },
+                    "common": {
+                        "add_devices": "Добавить устройства",
+                        "clusters": "Кластеры",
+                        "devices": "Устройства",
+                        "manufacturer_code_override": "Переназначить код производителя",
+                        "value": "Значение"
+                    },
+                    "network_management": {
+                        "header": "Управление сетью",
+                        "introduction": "Команды, которые влияют на всю сеть"
+                    },
+                    "node_management": {
+                        "header": "Управление устройством",
+                        "introduction": "Команды ZHA, которые влияют на одно устройство. Выберите устройство, чтобы увидеть список доступных команд.",
+                        "hint_battery_devices": "Примечание:\nСпящие (работающие от батареи) устройства должны быть активны при выполнении команд. Обычно устройство выходит из режима сна, когда срабатывает на изменение внешних условий.",
+                        "hint_wakeup": "Некоторые устройства, такие как датчики Xiaomi, имеют кнопку пробуждения, которую Вы можете нажимать с интервалом ~ 5 секунд, чтобы держать устройства в активном состоянии во время взаимодействия с ними.",
+                        "help_node_dropdown": "Выберите устройство для просмотра индивидуальных параметров."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Выберите кластер для просмотра атрибутов и команд."
+                    },
+                    "cluster_attributes": {
+                        "header": "Атрибуты кластера",
+                        "introduction": "Просмотр и редактирование атрибутов кластера.",
+                        "attributes_of_cluster": "Атрибуты выбранного кластера",
+                        "get_zigbee_attribute": "Получить атрибут Zigbee",
+                        "set_zigbee_attribute": "Установить атрибут Zigbee",
+                        "help_attribute_dropdown": "Выберите атрибут для просмотра или установите его значение.",
+                        "help_get_zigbee_attribute": "Получить значение для выбранного атрибута.",
+                        "help_set_zigbee_attribute": "Установите значение атрибута для указанного кластера на указанном объекте."
+                    },
+                    "cluster_commands": {
+                        "header": "Команды кластера",
+                        "introduction": "Просмотр и выдача команд кластеров.",
+                        "commands_of_cluster": "Команды выбранного кластера",
+                        "issue_zigbee_command": "Выдать команду Zigbee",
+                        "help_command_dropdown": "Выберите команду для взаимодействия."
                     }
                 },
                 "area_registry": {
@@ -770,7 +966,13 @@
                         "introduction": "Home Assistant ведет реестр каждого объекта, который когда-либо был создан в системе. Каждому из этих объектов присвоен ID, который зарезервирован только для этого объекта.",
                         "introduction2": "Используйте данный реестр, чтобы изменить ID или название объекта либо удалить запись из Home Assistant. Обратите внимание, что удаление записи из реестра объектов не удалит сам объект. Для этого перейдите по указанной ниже ссылке и удалите его со страницы интеграций.",
                         "integrations_page": "Страница интеграций",
-                        "show_disabled": "Показывать отключенные объекты"
+                        "show_disabled": "Показывать отключенные объекты",
+                        "headers": {
+                            "name": "Название",
+                            "entity_id": "ID объекта",
+                            "integration": "Интеграция",
+                            "enabled": "Включено"
+                        }
                     },
                     "editor": {
                         "unavailable": "Этот объект в настоящее время недоступен.",
@@ -791,8 +993,24 @@
                         "name": "Имя",
                         "device_tracker_intro": "Выберите устройства, отслеживающие этого человека.",
                         "device_tracker_picked": "Устройство для отслеживания",
-                        "device_tracker_pick": "Выберите устройство для отслеживания"
-                    }
+                        "device_tracker_pick": "Выберите устройство для отслеживания",
+                        "new_person": "Новая персона",
+                        "name_error_msg": "Укажите имя",
+                        "linked_user": "Связанный пользователь",
+                        "no_device_tracker_available_intro": "Если у Вас есть устройства, указывающие на присутствие человека, Вы можете назначить их этому человеку. Вы можете добавить Ваше первое устройство, добавив интеграцию обнаружения присутствия со страницы интеграции.",
+                        "link_presence_detection_integrations": "Интеграции обнаружения присутствия",
+                        "link_integrations_page": "Страница интеграций",
+                        "delete": "Удалить",
+                        "create": "Создать",
+                        "update": "Обновить"
+                    },
+                    "introduction": "Здесь Вы можете определить каждого интересующего Вас человека в Home Assistant.",
+                    "note_about_persons_configured_in_yaml": "Примечание:\nПерсоны, настроенные с помощью configuration.yaml, не могут быть изменены с помощью пользовательского интерфейса.",
+                    "no_persons_created_yet": "У Вас еще нет добавленных персон.",
+                    "create_person": "Добавить персону",
+                    "add_person": "Добавить персону",
+                    "confirm_delete": "Вы уверены, что хотите удалить эту персону?",
+                    "confirm_delete2": "Все устройства, связанные с этой персоной, станут неназначенными."
                 },
                 "server_control": {
                     "caption": "Сервер",
@@ -811,7 +1029,7 @@
                             "core": "Перезагрузить ядро",
                             "group": "Перезагрузить группы",
                             "automation": "Перезагрузить автоматизации",
-                            "script": "Перезагрузить скрипты",
+                            "script": "Перезагрузить сценарии",
                             "scene": "Перезагрузить сцены"
                         },
                         "server_management": {
@@ -838,6 +1056,11 @@
                             "caption": "Когда что-то происходит..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "У Вас есть несохраненные изменения. Вы уверены, что хотите выйти?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1140,10 @@
                 "vibrate": {
                     "header": "Вибрация",
                     "description": "Получать тактильный отклик при управлении устройствами."
+                },
+                "advanced_mode": {
+                    "title": "Расширенный режим",
+                    "description": "Home Assistant по умолчанию скрывает расширенные функции и параметры. Активируя расширенный режим, Вы сделаете эти функции доступными. Эта настройка не влияет на других пользователей, использующих Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1304,9 @@
                         "add": "Добавить карточку",
                         "edit": "Изменить",
                         "delete": "Удалить",
-                        "move": "Переместить"
+                        "move": "Переместить",
+                        "show_visual_editor": "Форма ввода",
+                        "show_code_editor": "Текстовый редактор"
                     },
                     "migrate": {
                         "header": "Конфигурация несовместима",
@@ -1121,7 +1350,8 @@
                             "optional": "Опционально"
                         },
                         "entities": {
-                            "show_header_toggle": "Показывать переключатель в заголовке"
+                            "show_header_toggle": "Показывать переключатель в заголовке",
+                            "name": "Объекты"
                         },
                         "gauge": {
                             "severity": {
@@ -1162,14 +1392,57 @@
                             "geo_location_sources": "Источники геолокации",
                             "dark_mode": "Ночной режим",
                             "default_zoom": "Масштаб по умолчанию",
-                            "source": "Источник"
+                            "source": "Источник",
+                            "name": "Карта"
                         },
                         "markdown": {
-                            "content": "Содержание"
+                            "content": "Содержание",
+                            "name": "Разметка"
                         },
                         "sensor": {
                             "graph_detail": "Детализация графика",
-                            "graph_type": "Тип графика"
+                            "graph_type": "Тип графика",
+                            "name": "Датчик"
+                        },
+                        "alarm-panel": {
+                            "name": "Панель сигнализации",
+                            "available_states": "Доступные состояния"
+                        },
+                        "entity-button": {
+                            "name": "Кнопка"
+                        },
+                        "entity-filter": {
+                            "name": "Фильтр"
+                        },
+                        "history-graph": {
+                            "name": "График истории"
+                        },
+                        "horizontal-stack": {
+                            "name": "Горизонтальный массив"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Освещение"
+                        },
+                        "media-control": {
+                            "name": "Медиа"
+                        },
+                        "plant-status": {
+                            "name": "Растение"
+                        },
+                        "shopping-list": {
+                            "name": "Список покупок"
+                        },
+                        "thermostat": {
+                            "name": "Термостат"
+                        },
+                        "vertical-stack": {
+                            "name": "Вертикальный массив"
+                        },
+                        "weather-forecast": {
+                            "name": "Прогноз погоды"
                         }
                     }
                 },
@@ -1451,7 +1724,14 @@
                     "device_name_placeholder": "Название",
                     "area_picker_label": "Помещение",
                     "update_name_button": "Обновить название"
-                }
+                },
+                "buttons": {
+                    "add": "Добавить устройства",
+                    "remove": "Удалить устройство",
+                    "reconfigure": "Перенастроить устройство"
+                },
+                "power_source": "Источник питания",
+                "unknown": "Неизвестно"
             }
         },
         "auth_store": {
@@ -1494,7 +1774,7 @@
         "proximity": "Расстояние",
         "remote": "Пульт ДУ",
         "scene": "Сцена",
-        "script": "Скрипт",
+        "script": "Сценарий",
         "sensor": "Датчик",
         "sun": "Солнце",
         "switch": "Выключатель",
diff --git a/translations/sk.json b/translations/sk.json
index 4660ba8976..6443a1b539 100644
--- a/translations/sk.json
+++ b/translations/sk.json
@@ -653,7 +653,8 @@
                         "set_wakeup": "Nastaviť interval prebudenia",
                         "config_parameter": "Konfigurovať parameter",
                         "set_config_parameter": "Nastavte konfiguračný parameter"
-                    }
+                    },
+                    "learn_more": "Viac informácií o Z-Wave"
                 },
                 "users": {
                     "caption": "Používatelia",
@@ -728,6 +729,9 @@
                         "header": "Zigbee Home Automation - Pridať zariadenia",
                         "spinner": "Vyhľadávanie ZHA Zigbee zariadení ...",
                         "discovery_text": "Tu sa zobrazia objavené zariadenia. Postupujte podľa pokynov pre zariadenie (zariadenia) a umiestnite zariadenie (zariadenia) do režimu párovania."
+                    },
+                    "cluster_commands": {
+                        "help_command_dropdown": "Vyberte príkaz na interakciu."
                     }
                 },
                 "area_registry": {
@@ -900,6 +904,10 @@
                 "vibrate": {
                     "header": "Vibrácie",
                     "description": "Pri ovládaní zariadení povoľte alebo zakážte vibrácie tohto zariadenia."
+                },
+                "advanced_mode": {
+                    "title": "Rozšírený režim",
+                    "description": "Home Asistent v predvolenom nastavení skryje rozšírené funkcie a možnosti. Začiarknutím tohto prepínača môžete tieto funkcie sprístupniť. Toto nastavenie je špecifické pre konkrétneho používateľa a nemá vplyv na ostatných používateľov používajúcich Home Assistant."
                 }
             },
             "page-authorize": {
@@ -1059,7 +1067,9 @@
                         "add": "Pridať kartu",
                         "edit": "Upraviť",
                         "delete": "Odstrániť",
-                        "move": "Presunúť"
+                        "move": "Presunúť",
+                        "show_visual_editor": "Zobraziť vizuálny editor",
+                        "show_code_editor": "Zobraziť editor kódu"
                     },
                     "migrate": {
                         "header": "Nekompatibilná konfigurácia",
@@ -1100,7 +1110,8 @@
                             "optional": "Voliteľné"
                         },
                         "entities": {
-                            "show_header_toggle": "Zobraziť prepínač hlavičky?"
+                            "show_header_toggle": "Zobraziť prepínač hlavičky?",
+                            "name": "Entity"
                         },
                         "generic": {
                             "entities": "Entity",
@@ -1123,14 +1134,67 @@
                             "geo_location_sources": "Zdroje geolokácie",
                             "dark_mode": "Tmavý režim?",
                             "default_zoom": "Predvolený zoom",
-                            "source": "Zdroj"
+                            "source": "Zdroj",
+                            "name": "Mapa"
                         },
                         "markdown": {
                             "content": "Obsah"
                         },
                         "sensor": {
                             "graph_detail": "Detail grafu",
-                            "graph_type": "Typ grafu"
+                            "graph_type": "Typ grafu",
+                            "name": "Snímač"
+                        },
+                        "alarm-panel": {
+                            "name": "Ovládací panel alarmu"
+                        },
+                        "entity-button": {
+                            "name": "Entita Tlačítka"
+                        },
+                        "entity-filter": {
+                            "name": "Filter entít"
+                        },
+                        "glance": {
+                            "name": "Náhľad"
+                        },
+                        "history-graph": {
+                            "name": "Graf Histórie"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horizontálne zarovnanie"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Svetlo"
+                        },
+                        "media-control": {
+                            "name": "Ovládanie médií"
+                        },
+                        "picture": {
+                            "name": "Obrázok"
+                        },
+                        "picture-elements": {
+                            "name": "Entita obrázka"
+                        },
+                        "picture-entity": {
+                            "name": "Entita obrázka"
+                        },
+                        "picture-glance": {
+                            "name": "Náhľad obrázka"
+                        },
+                        "shopping-list": {
+                            "name": "Zoznam nákupov"
+                        },
+                        "thermostat": {
+                            "name": "Termostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Zvislé zarovnanie"
+                        },
+                        "weather-forecast": {
+                            "name": "Predpoveď počasia"
                         }
                     }
                 },
diff --git a/translations/sl.json b/translations/sl.json
index b6aacbe23e..7bc5e20569 100644
--- a/translations/sl.json
+++ b/translations/sl.json
@@ -419,7 +419,7 @@
                         "learn_more": "Več o avtomatizacijah"
                     },
                     "editor": {
-                        "introduction": "Uporabite avtomatizacije, da bo vaš dom \"živ\"",
+                        "introduction": "Uporabite avtomatizacije za oživitev vašega doma.",
                         "default_name": "Nova avtomatizacija",
                         "save": "Shrani",
                         "unsaved_confirm": "Imate neshranjene spremembe. Ste prepričani, da želite zapustiti stran?",
@@ -558,7 +558,12 @@
                                     "zone": "Območje"
                                 },
                                 "device": {
-                                    "label": "Naprava"
+                                    "label": "Naprava",
+                                    "extra_fields": {
+                                        "above": "Nad",
+                                        "below": "Pod",
+                                        "for": "Trajanje"
+                                    }
                                 },
                                 "and": {
                                     "label": "In"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "Naprava"
+                                },
+                                "scene": {
+                                    "label": "Aktivirajte sceno"
                                 }
                             },
                             "learn_more": "Več o akcijah"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "Skripte",
-                    "description": "Ustvarite in uredite skripte"
+                    "description": "Ustvarite in uredite skripte",
+                    "picker": {
+                        "header": "Urejevalnik skript",
+                        "introduction": "Urejevalnik skript vam omogoča njihovo ustvarjanje in urejanje. Upoštevajte spodnjo povezavo in si preberite navodila, da se prepričate, da ste pravilno konfigurirali Home Assistant-a.",
+                        "learn_more": "Preberite več o skriptah",
+                        "no_scripts": "Nismo našli nobene skripte za urejanje",
+                        "add_script": "Dodaj skripto"
+                    },
+                    "editor": {
+                        "header": "Skripta: {name}",
+                        "default_name": "Nova Skripta",
+                        "load_error_not_editable": "Urejati je mogoče le skripte znotraj scripts.yaml.",
+                        "delete_confirm": "Ali ste prepričani, da želite izbrisati to skripto?"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "Prav",
                         "false": "Lažno",
                         "set_config_parameter": "Nastavite Config Parameter"
+                    },
+                    "learn_more": "Preberite več o Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW dnevnik",
+                        "introduction": "Oglejte si dnevnik. 0 je minimum (naloži celoten dnevnik), 1000 pa največ. Prikazan bo statični dnevnik, konec pa se bo samodejno posodobil z zadnjim določenim številom vrstic dnevnika."
                     }
                 },
                 "users": {
                     "caption": "Uporabniki",
                     "description": "Upravljajte uporabnike",
                     "picker": {
-                        "title": "Uporabniki"
+                        "title": "Uporabniki",
+                        "system_generated": "Sistemsko generirano"
                     },
                     "editor": {
                         "rename_user": "Preimenuj uporabnika",
@@ -678,7 +705,18 @@
                         "activate_user": "Aktiviraj uporabnika",
                         "deactivate_user": "Deaktiviraj uporabnika",
                         "delete_user": "Izbriši uporabnika",
-                        "caption": "Prikaži uporabnika"
+                        "caption": "Prikaži uporabnika",
+                        "id": "ID",
+                        "owner": "Lastnik",
+                        "group": "Skupina",
+                        "active": "aktiven",
+                        "system_generated": "Sistemsko generirano",
+                        "system_generated_users_not_removable": "Sistemskih uporabnikov ni mogoče odstraniti.",
+                        "unnamed_user": "Neimenovani uporabnik",
+                        "enter_new_name": "Vnesite novo ime",
+                        "user_rename_failed": "Preimenovanje uporabnika ni uspelo:",
+                        "group_update_failed": "Posodobitev skupine ni uspela:",
+                        "confirm_user_deletion": "Ali ste prepričani, da želite izbrisati {name}?"
                     },
                     "add_user": {
                         "caption": "Dodaj uporabnika",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Prijavljen kot {email}",
                     "description_not_login": "Niste prijavljeni",
-                    "description_features": "Imejte nadzor nad domom tudi, ko vas ni doma, povežite z Alexa in Google Asistentom."
+                    "description_features": "Imejte nadzor nad domom tudi, ko vas ni doma, povežite z Alexa in Google Asistentom.",
+                    "login": {
+                        "title": "Prijava v oblak",
+                        "introduction": "Home Assistant Cloud vam tudi takrat, ko vas ni doma zagotavlja varno oddaljeno povezavo do vašega Home Assistant-a. Prav tako vam omogoča, da se povežete z ostalimi oblačnimi storitvami Amazon Alexa in Google Assistant.",
+                        "introduction2": "To storitev upravlja naš partner ",
+                        "introduction2a": ", podjetje, ki so ga ustanovili ustanovitelji Home Assistant-a.",
+                        "introduction3": "Home Assistant Cloud je naročniška storitev z enomesečno brezplačno poizkusno dobo. Podatki o plačilnih karticah niso potrebni.",
+                        "learn_more_link": "Preberite več o Home Assistant Cloud-u",
+                        "dismiss": "Opustite",
+                        "sign_in": "Vpišite se",
+                        "email": "E-poštni naslov",
+                        "email_error_msg": "Neveljaven e-poštni naslov",
+                        "password": "Geslo",
+                        "password_error_msg": "Gesla morajo biti dolga vsaj 8 znakov",
+                        "forgot_password": "pozabljeno geslo?",
+                        "start_trial": "Začnite brezplačno 1 mesečno preskusno različico",
+                        "trial_info": "Podatki o plačilu niso potrebni",
+                        "alert_password_change_required": "Pred prijavo morate spremeniti geslo.",
+                        "alert_email_confirm_necessary": "Pred prijavo morate potrditi svojo e-pošto."
+                    },
+                    "forgot_password": {
+                        "title": "Pozabljeno geslo",
+                        "subtitle": "Ste pozabili geslo",
+                        "instructions": "Vnesite svoj e-poštni naslov in poslali vam bomo povezavo za ponastavitev gesla.",
+                        "email": "E-poštni naslov",
+                        "email_error_msg": "Neveljavna e-pošta",
+                        "send_reset_email": "Pošljite email za ponastavitev",
+                        "check_your_email": "Preverite vaš e-poštni za navodila za ponastavitev gesla."
+                    },
+                    "register": {
+                        "title": "Registrirajte račun",
+                        "headline": "Začnite brezplačno preskusno različico",
+                        "information": "Ustvarite račun, če želite začeti brezplačno enomesečno preskušanje Home Assistant Cloud-a. Podatki o plačilu niso potrebni.",
+                        "information2": "Preizkus vam bo omogočil dostop do vseh prednosti Home Assistant Cloud, vključno z:",
+                        "feature_remote_control": "Nadzor Home assistant-a zunaj doma",
+                        "feature_google_home": "Integracijo z Googlovim asistentom",
+                        "feature_amazon_alexa": "Integracija z Amazon Alexo",
+                        "feature_webhook_apps": "Enostavna integracija s spletnimi aplikacijami, kot je OwnTracks",
+                        "information3": "To storitev upravlja naš partner ",
+                        "information3a": ", podjetje, ki so ga ustanovili ustanovitelji Home Assistant-a.",
+                        "information4": "Z registracijo računa se strinjate z naslednjimi pravili in pogoji.",
+                        "link_terms_conditions": "Pravila in Pogoji",
+                        "link_privacy_policy": "Politika zasebnosti",
+                        "create_account": "Ustvarite račun",
+                        "email_address": "E-poštni naslov",
+                        "email_error_msg": "Neveljavna e-pošta",
+                        "password": "Geslo",
+                        "password_error_msg": "Gesla morajo biti dolga vsaj 8 znakov",
+                        "start_trial": "Začnite preizkus",
+                        "resend_confirm_email": "Ponovno pošlji potrditveno e-poštno sporočilo",
+                        "account_created": "Račun ustvarjen! Preverite vašo e-pošto za navodila o tem, kako aktivirate vaš račun."
+                    },
+                    "account": {
+                        "thank_you_note": "Zahvaljujemo se vam za to, da ste del Home Assistant Cloud-a. Zaradi ljudi, kot ste vi, smo sposobni narediti dobro izkušnjo avtomatizacije doma za vsakogar. hvala!",
+                        "nabu_casa_account": "Nabu Casa račun",
+                        "connection_status": "Stanje povezave v oblaku",
+                        "manage_account": "Upravljanje računa",
+                        "sign_out": "Izpis",
+                        "integrations": "Integracije",
+                        "integrations_introduction": "Integracija za Home Assistant Cloud vam omogoča povezovanje s storitvami v oblaku, ne da bi vam bilo treba Home Assistant javno izpostavljati po internetu.",
+                        "integrations_introduction2": "Preverite spletno stran za ",
+                        "integrations_link_all_features": "vse razpoložljive funkcije",
+                        "connected": "Povezan",
+                        "not_connected": "Brez povezave",
+                        "fetching_subscription": "Pridobivam naročnino...",
+                        "remote": {
+                            "title": "Daljinsko Upravljanje",
+                            "access_is_being_prepared": "Oddaljeni dostop se pripravlja. Obvestili vas bomo, ko bo pripravljen.",
+                            "info": "Home Assistant Cloud zagotavlja varno oddaljeno povezavo do vašega primerka, medtem ko ste zunaj doma.",
+                            "instance_is_available": "Vaš primerek je na voljo na",
+                            "instance_will_be_available": "Vaš primerek bo na voljo na",
+                            "link_learn_how_it_works": "Naučite se, kako deluje",
+                            "certificate_info": "Informacije o potrdilu"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "Z integracijo Alexa za Home Assistant cloud boste lahko nadzirali vse svoje naprave s pomočjo katere koli naprave, ki podpira Alexa.",
+                            "enable_ha_skill": "Omogoči Home Assistant spretnost za Alexo",
+                            "config_documentation": "Dokumentacija o konfiguraciji",
+                            "enable_state_reporting": "Omogoči poročanje o stanju",
+                            "info_state_reporting": "Če omogočite poročanje o stanju, bo Home Assistant amazonu poslal vse spremembe stanja izpostavljenih entitet. To vam omogoča, da vedno vidite najnovejša stanja v aplikaciji Alexa.",
+                            "sync_entities": "Sinhroniziranje entitet",
+                            "manage_entities": "Upravljajte entitete",
+                            "sync_entities_error": "Sinhroniziranje entitet ni uspelo:",
+                            "state_reporting_error": "Stanja poročila ni mogoče {enable_disable}.",
+                            "enable": "omogočiti",
+                            "disable": "onemogočiti"
+                        },
+                        "google": {
+                            "title": "Pomočnik Google",
+                            "info": "Z integracijo Pomočnik Google za Home Assistant cloud boste lahko nadzirali vse svoje naprave s pomočjo katere koli naprave, ki ga podpirajo.",
+                            "enable_ha_skill": "Aktivirajte spretnost Home Assistant za Pomočnika Google",
+                            "config_documentation": "Dokumentacija o konfiguraciji",
+                            "enable_state_reporting": "Omogoči poročanje o stanju",
+                            "info_state_reporting": "Če omogočite poročanje o stanju, bo Home Assistant Googlu poslal vse spremembe stanja izpostavljenih entitet. To vam omogoča, da vedno vidite najnovejša stanja v aplikaciji Google.",
+                            "security_devices": "Varnostne naprave",
+                            "enter_pin_info": "Prosimo vnesite kodo pin za interakcijo z varnostnimi napravami. Varnostne naprave so vrata, garažna vrata in ključavnice. Med interakcijo s takšnimi napravami prek Googlovega pomočnika boste morali povedati \/ vnesti ta pin.",
+                            "devices_pin": "Pin koda za varnostne naprave",
+                            "enter_pin_hint": "Vnesite kodo PIN za uporabo varnostnih naprav",
+                            "sync_entities": "Sinhronizirajte entitete z Googlom",
+                            "manage_entities": "Upravljajte entitete",
+                            "enter_pin_error": "PIN-a ni mogoče shraniti:"
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "Vsemu, kar je nastavljeno tako, da se sproži webhook je mogoče dati javno dostopen URL, kar jim omogoča, pošljanje podatkov nazaj na Home Assistant od kjerkoli, ne da bi izpostavili vaš primerek na internetu.",
+                            "no_hooks_yet": "Izgleda, da še nimate webhooks-ov. Začnite s konfiguracijo ",
+                            "no_hooks_yet_link_integration": "integracijo, ki temelji na Webhook-u",
+                            "no_hooks_yet2": "ali z ustvarjanjem",
+                            "no_hooks_yet_link_automation": "webhook avtomatizacije",
+                            "link_learn_more": "Preberite več o ustvarjanju avtomatizacij, ki jih poganjajo webhook-i.",
+                            "loading": "Nalaganje",
+                            "manage": "Upravljanje",
+                            "disable_hook_error_msg": "Ni uspelo onemogočiti webhook:"
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "Urejanje entitet, ki so izpostavljeni prek tega uporabniškega vmesnika, je onemogočeno, ker ste v config.yaml konfigurirali filtre entitet.",
+                        "exposed_entities": "Izpostavljene entitete",
+                        "not_exposed_entities": "Entitete, ki niso izpostavljene",
+                        "expose": "Izpostavite Alexi"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "Podatki o certifikatu",
+                        "certificate_expiration_date": "Datum poteka certifikata",
+                        "will_be_auto_renewed": "Bo samodejno obnovljen",
+                        "fingerprint": "Prstni odtis certifikata:",
+                        "close": "Zapri"
+                    },
+                    "google": {
+                        "title": "Pomočnik Google",
+                        "expose": "Izpostavite Pomočniku Google",
+                        "disable_2FA": "Onemogočite dvofaktorsko preverjanje pristnosti",
+                        "banner": "Urejanje entitet, ki so izpostavljeni prek tega uporabniškega vmesnika, je onemogočeno, ker ste v config.yaml konfigurirali filtre entitet.",
+                        "exposed_entities": "Izpostavljene entitete",
+                        "not_exposed_entities": "Entitete, ki niso izpostavljene",
+                        "sync_to_google": "Sinhroniziranje sprememb z Googlom."
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "Webhook za {name}",
+                        "available_at": "Webhook je na voljo na naslednjem URL-ju:",
+                        "managed_by_integration": "Ta webhook upravlja integracija in je ni mogoče onemogočiti.",
+                        "info_disable_webhook": "Če ne želite več uporabljati tega webhook-a, ga lahko",
+                        "link_disable_webhook": "onemogoče",
+                        "view_documentation": "Oglejte si dokumentacijo",
+                        "close": "Zapri",
+                        "confirm_disable": "Ali ste prepričani, da želite onemogočiti ta webhook?",
+                        "copied_to_clipboard": "Kopirano v odložišče"
+                    }
                 },
                 "integrations": {
                     "caption": "Integracije",
@@ -720,7 +907,10 @@
                             "description": "Ta korak zahteva, da za končanje obiščete zunanjo spletno stran.",
                             "open_site": "Odprite spletno stran"
                         }
-                    }
+                    },
+                    "note_about_integrations": "Vseh integracij še ni mogoče konfigurirati prek uporabniškega vmesnika.",
+                    "note_about_website_reference": "Več jih je na voljo prek",
+                    "home_assistant_website": "spletne strani Home Assistant"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Dodaj naprave",
                         "spinner": "Iskanje ZHA Zigbee naprav...",
-                        "discovery_text": "Tukaj bodo prikazane odkrite naprave. Sledite navodilom za napravo in jo postavite v način seznanjanja."
+                        "discovery_text": "Tukaj bodo prikazane odkrite naprave. Sledite navodilom za napravo in jo postavite v način seznanjanja.",
+                        "search_again": "Ponovno iskanje"
+                    },
+                    "common": {
+                        "add_devices": "Dodajte naprave",
+                        "clusters": "Gruče",
+                        "devices": "Naprave",
+                        "manufacturer_code_override": "Preglasitev kode proizvajalca",
+                        "value": "Vrednost"
+                    },
+                    "network_management": {
+                        "header": "Upravljanje omrežja",
+                        "introduction": "Ukazi, ki vplivajo na celotno omrežje"
+                    },
+                    "node_management": {
+                        "header": "Upravljanje naprav",
+                        "introduction": "Zaženite ukaze ZHA, ki vplivajo na posamezno napravo. Izberite napravo in si oglejte seznam ukazov, ki so na voljo.",
+                        "hint_battery_devices": "Opomba: (naprave na baterijski pogon) naprave, ki spijo, morajo biti budne pri izvajanju ukazov proti njim. Zaspano napravo lahko na splošno zbudite tako, da jo sprožite.",
+                        "hint_wakeup": "Nekatere naprave, kot so Xiaomi senzorji, imajo gumb za prebujanje, ki ga lahko pritisnete v ~ 5-sekundnih intervalih, da bodo budne med interakcijo z njimi.",
+                        "help_node_dropdown": "Izberite napravo za ogled njenih možnosti."
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "Izberite gručo, če si želite ogledati njene atribute in ukaze."
+                    },
+                    "cluster_attributes": {
+                        "header": "Atributi gruče",
+                        "introduction": "Oglejte si atribute gruče in jih uredite.",
+                        "attributes_of_cluster": "Atributi izbrane gruče",
+                        "get_zigbee_attribute": "Pridobite Zigbee Atribute",
+                        "set_zigbee_attribute": "Nastavite Zigbee atribute",
+                        "help_attribute_dropdown": "Izberite atribut, če si želite ogledati ali nastaviti njegovo vrednost.",
+                        "help_get_zigbee_attribute": "Pridobite vrednost za izbrani atribut.",
+                        "help_set_zigbee_attribute": "Nastavite vrednost atributa za določeno gručo v določeni entiteti."
+                    },
+                    "cluster_commands": {
+                        "header": "Ukazi Gruče",
+                        "introduction": "Oglejte si in izdajte ukaze gruče.",
+                        "commands_of_cluster": "Ukazi izbrane gruče",
+                        "issue_zigbee_command": "Izdajte ukaz Zigbee",
+                        "help_command_dropdown": "Izberite ukaz za interakcijo."
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant vodi register vseh entitet, ki jih je kdajkoli videl in jih je mogoče enolično identificirati. Vsak od teh entitet ima dodeljen ID entitete, ki bo rezerviran samo za to entiteto.",
                         "introduction2": "Z registrom entitet preglasite ime, spremenite ID entitete ali odstranite vnos iz Home Assistent-a. Opomba, odstranitev vnosa registra entitet ne bo odstranila entitete. Če želite to narediti, sledite spodnji povezavi in jo odstranite s strani za integracijo.",
                         "integrations_page": "Stran za integracije",
-                        "show_disabled": "Pokaži onemogočene subjekte"
+                        "show_disabled": "Pokaži onemogočene subjekte",
+                        "headers": {
+                            "name": "Ime",
+                            "entity_id": "ID subjekta",
+                            "integration": "Integracija",
+                            "enabled": "Omogočeno"
+                        }
                     },
                     "editor": {
                         "unavailable": "Ta entiteta trenutno ni na voljo.",
@@ -791,8 +1026,24 @@
                         "name": "Ime",
                         "device_tracker_intro": "Izberite naprave, ki pripadajo tej osebi.",
                         "device_tracker_picked": "Sledi Napravi",
-                        "device_tracker_pick": "Izberite napravo za sledenje"
-                    }
+                        "device_tracker_pick": "Izberite napravo za sledenje",
+                        "new_person": "Nova oseba",
+                        "name_error_msg": "Ime je obvezno",
+                        "linked_user": "Povezani uporabnik",
+                        "no_device_tracker_available_intro": "Ko imate naprave, ki kažejo na prisotnost osebe, jih boste lahko tukaj dodelili osebi. Svojo prvo napravo lahko dodate tako, da na strani z integracijami dodate zaznavanje prisotnosti.",
+                        "link_presence_detection_integrations": "Integracije zaznavanja prisotnosti",
+                        "link_integrations_page": "Stran za integracije",
+                        "delete": "Izbriši",
+                        "create": "Ustvarite",
+                        "update": "Posodobite"
+                    },
+                    "introduction": "Tu lahko določite vsako osebo (uporabnika) v Home Assistant-a.",
+                    "note_about_persons_configured_in_yaml": "Opomba: oseb, konfiguriranih prek config.yaml, ni mogoče urejati prek uporabniškega vmesnika.",
+                    "no_persons_created_yet": "Izgleda, da še niste ustvarili nobene osebe.",
+                    "create_person": "Ustvari osebo",
+                    "add_person": "Dodaj osebo",
+                    "confirm_delete": "Ali ste prepričani, da želite izbrisati to osebo?",
+                    "confirm_delete2": "Vse naprave, ki pripadajo tej osebi, bodo postale nedodeljene."
                 },
                 "server_control": {
                     "caption": "Nadzor strežnika",
@@ -838,6 +1089,11 @@
                             "caption": "Ko se nekaj sproži ..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "Imate neshranjene spremembe. Ste prepričani, da želite zapustiti?"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "Vibriraj",
                     "description": "V tej napravi omogočite ali onemogočite vibracije pri krmiljenju naprav."
+                },
+                "advanced_mode": {
+                    "title": "Napredni način",
+                    "description": "Home Assistant privzeto skrije napredne funkcije in možnosti. Do teh funkcij lahko dostopate tako, da vklopite to stikalo. To je uporabniško določena nastavitev, ki ne vpliva na druge uporabnike."
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "Dodaj kartico",
                         "edit": "Uredi",
                         "delete": "Izbriši",
-                        "move": "Premakni"
+                        "move": "Premakni",
+                        "show_visual_editor": "Pokaži vizualni urejevalnik",
+                        "show_code_editor": "Pokaži urejevalnik kode"
                     },
                     "migrate": {
                         "header": "Konfiguracija Nezdružljiva",
@@ -1121,7 +1383,8 @@
                             "optional": "Neobvezno"
                         },
                         "entities": {
-                            "show_header_toggle": "Pokaži preklop glave?"
+                            "show_header_toggle": "Pokaži preklop glave?",
+                            "name": "Subjekti"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "Zelena",
                                 "red": "Rdeča",
                                 "yellow": "Rumena"
-                            }
+                            },
+                            "name": "Merilnik"
                         },
                         "glance": {
-                            "columns": "Stolpci"
+                            "columns": "Stolpci",
+                            "name": "Pregled"
                         },
                         "generic": {
                             "aspect_ratio": "Razmerje Med Širino In Višino",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "Geolokacijski viri",
                             "dark_mode": "Temni način?",
                             "default_zoom": "Privzeta povečava",
-                            "source": "Vir"
+                            "source": "Vir",
+                            "name": "Zemljevid"
                         },
                         "markdown": {
-                            "content": "Vsebina"
+                            "content": "Vsebina",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "Podrobnosti grafa",
-                            "graph_type": "Vrsta grafikona"
+                            "graph_type": "Vrsta grafikona",
+                            "name": "Senzor"
+                        },
+                        "alarm-panel": {
+                            "name": "Alarmna plošča",
+                            "available_states": "Stanja na voljo"
+                        },
+                        "conditional": {
+                            "name": "Pogojno"
+                        },
+                        "entity-button": {
+                            "name": "Subjekt gumba"
+                        },
+                        "entity-filter": {
+                            "name": "Filter entitet"
+                        },
+                        "history-graph": {
+                            "name": "Graf zgodovine"
+                        },
+                        "horizontal-stack": {
+                            "name": "Vodoravna skladnica"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "Luči"
+                        },
+                        "media-control": {
+                            "name": "Nadzor predvajalnika"
+                        },
+                        "picture": {
+                            "name": "Slika"
+                        },
+                        "picture-elements": {
+                            "name": "Slikovni elementi"
+                        },
+                        "picture-entity": {
+                            "name": "Subjekt slike"
+                        },
+                        "picture-glance": {
+                            "name": "Pogled slike"
+                        },
+                        "plant-status": {
+                            "name": "Stanje rastline"
+                        },
+                        "shopping-list": {
+                            "name": "Nakupovalni seznam"
+                        },
+                        "thermostat": {
+                            "name": "Termostat"
+                        },
+                        "vertical-stack": {
+                            "name": "Navpična skladnica"
+                        },
+                        "weather-forecast": {
+                            "name": "Vremenska napoved"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "Izklopljen {entity}.",
             "service_called": "Storitev {service} klicana.",
             "service_call_failed": "Storitve ni bilo mogoče poklicati {service}.",
-            "connection_lost": "Povezava prekinjena. Vnovično vzpostavljanje povezave..."
+            "connection_lost": "Povezava prekinjena. Vnovično vzpostavljanje povezave...",
+            "triggered": "Sproženo {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "Ime, ki ga je dodelil uporabnik",
                     "area_picker_label": "Območje",
                     "update_name_button": "Posodobi ime"
-                }
+                },
+                "buttons": {
+                    "add": "Dodajte naprave",
+                    "remove": "Odstranite napravo",
+                    "reconfigure": "Ponovno konfigurirajte napravo"
+                },
+                "quirk": "Posebnost",
+                "last_seen": "Nazadnje viden",
+                "power_source": "Vir napajanja",
+                "unknown": "Neznano"
             }
         },
         "auth_store": {
diff --git a/translations/uk.json b/translations/uk.json
index 00800fd1d5..5e980351c3 100644
--- a/translations/uk.json
+++ b/translations/uk.json
@@ -901,6 +901,9 @@
                 "force_narrow": {
                     "header": "Завжди приховувати бічну панель",
                     "description": "Це дозволить приховати бічну панель за замовчуванням, як і для мобільних пристроїв."
+                },
+                "advanced_mode": {
+                    "title": "Розширений режим"
                 }
             },
             "page-authorize": {
@@ -1094,6 +1097,29 @@
                     "edit_lovelace": {
                         "header": "Заголовок для Lovelace",
                         "explanation": "Цей заголовок буде показаний над вашими картками в Lovelace"
+                    },
+                    "card": {
+                        "light": {
+                            "name": "Освітлення"
+                        },
+                        "map": {
+                            "name": "Мапа"
+                        },
+                        "plant-status": {
+                            "name": "Стан рослини"
+                        },
+                        "sensor": {
+                            "name": "Датчик"
+                        },
+                        "thermostat": {
+                            "name": "Термостат"
+                        },
+                        "vertical-stack": {
+                            "name": "Вертикальний стек"
+                        },
+                        "weather-forecast": {
+                            "name": "Прогноз погоди"
+                        }
                     }
                 },
                 "menu": {
diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json
index 58d9d26527..0cb940177a 100644
--- a/translations/zh-Hant.json
+++ b/translations/zh-Hant.json
@@ -558,7 +558,12 @@
                                     "zone": "區域"
                                 },
                                 "device": {
-                                    "label": "設備"
+                                    "label": "設備",
+                                    "extra_fields": {
+                                        "above": "在...之上",
+                                        "below": "在...之下",
+                                        "for": "持續時間"
+                                    }
                                 },
                                 "and": {
                                     "label": "及"
@@ -602,6 +607,9 @@
                                 },
                                 "device_id": {
                                     "label": "設備"
+                                },
+                                "scene": {
+                                    "label": "啟用場景"
                                 }
                             },
                             "learn_more": "詳細了解動作"
@@ -616,7 +624,20 @@
                 },
                 "script": {
                     "caption": "腳本",
-                    "description": "創建和編輯腳本"
+                    "description": "創建和編輯腳本",
+                    "picker": {
+                        "header": "腳本編輯器",
+                        "introduction": "腳本編輯器允許新增或編輯腳本。請參考下方教學連結，以確保正確的設定 Home Assistant。",
+                        "learn_more": "詳細了解腳本",
+                        "no_scripts": "無法找到任何可編輯的腳本",
+                        "add_script": "新增腳本"
+                    },
+                    "editor": {
+                        "header": "腳本：{name}",
+                        "default_name": "新腳本",
+                        "load_error_not_editable": "僅有於 scripts.yaml 檔案內的腳本，方能進行編輯。",
+                        "delete_confirm": "確定要刪除此腳本？"
+                    }
                 },
                 "zwave": {
                     "caption": "Z-Wave",
@@ -664,13 +685,19 @@
                         "true": "True",
                         "false": "False",
                         "set_config_parameter": "設定參數"
+                    },
+                    "learn_more": "詳細了解 Z-Wave",
+                    "ozw_log": {
+                        "header": "OZW 紀錄",
+                        "introduction": "檢視紀錄。最小值為 0（載入所有紀錄）、最大值為 1000。將顯示靜態紀錄、後段將依據紀錄最後指定行數自動更新。"
                     }
                 },
                 "users": {
                     "caption": "用戶",
                     "description": "用戶管理",
                     "picker": {
-                        "title": "用戶"
+                        "title": "用戶",
+                        "system_generated": "系統產生"
                     },
                     "editor": {
                         "rename_user": "重命名用戶",
@@ -678,7 +705,18 @@
                         "activate_user": "激活用戶",
                         "deactivate_user": "停用用戶",
                         "delete_user": "刪除用戶",
-                        "caption": "檢視用戶"
+                        "caption": "檢視用戶",
+                        "id": "ID",
+                        "owner": "擁有者",
+                        "group": "群組",
+                        "active": "啟用",
+                        "system_generated": "系統產生",
+                        "system_generated_users_not_removable": "無法移除系統產生用戶",
+                        "unnamed_user": "未命名用戶",
+                        "enter_new_name": "輸入新名稱",
+                        "user_rename_failed": "用戶重新命名失敗：",
+                        "group_update_failed": "群組更新失敗：",
+                        "confirm_user_deletion": "確定要刪除 {name}？"
                     },
                     "add_user": {
                         "caption": "新增用戶",
@@ -692,7 +730,156 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "登入帳號：{email}",
                     "description_not_login": "未登入",
-                    "description_features": "整合 Alexa 及 Google 助理，遠端控制智能家居"
+                    "description_features": "整合 Alexa 及 Google 助理，遠端控制智能家居",
+                    "login": {
+                        "title": "雲端登入",
+                        "introduction": "Home Assistant Cloud 雲服務提供您離家時、遠端加密連線控制。同時也可連結使用雲端，例如：Amazon Alexa 及 Google Assistant。",
+                        "introduction2": "服務執行者：合作廠商 ",
+                        "introduction2a": "、Home Assistant 與 Hass.io 創始人所成立的公司。",
+                        "introduction3": "Home Assistant Cloud 為訂閱服務制、包含一個月的試用期。試用期間無須輸入任何付款資訊。",
+                        "learn_more_link": "了解更多關於 Home Assistant Cloud 雲服務資訊",
+                        "dismiss": "關閉",
+                        "sign_in": "登入",
+                        "email": "郵件",
+                        "email_error_msg": "無效郵件",
+                        "password": "密碼",
+                        "password_error_msg": "密碼至少需要 8 個字元",
+                        "forgot_password": "忘記密碼？",
+                        "start_trial": "開始 1 月試用期",
+                        "trial_info": "無須輸入任何付款資訊",
+                        "alert_password_change_required": "需要變更密碼後方能登入。",
+                        "alert_email_confirm_necessary": "需要驗證郵件後方能登入。"
+                    },
+                    "forgot_password": {
+                        "title": "忘記密碼？",
+                        "subtitle": "忘記密碼",
+                        "instructions": "輸入您的電子郵件位址，將用以傳送密碼重置設定連結。",
+                        "email": "郵件",
+                        "email_error_msg": "無效郵件",
+                        "send_reset_email": "傳送重置郵件",
+                        "check_your_email": "請檢查您的郵件，以了解如何進行密碼重置。"
+                    },
+                    "register": {
+                        "title": "註冊帳號",
+                        "headline": "開始免費試用",
+                        "information": "註冊帳號以開始一個月的 Home Assistant Cloud 雲服務試用。無須輸入任何付款資訊。",
+                        "information2": "試用期將可以使用所有 Home Assistant Cloud 雲服務服務跟功能，包含：",
+                        "feature_remote_control": "離家時控制 Home Assistant",
+                        "feature_google_home": "與 Google Assistant 整合",
+                        "feature_amazon_alexa": "與 Amazon Alexa 整合",
+                        "feature_webhook_apps": "與 Webhook app 如 OwnTracks 服務輕易整合",
+                        "information3": "服務執行者：合作廠商 ",
+                        "information3a": "、Home Assistant 與 Hass.io 創始人所成立的公司。",
+                        "information4": "藉由註冊帳號的動作，即表示您同意以下條款與條件。",
+                        "link_terms_conditions": "條款與條件",
+                        "link_privacy_policy": "隱私權政策",
+                        "create_account": "創建帳號",
+                        "email_address": "電子郵件",
+                        "email_error_msg": "無效郵件",
+                        "password": "密碼",
+                        "password_error_msg": "密碼至少需要 8 個字元",
+                        "start_trial": "開始試用",
+                        "resend_confirm_email": "重新發送認證郵件",
+                        "account_created": "帳號已創建，請檢查郵件以了解如何啟用帳號。"
+                    },
+                    "account": {
+                        "thank_you_note": "感謝您參與支持 Home Assistant Cloud 雲服務。由於有你們的支持，我們才能持續為每個人帶來絕佳的家庭自動化體驗，謝謝！",
+                        "nabu_casa_account": "Nabu Casa 帳號",
+                        "connection_status": "雲服務連線狀態",
+                        "manage_account": "管理帳號",
+                        "sign_out": "登出",
+                        "integrations": "整合",
+                        "integrations_introduction": "Home Assistant Cloud 雲服務整合可連線至其他雲服務、而不需將您的 Home Assistant 暴露在整個網際網路上。",
+                        "integrations_introduction2": "開啟網站 ",
+                        "integrations_link_all_features": " 所有可用功能",
+                        "connected": "已連接",
+                        "not_connected": "未連線",
+                        "fetching_subscription": "取得訂閱狀態中...",
+                        "remote": {
+                            "title": "遠端控制",
+                            "access_is_being_prepared": "遠端登入準備中，會於就緒時通知您。",
+                            "info": "Home Assistant Cloud 雲服務提供您離家時、遠端加密連線控制。",
+                            "instance_is_available": "您的設備可透過下方連結使用",
+                            "instance_will_be_available": "您的設備將可透過下方連結使用",
+                            "link_learn_how_it_works": "了解如何運作",
+                            "certificate_info": "認證資訊"
+                        },
+                        "alexa": {
+                            "title": "Alexa",
+                            "info": "藉由 Home Assistant Cloud 雲服務  Alexa 整合，將能透過 Alexa 支援設備以控制所有 Home Assistant 設備。",
+                            "enable_ha_skill": "開啟 Home Assistant skill for Alexa",
+                            "config_documentation": "設定文件",
+                            "enable_state_reporting": "開啟狀態回報",
+                            "info_state_reporting": "假如開啟狀態回報，Home Assistant 將會持續傳送所有連結物件的狀態改變至 Amazon。以確保於 Alexa app 中設備永遠保持最新狀態、並藉以創建例行自動化。",
+                            "sync_entities": "同步物件",
+                            "manage_entities": "管理物件",
+                            "sync_entities_error": "同步物件失敗：",
+                            "state_reporting_error": "無法 {enable_disable} 回報狀態。",
+                            "enable": "開啟",
+                            "disable": "關閉"
+                        },
+                        "google": {
+                            "title": "Google Assistant",
+                            "info": "藉由 Home Assistant Cloud 雲服務  Google Assistant 整合，將能透過 Google Assistant 支援設備以控制所有 Home Assistant 設備。",
+                            "enable_ha_skill": "啟用 Home Assistant skill for Google Assistant",
+                            "config_documentation": "設定文件",
+                            "enable_state_reporting": "開啟狀態回報",
+                            "info_state_reporting": "假如開啟狀態回報，Home Assistant 將會持續傳送所有連結物件的狀態改變至 Google。以確保於 Google app 中設備永遠保持最新狀態、並藉以創建例行自動化。",
+                            "security_devices": "加密設備",
+                            "enter_pin_info": "請輸入加密設備 Pin 碼、加密設備為如門、車庫與門鎖。當透過 Google Assistant 與此類設備進行互動時，將需要語音說出\/輸入密碼。",
+                            "devices_pin": "加密設備 Pin",
+                            "enter_pin_hint": "請輸入安全碼以使用加密設備",
+                            "sync_entities": "與 Google 同步物件",
+                            "manage_entities": "管理物件",
+                            "enter_pin_error": "無法儲存 Pin："
+                        },
+                        "webhooks": {
+                            "title": "Webhooks",
+                            "info": "任何設定透過 Webhook 觸發內容，都可以取得公開可存取的 URL、以供傳送資料回 Home Assistant，而不需將 Home Assistant 暴露至網路網路上。",
+                            "no_hooks_yet": "看起來您尚未建立 Webhook，可藉由設定 ",
+                            "no_hooks_yet_link_integration": "Webhook 整合",
+                            "no_hooks_yet2": " 或新增一組 ",
+                            "no_hooks_yet_link_automation": "Webhook 自動化",
+                            "link_learn_more": "詳細了解新增 Webhook 自動化。",
+                            "loading": "正在載入...",
+                            "manage": "管理",
+                            "disable_hook_error_msg": "關閉 Webhook 失敗："
+                        }
+                    },
+                    "alexa": {
+                        "title": "Alexa",
+                        "banner": "由於您已經透過 configuration.yaml 設定物件過濾器、 因此編輯連結物件的介面將無法使用。",
+                        "exposed_entities": "已連結物件",
+                        "not_exposed_entities": "未連結物件",
+                        "expose": "連結至 Alexa"
+                    },
+                    "dialog_certificate": {
+                        "certificate_information": "認證資訊",
+                        "certificate_expiration_date": "認證過期日期",
+                        "will_be_auto_renewed": "將會自動更新",
+                        "fingerprint": "認證歷程：",
+                        "close": "關閉"
+                    },
+                    "google": {
+                        "title": "Google Assistant",
+                        "expose": "連結至 Google Assistant",
+                        "disable_2FA": "關閉兩步驟驗證",
+                        "banner": "由於您已經透過 configuration.yaml 設定物件過濾器、 因此編輯連結物件的介面將無法使用。",
+                        "exposed_entities": "已連結物件",
+                        "not_exposed_entities": "未連結物件",
+                        "sync_to_google": "正與 Google 同步變更。"
+                    },
+                    "dialog_cloudhook": {
+                        "webhook_for": "{name} Webhook",
+                        "available_at": "Webhook 可透過以下 URL 獲得：",
+                        "managed_by_integration": "此 Webhook 由整合所管理、無法關閉。",
+                        "info_disable_webhook": "假如不再使用此 Webhook，可以",
+                        "link_disable_webhook": "關閉",
+                        "view_documentation": "檢視文件",
+                        "close": "關閉",
+                        "confirm_disable": "確定要關閉此 Webhook？",
+                        "copied_to_clipboard": "複製至剪貼簿"
+                    }
                 },
                 "integrations": {
                     "caption": "整合",
@@ -720,7 +907,10 @@
                             "description": "此步驟將需要開啟外部網站方能完成。",
                             "open_site": "開啟網站"
                         }
-                    }
+                    },
+                    "note_about_integrations": "目前並非所有整合皆可以透過 UI 進行設定。",
+                    "note_about_website_reference": "更多資訊請參閱",
+                    "home_assistant_website": "Home Assistant 網站"
                 },
                 "zha": {
                     "caption": "ZHA",
@@ -738,7 +928,46 @@
                     "add_device_page": {
                         "header": "Zigbee 家庭自動化 - 新增設備",
                         "spinner": "正在搜尋 ZHA Zigbee 設備...",
-                        "discovery_text": "所發現的設備將會顯示於此。跟隨設備的指示並將其設定為配對模式。"
+                        "discovery_text": "所發現的設備將會顯示於此。跟隨設備的指示並將其設定為配對模式。",
+                        "search_again": "再次搜尋"
+                    },
+                    "common": {
+                        "add_devices": "新增設備",
+                        "clusters": "叢集",
+                        "devices": "設備",
+                        "manufacturer_code_override": "製造商代碼覆寫",
+                        "value": "數值"
+                    },
+                    "network_management": {
+                        "header": "網路管理",
+                        "introduction": "命令影響整個網路"
+                    },
+                    "node_management": {
+                        "header": "設備管理",
+                        "introduction": "執行 ZHA 命命將影響單一設備。選擇設備以檢視該設備可使用之命令。",
+                        "hint_battery_devices": "請注意：對設備執行命令時，需喚醒處於睡眠狀態的設備（使用電池供電），通常可以藉由觸發以喚醒設備。",
+                        "hint_wakeup": "某些設備（例如小米傳感器）擁有喚醒按鈕、可藉由每隔約 5 秒按一下、以保持設備處於喚醒狀態以進行互動。",
+                        "help_node_dropdown": "選擇設備以檢視該設備選項。"
+                    },
+                    "clusters": {
+                        "help_cluster_dropdown": "選擇叢集以檢視屬性及命令。"
+                    },
+                    "cluster_attributes": {
+                        "header": "叢集屬性",
+                        "introduction": "檢視或編輯叢集屬性。",
+                        "attributes_of_cluster": "獲取所選叢集屬性。",
+                        "get_zigbee_attribute": "獲取 Zigbee 屬性",
+                        "set_zigbee_attribute": "設定 Zigbee 屬性",
+                        "help_attribute_dropdown": "選擇屬性以檢視或設定該數值。",
+                        "help_get_zigbee_attribute": "獲取所選屬性數值。",
+                        "help_set_zigbee_attribute": "設定特定物件之特定叢集屬性數值。"
+                    },
+                    "cluster_commands": {
+                        "header": "叢集命令",
+                        "introduction": "檢視或發出叢集命令。",
+                        "commands_of_cluster": "所選叢集之命令",
+                        "issue_zigbee_command": "發出 Zigbee 命令",
+                        "help_command_dropdown": "選擇所要互動的命令。"
                     }
                 },
                 "area_registry": {
@@ -770,7 +999,13 @@
                         "introduction": "Home Assistant 保持每個物件 ID 的獨特辨識性，此些物件將會指定一組專用的 物件 ID。",
                         "introduction2": "使用物件 ID 以覆寫名稱、變更物件 ID 或由 Home Assistant 移除物件。請注意：移除物件 ID 項目並不會移除物件。欲移除，請跟隨下方連結，並於整合頁面中進行移除。",
                         "integrations_page": "整合頁面",
-                        "show_disabled": "顯示關閉物件"
+                        "show_disabled": "顯示關閉物件",
+                        "headers": {
+                            "name": "名稱",
+                            "entity_id": "物件 ID",
+                            "integration": "整合",
+                            "enabled": "已啟用"
+                        }
                     },
                     "editor": {
                         "unavailable": "該物件目前不可用。",
@@ -791,8 +1026,24 @@
                         "name": "名稱",
                         "device_tracker_intro": "選擇此人員所擁有的設備。",
                         "device_tracker_picked": "追蹤設備",
-                        "device_tracker_pick": "選擇追蹤設備"
-                    }
+                        "device_tracker_pick": "選擇追蹤設備",
+                        "new_person": "新人員",
+                        "name_error_msg": "必須輸入名稱",
+                        "linked_user": "已連結用戶",
+                        "no_device_tracker_available_intro": "當有設備顯示有人員在場時、可以將該設備指定為某個人員所有。可以先藉由整合頁面、新增人員偵測整合以加入第一個設備。",
+                        "link_presence_detection_integrations": "人員偵測整合",
+                        "link_integrations_page": "整合頁面",
+                        "delete": "刪除",
+                        "create": "新增",
+                        "update": "更新"
+                    },
+                    "introduction": "此處可定義 Home Assistant 中的每一位成員。",
+                    "note_about_persons_configured_in_yaml": "請注意：透過 configuration.yaml 設定的人員將無法透過 UI 進行編輯。",
+                    "no_persons_created_yet": "看起來您還有新增任何人員。",
+                    "create_person": "新增人員",
+                    "add_person": "新增人員",
+                    "confirm_delete": "確定要刪除此人員？",
+                    "confirm_delete2": "所有該人員所屬裝置將成為未指派狀態。"
                 },
                 "server_control": {
                     "caption": "伺服器控制",
@@ -838,6 +1089,11 @@
                             "caption": "當某物件被觸發時..."
                         }
                     }
+                },
+                "common": {
+                    "editor": {
+                        "confirm_unsaved": "設定尚未儲存，確定要放棄嗎？"
+                    }
                 }
             },
             "profile": {
@@ -917,6 +1173,10 @@
                 "vibrate": {
                     "header": "震動",
                     "description": "當控制裝置時、開啟或關閉此裝置震動。"
+                },
+                "advanced_mode": {
+                    "title": "進階模式",
+                    "description": "預設狀態下，Home Assistant 將隱藏進階功能與選項。可藉由開啟此開關打開這些功能。此功能為各用戶獨立功能、不會影響 Home Assistant 的其他用戶。"
                 }
             },
             "page-authorize": {
@@ -1077,7 +1337,9 @@
                         "add": "新增卡片",
                         "edit": "編輯",
                         "delete": "刪除",
-                        "move": "移動"
+                        "move": "移動",
+                        "show_visual_editor": "顯示視覺編輯器",
+                        "show_code_editor": "顯示編碼編輯器"
                     },
                     "migrate": {
                         "header": "設定不相容",
@@ -1121,7 +1383,8 @@
                             "optional": "選項"
                         },
                         "entities": {
-                            "show_header_toggle": "顯示名稱切換？"
+                            "show_header_toggle": "顯示名稱切換？",
+                            "name": "物件"
                         },
                         "gauge": {
                             "severity": {
@@ -1129,10 +1392,12 @@
                                 "green": "綠色",
                                 "red": "紅色",
                                 "yellow": "黃色"
-                            }
+                            },
+                            "name": "尺規"
                         },
                         "glance": {
-                            "columns": "列"
+                            "columns": "列",
+                            "name": "Glance"
                         },
                         "generic": {
                             "aspect_ratio": "長寬比",
@@ -1162,14 +1427,72 @@
                             "geo_location_sources": "地理位置來源",
                             "dark_mode": "深色模式？",
                             "default_zoom": "預設大小",
-                            "source": "來源"
+                            "source": "來源",
+                            "name": "地圖"
                         },
                         "markdown": {
-                            "content": "內容"
+                            "content": "內容",
+                            "name": "Markdown"
                         },
                         "sensor": {
                             "graph_detail": "圖像精細度",
-                            "graph_type": "圖像類型"
+                            "graph_type": "圖像類型",
+                            "name": "傳感器"
+                        },
+                        "alarm-panel": {
+                            "name": "警報面板",
+                            "available_states": "可用狀態"
+                        },
+                        "conditional": {
+                            "name": "條件式"
+                        },
+                        "entity-button": {
+                            "name": "物件按鈕"
+                        },
+                        "entity-filter": {
+                            "name": "物件過濾器"
+                        },
+                        "history-graph": {
+                            "name": "歷史圖表"
+                        },
+                        "horizontal-stack": {
+                            "name": "水平堆疊"
+                        },
+                        "iframe": {
+                            "name": "iFrame"
+                        },
+                        "light": {
+                            "name": "燈光"
+                        },
+                        "media-control": {
+                            "name": "媒體控制"
+                        },
+                        "picture": {
+                            "name": "圖片"
+                        },
+                        "picture-elements": {
+                            "name": "圖片元素"
+                        },
+                        "picture-entity": {
+                            "name": "圖片物件"
+                        },
+                        "picture-glance": {
+                            "name": "Picture Glance"
+                        },
+                        "plant-status": {
+                            "name": "植物狀態"
+                        },
+                        "shopping-list": {
+                            "name": "購物清單"
+                        },
+                        "thermostat": {
+                            "name": "溫控器"
+                        },
+                        "vertical-stack": {
+                            "name": "垂直堆疊"
+                        },
+                        "weather-forecast": {
+                            "name": "天氣預報"
                         }
                     }
                 },
@@ -1405,7 +1728,8 @@
             "entity_turned_off": "{entity}已關閉。",
             "service_called": "服務 {service} 已執行。",
             "service_call_failed": "服務 {service} 執行失敗。",
-            "connection_lost": "連線中斷。重新連線中..."
+            "connection_lost": "連線中斷。重新連線中...",
+            "triggered": "觸發 {name}"
         },
         "dialogs": {
             "more_info_settings": {
@@ -1451,7 +1775,16 @@
                     "device_name_placeholder": "使用者姓氏",
                     "area_picker_label": "分區",
                     "update_name_button": "更新名稱"
-                }
+                },
+                "buttons": {
+                    "add": "新增設備",
+                    "remove": "移除設備",
+                    "reconfigure": "重新設定設備"
+                },
+                "quirk": "Quirk",
+                "last_seen": "上次出現",
+                "power_source": "電力來源",
+                "unknown": "未知"
             }
         },
         "auth_store": {

From 73c56a68b6bd57630a78d67ceb11948f579158bf Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 23 Oct 2019 21:16:25 +0200
Subject: [PATCH 70/70] Bumped version to 20191023.0

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a71239fc8f..90f675a805 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20191014.0",
+    version="20191023.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",