From 35abd9dfdb765f12f62e92d422cd7c688c11528c Mon Sep 17 00:00:00 2001
From: HomeAssistant Azure <hello@home-assistant.io>
Date: Thu, 3 Dec 2020 00:32:38 +0000
Subject: [PATCH 1/7] [ci skip] Translation update

---
 translations/frontend/de.json      |  1 +
 translations/frontend/en.json      | 64 ++++++++++++++++++++++++------
 translations/frontend/fr.json      | 15 ++++++-
 translations/frontend/lb.json      |  7 +++-
 translations/frontend/nb.json      |  4 +-
 translations/frontend/zh-Hans.json |  2 +-
 translations/frontend/zh-Hant.json | 30 +++++++-------
 7 files changed, 89 insertions(+), 34 deletions(-)

diff --git a/translations/frontend/de.json b/translations/frontend/de.json
index 5ec1908ded..1aaffde7da 100644
--- a/translations/frontend/de.json
+++ b/translations/frontend/de.json
@@ -2474,6 +2474,7 @@
                         "CONFIGURED_status_text": "Initialisieren",
                         "INITIALIZED": "Initialisierung abgeschlossen",
                         "INITIALIZED_status_text": "Das Gerät ist einsatzbereit",
+                        "INTERVIEW_COMPLETE": "Interview abgeschlossen",
                         "INTERVIEW_COMPLETE_status_text": "Konfigurieren",
                         "PAIRED": "Gerät gefunden"
                     },
diff --git a/translations/frontend/en.json b/translations/frontend/en.json
index 6a1115a5d4..7966f0328b 100644
--- a/translations/frontend/en.json
+++ b/translations/frontend/en.json
@@ -2,6 +2,7 @@
     "config_entry": {
         "disabled_by": {
             "config_entry": "Config Entry",
+            "device": "Device",
             "integration": "Integration",
             "user": "User"
         }
@@ -710,6 +711,16 @@
             "service-picker": {
                 "service": "Service"
             },
+            "target-picker": {
+                "add_area_id": "Pick area",
+                "add_device_id": "Pick device",
+                "add_entity_id": "Pick entity",
+                "expand_area_id": "Expand this area in the seperate devices and entities that it contains. After expanding it will not update the devices and entities when the area changes.",
+                "expand_device_id": "Expand this device in seperate entities. After expanding it will not update the entities when the device changes.",
+                "remove_area_id": "Remove area",
+                "remove_device_id": "Remove device",
+                "remove_entity_id": "Remove entity"
+            },
             "user-picker": {
                 "add_user": "Add user",
                 "no_user": "No user",
@@ -733,6 +744,7 @@
                 "editor": {
                     "confirm_delete": "Are you sure you want to delete this entry?",
                     "delete": "Delete",
+                    "device_disabled": "The device of this entity is disabled.",
                     "enabled_cause": "Disabled by {cause}.",
                     "enabled_delay_confirm": "The enabled entities will be added to Home Assistant in {delay} seconds",
                     "enabled_description": "Disabled entities will not be added to Home Assistant.",
@@ -743,6 +755,7 @@
                     "icon_error": "Icons should be in the format 'prefix:iconname', e.g. 'mdi:home'",
                     "name": "Name",
                     "note": "Note: This might not work yet with all integrations.",
+                    "open_device_settings": "Open device settings",
                     "unavailable": "This entity is not currently available.",
                     "update": "Update"
                 },
@@ -1030,7 +1043,7 @@
                         "confirmation_text": "All devices in this area will become unassigned.",
                         "confirmation_title": "Are you sure you want to delete this area?"
                     },
-                    "description": "Manage areas in your home",
+                    "description": "Group devices into areas",
                     "editor": {
                         "area_id": "Area ID",
                         "create": "Create",
@@ -1052,7 +1065,7 @@
                 },
                 "automation": {
                     "caption": "Automations",
-                    "description": "Manage automations",
+                    "description": "Create custom behavior rules for your home",
                     "dialog_new": {
                         "blueprint": {
                             "use_blueprint": "Use a blueprint"
@@ -1510,7 +1523,7 @@
                         "title": "Alexa"
                     },
                     "caption": "Home Assistant Cloud",
-                    "description_features": "Control away from home, integrate with Alexa and Google Assistant.",
+                    "description_features": "Control home when away and integrate with Alexa and Google Assistant",
                     "description_login": "Logged in as {email}",
                     "description_not_login": "Not logged in",
                     "dialog_certificate": {
@@ -1605,7 +1618,7 @@
                 },
                 "core": {
                     "caption": "General",
-                    "description": "Change your general Home Assistant configuration",
+                    "description": "Unit system, location, time zone & other general parameters",
                     "section": {
                         "core": {
                             "core_config": {
@@ -1667,6 +1680,7 @@
                             "unknown_condition": "Unknown condition"
                         },
                         "create": "Create automation with device",
+                        "create_disable": "Can't create automation with disabled device",
                         "no_automations": "No automations",
                         "no_device_automations": "There are no automations available for this device.",
                         "triggers": {
@@ -1692,9 +1706,18 @@
                         "no_devices": "No devices"
                     },
                     "delete": "Delete",
-                    "description": "Manage connected devices",
+                    "description": "Manage configured devices",
                     "device_info": "Device info",
                     "device_not_found": "Device not found.",
+                    "disabled": "Disabled",
+                    "disabled_by": {
+                        "config_entry": "Config Entry",
+                        "integration": "Integration",
+                        "user": "User"
+                    },
+                    "enabled_cause": "The device is disabled by {cause}.",
+                    "enabled_description": "Disabled devices will not be shown and entities belonging to the device will be disabled and not added to Home Assistant.",
+                    "enabled_label": "Enable device",
                     "entities": {
                         "add_entities_lovelace": "Add to Lovelace",
                         "disabled_entities": "+{count} {count, plural,\n  one {disabled entity}\n  other {disabled entities}\n}",
@@ -1704,14 +1727,25 @@
                     },
                     "name": "Name",
                     "no_devices": "No devices",
+                    "picker": {
+                        "filter": {
+                            "filter": "Filter",
+                            "hidden_devices": "{number} hidden {number, plural,\n  one {device}\n  other {devices}\n}",
+                            "show_all": "Show all",
+                            "show_disabled": "Show disabled devices"
+                        },
+                        "search": "Search devices"
+                    },
                     "scene": {
                         "create": "Create scene with device",
+                        "create_disable": "Can't create scene with disabled device",
                         "no_scenes": "No scenes",
                         "scenes": "Scenes"
                     },
                     "scenes": "Scenes",
                     "script": {
                         "create": "Create script with device",
+                        "create_disable": "Can't create script with disabled device",
                         "no_scripts": "No scripts",
                         "scripts": "Scripts"
                     },
@@ -1777,7 +1811,7 @@
                 "header": "Configure Home Assistant",
                 "helpers": {
                     "caption": "Helpers",
-                    "description": "Manage elements that help build automations",
+                    "description": "Elements that help build automations",
                     "dialog": {
                         "add_helper": "Add helper",
                         "add_platform": "Add {platform}",
@@ -1809,7 +1843,7 @@
                     "copy_github": "For GitHub",
                     "copy_raw": "Raw Text",
                     "custom_uis": "Custom UIs:",
-                    "description": "View info about your Home Assistant installation",
+                    "description": "Version, system health and links to documentation",
                     "developed_by": "Developed by a bunch of awesome people.",
                     "documentation": "Documentation",
                     "frontend": "frontend-ui",
@@ -1915,7 +1949,7 @@
                     },
                     "configure": "Configure",
                     "configured": "Configured",
-                    "description": "Manage integrations",
+                    "description": "Manage integrations with services, devices, ...",
                     "details": "Integration details",
                     "discovered": "Discovered",
                     "home_assistant_website": "Home Assistant website",
@@ -2000,7 +2034,7 @@
                             "open": "Open"
                         }
                     },
-                    "description": "Manage your Lovelace Dashboards",
+                    "description": "Create customized sets of cards to control your home",
                     "resources": {
                         "cant_edit_yaml": "You are using Lovelace in YAML mode, therefore you cannot manage your resources through the UI. Manage them in configuration.yaml.",
                         "caption": "Resources",
@@ -2199,7 +2233,7 @@
                 "scene": {
                     "activated": "Activated scene {name}.",
                     "caption": "Scenes",
-                    "description": "Manage scenes",
+                    "description": "Capture device states and easily recall them later",
                     "editor": {
                         "default_name": "New Scene",
                         "devices": {
@@ -2243,7 +2277,7 @@
                 },
                 "script": {
                     "caption": "Scripts",
-                    "description": "Manage scripts",
+                    "description": "Execute a sequence of actions",
                     "editor": {
                         "alias": "Name",
                         "default_name": "New Script",
@@ -2354,7 +2388,7 @@
                     "confirm_remove": "Are you sure you want to remove tag {tag}?",
                     "confirm_remove_title": "Remove tag?",
                     "create_automation": "Create automation with tag",
-                    "description": "Manage tags",
+                    "description": "Trigger automations when a NFC tag, QR code, etc. is scanned",
                     "detail": {
                         "companion_apps": "companion apps",
                         "create": "Create",
@@ -2393,6 +2427,7 @@
                     "editor": {
                         "activate_user": "Activate user",
                         "active": "Active",
+                        "active_tooltip": "Controls if user can login",
                         "admin": "Administrator",
                         "caption": "View user",
                         "change_password": "Change password",
@@ -3411,10 +3446,13 @@
                 "change_password": {
                     "confirm_new_password": "Confirm New Password",
                     "current_password": "Current Password",
+                    "error_new_is_old": "New password must be different than current password",
+                    "error_new_mismatch": "Entered new password values do not match",
                     "error_required": "Required",
                     "header": "Change Password",
                     "new_password": "New Password",
-                    "submit": "Submit"
+                    "submit": "Submit",
+                    "success": "Password changed successfully"
                 },
                 "current_user": "You are currently logged in as {fullName}.",
                 "customize_sidebar": {
diff --git a/translations/frontend/fr.json b/translations/frontend/fr.json
index 4e224cd049..c0a98fa0b9 100644
--- a/translations/frontend/fr.json
+++ b/translations/frontend/fr.json
@@ -1680,7 +1680,7 @@
                     "caption": "Appareils",
                     "confirm_delete": "Voulez-vous vraiment supprimer cet appareil ?",
                     "confirm_rename_entity_ids": "Voulez-vous aussi renommer les ID de vos entités?",
-                    "confirm_rename_entity_ids_warning": "Cela ne changera aucune configuration (comme les automatismes, les scripts, les scènes, Lovelace) qui utilisent actuellement ces entités, vous devrez les mettre à jour vous-même.",
+                    "confirm_rename_entity_ids_warning": "Cela ne changera aucune configuration (comme les automatisations, les scripts, les scènes, Lovelace) qui utilisent actuellement ces entités, vous devrez les mettre à jour vous-même.",
                     "data_table": {
                         "area": "Zone",
                         "battery": "Batterie",
@@ -1744,6 +1744,7 @@
                         },
                         "header": "Entités",
                         "headers": {
+                            "area": "Pièce",
                             "entity_id": "ID de l'entité",
                             "integration": "Intégration",
                             "name": "Nom",
@@ -2471,6 +2472,16 @@
                         "value": "Valeur"
                     },
                     "description": "Gestion de réseau domotique Zigbee",
+                    "device_pairing_card": {
+                        "CONFIGURED": "Configuration terminée",
+                        "CONFIGURED_status_text": "Initialisation",
+                        "INITIALIZED": "Initialisation terminée",
+                        "INITIALIZED_status_text": "L'appareil est prêt à être utilisé",
+                        "INTERVIEW_COMPLETE": "Processus d'interrogation terminé",
+                        "INTERVIEW_COMPLETE_status_text": "Configurer",
+                        "PAIRED": "Appareil trouvé",
+                        "PAIRED_status_text": "Démarrage du processus d'interrogation"
+                    },
                     "devices": {
                         "header": "Zigbee Home Automation - Appareil"
                     },
@@ -3358,7 +3369,7 @@
                     "button_detect": "Détecter",
                     "finish": "Suivant",
                     "intro": "Bonjour {name}, bienvenue dans Home Assistant. Comment voudriez-vous nommer votre maison?",
-                    "intro_location": "Nous aimerions savoir où vous habitez. Ces informations vous aideront à afficher des informations et à configurer des automatismes basés sur le soleil. Ces données ne sont jamais partagées en dehors de votre réseau.",
+                    "intro_location": "Nous aimerions savoir où vous habitez. Ces informations vous aideront à afficher des informations et à configurer des automatisations basés sur le soleil. Ces données ne sont jamais partagées en dehors de votre réseau.",
                     "intro_location_detect": "Nous pouvons vous aider à renseigner ces informations en adressant une demande unique à un service externe.",
                     "location_name": "Nom de votre installation Home Assistant",
                     "location_name_default": "Maison"
diff --git a/translations/frontend/lb.json b/translations/frontend/lb.json
index ad5794565c..aeaef6b9b7 100644
--- a/translations/frontend/lb.json
+++ b/translations/frontend/lb.json
@@ -2936,6 +2936,7 @@
                             "name": "Luucht"
                         },
                         "logbook": {
+                            "description": "Logbuch weist eng Lëscht vun Evenementer vun Entitéiten un.",
                             "name": "Logbuch"
                         },
                         "map": {
@@ -3016,6 +3017,9 @@
                         "edit": "Änneren",
                         "none": "Keen"
                     },
+                    "edit_badges": {
+                        "panel_mode": "Dës Badge gi net ugewise well dës Usiicht am \"Panel Modus\" ass."
+                    },
                     "edit_card": {
                         "add": "Kaart dobäisetzen",
                         "clear": "Läschen",
@@ -3122,7 +3126,8 @@
                     "sub-element-editor": {
                         "types": {
                             "footer": "Fousszeilen Editeur",
-                            "header": "Entête Editeur"
+                            "header": "Entête Editeur",
+                            "row": "Editeur vun der Réih vun Entitéiten"
                         }
                     },
                     "suggest_card": {
diff --git a/translations/frontend/nb.json b/translations/frontend/nb.json
index b159b3d98c..4ed6a06dd5 100644
--- a/translations/frontend/nb.json
+++ b/translations/frontend/nb.json
@@ -299,7 +299,7 @@
             "on": "På"
         },
         "timer": {
-            "active": "aktiv",
+            "active": "Aktiv",
             "idle": "Inaktiv",
             "paused": "pauset"
         },
@@ -3435,7 +3435,7 @@
                     "description": "Dette vil skjule sidepanelet som standard, tilsvarende opplevelsen på en mobil.",
                     "header": "Skjul alltid sidepanelet"
                 },
-                "is_owner": "Du er en eier.",
+                "is_owner": "Du er en eier",
                 "language": {
                     "dropdown_label": "Språk",
                     "header": "Språk",
diff --git a/translations/frontend/zh-Hans.json b/translations/frontend/zh-Hans.json
index 917bcb3805..fc3cabb14e 100644
--- a/translations/frontend/zh-Hans.json
+++ b/translations/frontend/zh-Hans.json
@@ -1756,7 +1756,7 @@
                             "button": "删除所选实体",
                             "confirm_partly_text": "在所选的 {selected} 个实体中有 {removable} 个可被删除。实体可被删除的条件是集成不再提供它们。有时，即使集成已删除，也必须先重新启动 Home Assistant 才能删除它们的实体。您确定要删除实体吗？",
                             "confirm_partly_title": "所选实体中只有 {number} 个可被删除。",
-                            "confirm_text": "如果它们包含这些实体，则应将它们从 Lovelace 配置和自动化中删除。",
+                            "confirm_text": "如果 Lovelace 配置和自动化中包含这些实体，请将它们一并删除。",
                             "confirm_title": "您要删除这 {number} 个实体吗？"
                         },
                         "search": "搜索实体",
diff --git a/translations/frontend/zh-Hant.json b/translations/frontend/zh-Hant.json
index 00af6fe5cd..4ec66db6d6 100644
--- a/translations/frontend/zh-Hant.json
+++ b/translations/frontend/zh-Hant.json
@@ -597,21 +597,21 @@
                     "set": "設定",
                     "turned_off": "關閉",
                     "turned_on": "開啟",
-                    "was_at_home": "狀態在家",
-                    "was_at_state": "狀態{state}",
-                    "was_away": "狀態離家",
-                    "was_closed": "狀態關閉",
-                    "was_connected": "狀態連線",
-                    "was_disconnected": "狀態斷線",
-                    "was_locked": "狀態上鎖",
-                    "was_low": "狀態過低",
-                    "was_normal": "狀態正常",
-                    "was_opened": "狀態開啟",
-                    "was_plugged_in": "狀態插上",
-                    "was_safe": "狀態安全",
-                    "was_unlocked": "狀態解鎖",
-                    "was_unplugged": "狀態拔下",
-                    "was_unsafe": "狀態不安全"
+                    "was_at_home": "狀態為在家",
+                    "was_at_state": "狀態為{state}",
+                    "was_away": "狀態為離家",
+                    "was_closed": "狀態為關閉",
+                    "was_connected": "狀態為連線",
+                    "was_disconnected": "狀態為斷線",
+                    "was_locked": "狀態為上鎖",
+                    "was_low": "狀態為過低",
+                    "was_normal": "狀態為正常",
+                    "was_opened": "狀態為開啟",
+                    "was_plugged_in": "狀態為插上",
+                    "was_safe": "狀態為安全",
+                    "was_unlocked": "狀態為解鎖",
+                    "was_unplugged": "狀態為拔下",
+                    "was_unsafe": "狀態為不安全"
                 }
             },
             "media-browser": {

From 7b560c727fa2e5cdd79f8d7cdfccb99b3420c211 Mon Sep 17 00:00:00 2001
From: Philip Allgaier <mail@spacegaier.de>
Date: Thu, 3 Dec 2020 14:05:16 +0100
Subject: [PATCH 2/7] Adjust text since entities can now be in areas too
 (#7880)

---
 src/translations/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/translations/en.json b/src/translations/en.json
index a0fc0c3da8..bc3a74b86a 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -800,7 +800,7 @@
         },
         "areas": {
           "caption": "Areas",
-          "description": "Group devices into areas",
+          "description": "Group devices and entities into areas",
           "data_table": {
             "area": "Area",
             "devices": "Devices"
@@ -2023,7 +2023,7 @@
         },
         "users": {
           "caption": "Users",
-          "description": "Manage users",
+          "description": "Manage the Home Assistant user accounts",
           "users_privileges_note": "The user group feature is a work in progress. The user will be unable to administer the instance via the UI. We're still auditing all management API endpoints to ensure that they correctly limit access to administrators.",
           "picker": {
             "headers": {

From 3e4955becd3f23e58d8576f95fbca061ded7782c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 3 Dec 2020 14:18:17 +0100
Subject: [PATCH 3/7] UI tweaks for BP (#7883)

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
---
 src/components/ha-blueprint-picker.ts         |  1 +
 src/components/ha-settings-row.ts             | 16 +++--
 .../automation/blueprint-automation-editor.ts | 61 +++++++++----------
 .../config/blueprint/ha-blueprint-overview.ts |  6 +-
 src/translations/en.json                      |  1 -
 5 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/components/ha-blueprint-picker.ts b/src/components/ha-blueprint-picker.ts
index f9c19a0bce..e75db74552 100644
--- a/src/components/ha-blueprint-picker.ts
+++ b/src/components/ha-blueprint-picker.ts
@@ -52,6 +52,7 @@ class HaBluePrintPicker extends LitElement {
         .label=${this.label ||
         this.hass.localize("ui.components.blueprint-picker.label")}
         .disabled=${this.disabled}
+        horizontal-align="left"
       >
         <paper-listbox
           slot="dropdown-content"
diff --git a/src/components/ha-settings-row.ts b/src/components/ha-settings-row.ts
index 4fdae88f3e..efa3b95cf4 100644
--- a/src/components/ha-settings-row.ts
+++ b/src/components/ha-settings-row.ts
@@ -18,11 +18,6 @@ export class HaSettingsRow extends LitElement {
 
   protected render(): SVGTemplateResult {
     return html`
-      <style>
-        paper-item-body {
-          padding-right: 16px;
-        }
-      </style>
       <paper-item-body
         ?two-line=${!this.threeLine}
         ?three-line=${this.threeLine}
@@ -43,6 +38,14 @@ export class HaSettingsRow extends LitElement {
         align-self: auto;
         align-items: center;
       }
+      paper-item-body {
+        padding: 8px 16px 8px 0;
+      }
+      paper-item-body[two-line] {
+        min-height: calc(
+          var(--paper-item-body-two-line-min-height, 72px) - 16px
+        );
+      }
       :host([narrow]) {
         align-items: normal;
         flex-direction: column;
@@ -52,6 +55,9 @@ export class HaSettingsRow extends LitElement {
       ::slotted(ha-switch) {
         padding: 16px 0;
       }
+      div[secondary] {
+        white-space: normal;
+      }
     `;
   }
 }
diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts
index 88702161b4..a53a2ab18b 100644
--- a/src/panels/config/automation/blueprint-automation-editor.ts
+++ b/src/panels/config/automation/blueprint-automation-editor.ts
@@ -157,42 +157,37 @@ export class HaBlueprintAutomationEditor extends LitElement {
                   There is an error in this Blueprint: ${blueprint.error}
                 </p>`
               : html`${blueprint?.metadata.description
-                  ? html`<p>${blueprint.metadata.description}</p>`
+                  ? html`<p class="card-content">
+                      ${blueprint.metadata.description}
+                    </p>`
                   : ""}
                 ${blueprint?.metadata?.input &&
                 Object.keys(blueprint.metadata.input).length
-                  ? html`<h3>
-                        ${this.hass.localize(
-                          "ui.panel.config.automation.editor.blueprint.inputs"
-                        )}
-                      </h3>
-                      ${Object.entries(blueprint.metadata.input).map(
-                        ([key, value]) =>
-                          html`<ha-settings-row .narrow=${this.narrow}>
-                            <span slot="heading">${value?.name || key}</span>
-                            <span slot="description"
-                              >${value?.description}</span
-                            >
-                            ${value?.selector
-                              ? html`<ha-selector
-                                  .hass=${this.hass}
-                                  .selector=${value.selector}
-                                  .key=${key}
-                                  .value=${(this.config.use_blueprint.input &&
-                                    this.config.use_blueprint.input[key]) ||
-                                  value?.default}
-                                  @value-changed=${this._inputChanged}
-                                ></ha-selector>`
-                              : html`<paper-input
-                                  .key=${key}
-                                  required
-                                  .value=${this.config.use_blueprint.input &&
-                                  this.config.use_blueprint.input[key]}
-                                  @value-changed=${this._inputChanged}
-                                  no-label-float
-                                ></paper-input>`}
-                          </ha-settings-row>`
-                      )}`
+                  ? Object.entries(blueprint.metadata.input).map(
+                      ([key, value]) =>
+                        html`<ha-settings-row .narrow=${this.narrow}>
+                          <span slot="heading">${value?.name || key}</span>
+                          <span slot="description">${value?.description}</span>
+                          ${value?.selector
+                            ? html`<ha-selector
+                                .hass=${this.hass}
+                                .selector=${value.selector}
+                                .key=${key}
+                                .value=${(this.config.use_blueprint.input &&
+                                  this.config.use_blueprint.input[key]) ||
+                                value?.default}
+                                @value-changed=${this._inputChanged}
+                              ></ha-selector>`
+                            : html`<paper-input
+                                .key=${key}
+                                required
+                                .value=${this.config.use_blueprint.input &&
+                                this.config.use_blueprint.input[key]}
+                                @value-changed=${this._inputChanged}
+                                no-label-float
+                              ></paper-input>`}
+                        </ha-settings-row>`
+                    )
                   : html`<p class="padding">
                       ${this.hass.localize(
                         "ui.panel.config.automation.editor.blueprint.no_inputs"
diff --git a/src/panels/config/blueprint/ha-blueprint-overview.ts b/src/panels/config/blueprint/ha-blueprint-overview.ts
index ce732ab17d..bfdd513c94 100644
--- a/src/panels/config/blueprint/ha-blueprint-overview.ts
+++ b/src/panels/config/blueprint/ha-blueprint-overview.ts
@@ -112,7 +112,6 @@ class HaBlueprintOverview extends LitElement {
       create: {
         title: "",
         type: narrow ? "icon-button" : undefined,
-        width: narrow ? undefined : "180px",
         template: (_, blueprint: any) =>
           blueprint.error
             ? ""
@@ -126,8 +125,9 @@ class HaBlueprintOverview extends LitElement {
                   "ui.panel.config.blueprint.overview.use_blueprint"
                 )}
                 @click=${(ev) => this._createNew(ev)}
-                ><ha-svg-icon .path=${mdiRobot}></ha-svg-icon
-              ></mwc-icon-button>`
+              >
+                <ha-svg-icon .path=${mdiRobot}></ha-svg-icon>
+              </mwc-icon-button>`
             : html`<mwc-button
                 .blueprint=${blueprint}
                 @click=${(ev) => this._createNew(ev)}
diff --git a/src/translations/en.json b/src/translations/en.json
index bc3a74b86a..4eb0e3b92a 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1161,7 +1161,6 @@
               "blueprint_to_use": "Blueprint to use",
               "no_blueprints": "You don't have any blueprints",
               "manage_blueprints": "Manage Blueprints",
-              "inputs": "Inputs",
               "no_inputs": "This blueprint doesn't have any inputs."
             },
             "modes": {

From 565724d201ee086818bf120a87185db3524022bd Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 3 Dec 2020 16:52:09 +0100
Subject: [PATCH 4/7] Fix translation race condition? (#7885)

---
 src/state/translations-mixin.ts | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/state/translations-mixin.ts b/src/state/translations-mixin.ts
index 72f07f2bdc..fef6eb4792 100644
--- a/src/state/translations-mixin.ts
+++ b/src/state/translations-mixin.ts
@@ -210,7 +210,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
       this.__coreProgress = language;
       try {
         const result = await getTranslation(null, language);
-        this._updateResources(result.language, result.data);
+        await this._updateResources(result.language, result.data);
       } finally {
         this.__coreProgress = undefined;
       }
@@ -226,18 +226,26 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
       // before this.hass is even created. In this case our base state comes
       // from this._pendingHass instead. Otherwise the first set of strings is
       // overwritten when we call _updateHass the second time!
-      const baseHass = this.hass ?? this._pendingHass;
+
+      if (language !== (this.hass ?? this._pendingHass).language) {
+        // the language was changed, abort
+        return;
+      }
+
       const resources = {
         [language]: {
-          ...baseHass?.resources?.[language],
+          ...(this.hass ?? this._pendingHass)?.resources?.[language],
           ...data,
         },
       };
-      const changes: Partial<HomeAssistant> = { resources };
-      if (this.hass && language === this.hass.language) {
-        changes.localize = await computeLocalize(this, language, resources);
+      const changes: Partial<HomeAssistant> = {
+        resources,
+        localize: await computeLocalize(this, language, resources),
+      };
+
+      if (language === (this.hass ?? this._pendingHass).language) {
+        this._updateHass(changes);
       }
-      this._updateHass(changes);
     }
 
     private _refetchCachedHassTranslations(

From 2cca25f4d0b43d61560fc21bdb924ec5ade7a306 Mon Sep 17 00:00:00 2001
From: Philip Allgaier <mail@spacegaier.de>
Date: Thu, 3 Dec 2020 16:52:44 +0100
Subject: [PATCH 5/7] Navigate back to area overview after area deletion
 (#7890)

---
 src/panels/config/areas/dialog-area-registry-detail.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts
index cd07cbaf6a..7e1590d010 100644
--- a/src/panels/config/areas/dialog-area-registry-detail.ts
+++ b/src/panels/config/areas/dialog-area-registry-detail.ts
@@ -17,6 +17,7 @@ import { PolymerChangedEvent } from "../../../polymer-types";
 import { haStyleDialog } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { AreaRegistryDetailDialogParams } from "./show-dialog-area-registry-detail";
+import { navigate } from "../../../common/navigate";
 
 class DialogAreaDetail extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -154,6 +155,8 @@ class DialogAreaDetail extends LitElement {
     } finally {
       this._submitting = false;
     }
+
+    navigate(this, "/config/areas/dashboard");
   }
 
   static get styles(): CSSResult[] {

From 1e90c6387ccfba97e4aecd49fcc9fa6d0cdde272 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 3 Dec 2020 16:59:43 +0100
Subject: [PATCH 6/7] More BP tweaks (#7884)

---
 src/components/ha-blueprint-picker.ts               |  3 +++
 .../automation/blueprint-automation-editor.ts       | 13 -------------
 .../lovelace/components/hui-theme-select-editor.ts  |  3 +++
 src/translations/en.json                            |  1 -
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/ha-blueprint-picker.ts b/src/components/ha-blueprint-picker.ts
index e75db74552..716d85ba17 100644
--- a/src/components/ha-blueprint-picker.ts
+++ b/src/components/ha-blueprint-picker.ts
@@ -111,6 +111,9 @@ class HaBluePrintPicker extends LitElement {
       paper-listbox {
         min-width: 200px;
       }
+      paper-item {
+        cursor: pointer;
+      }
     `;
   }
 }
diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts
index a53a2ab18b..b7f6d46f05 100644
--- a/src/panels/config/automation/blueprint-automation-editor.ts
+++ b/src/panels/config/automation/blueprint-automation-editor.ts
@@ -24,7 +24,6 @@ import "./action/ha-automation-action";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { haStyle } from "../../../resources/styles";
 import { HassEntity } from "home-assistant-js-websocket";
-import { navigate } from "../../../common/navigate";
 import {
   BlueprintOrError,
   Blueprints,
@@ -144,11 +143,6 @@ export class HaBlueprintAutomationEditor extends LitElement {
                     "ui.panel.config.automation.editor.blueprint.no_blueprints"
                   )
               : html`<ha-circular-progress active></ha-circular-progress>`}
-            <mwc-button @click=${this._navigateBlueprints}>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.blueprint.manage_blueprints"
-              )}
-            </mwc-button>
           </div>
 
           ${this.config.use_blueprint.path
@@ -263,10 +257,6 @@ export class HaBlueprintAutomationEditor extends LitElement {
     });
   }
 
-  private _navigateBlueprints() {
-    navigate(this, "/config/blueprint");
-  }
-
   static get styles(): CSSResult[] {
     return [
       haStyle,
@@ -276,9 +266,6 @@ export class HaBlueprintAutomationEditor extends LitElement {
         }
         .blueprint-picker-container {
           padding: 16px;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
         }
         h3 {
           margin: 16px;
diff --git a/src/panels/lovelace/components/hui-theme-select-editor.ts b/src/panels/lovelace/components/hui-theme-select-editor.ts
index 12cbc4fc22..021ae9be6d 100644
--- a/src/panels/lovelace/components/hui-theme-select-editor.ts
+++ b/src/panels/lovelace/components/hui-theme-select-editor.ts
@@ -59,6 +59,9 @@ export class HuiThemeSelectEditor extends LitElement {
       paper-dropdown-menu {
         width: 100%;
       }
+      paper-item {
+        cursor: pointer;
+      }
     `;
   }
 
diff --git a/src/translations/en.json b/src/translations/en.json
index 4eb0e3b92a..124eb186ab 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1160,7 +1160,6 @@
               "header": "Blueprint",
               "blueprint_to_use": "Blueprint to use",
               "no_blueprints": "You don't have any blueprints",
-              "manage_blueprints": "Manage Blueprints",
               "no_inputs": "This blueprint doesn't have any inputs."
             },
             "modes": {

From 3a5d854e6d7391d3c9fea5168953599ea4d340d5 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 3 Dec 2020 17:00:56 +0100
Subject: [PATCH 7/7] Bumped version to 20201203.0

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

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