From b13383c81bb57304fe8058b38a06e2266ee622f6 Mon Sep 17 00:00:00 2001
From: springstan <floorb@gmx.de>
Date: Thu, 24 Oct 2019 15:19:33 +0200
Subject: [PATCH 1/7] Translated customization page  - added translation
 key-value pairs to en.json  - translated form-customize, customize-icon and
 its key-value

---
 .../config/customize/ha-form-customize.js     | 22 +++++++++----------
 .../customize/types/ha-customize-icon.js      |  2 +-
 .../customize/types/ha-customize-key-value.js |  4 ++--
 src/translations/en.json                      | 16 +++++++++++++-
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/panels/config/customize/ha-form-customize.js b/src/panels/config/customize/ha-form-customize.js
index 7b1bca7a4999..800784d3f242 100644
--- a/src/panels/config/customize/ha-form-customize.js
+++ b/src/panels/config/customize/ha-form-customize.js
@@ -26,19 +26,18 @@ class HaFormCustomize extends PolymerElement {
         if="[[computeShowWarning(localConfig, globalConfig)]]"
       >
         <div class="warning">
-          It seems that your configuration.yaml doesn't properly
+          [[localize('ui.panel.config.customize.warning.include_sentence')]]
           <a
             href="https://www.home-assistant.io/docs/configuration/customizing-devices/#customization-using-the-ui"
             target="_blank"
-            >include customize.yaml</a
+            >[[localize('ui.panel.config.customize.warning.include_link')]]</a
           >.<br />
-          Changes made here are written in it, but will not be applied after a
-          configuration reload unless the include is in place.
+          [[localize('ui.panel.config.customize.warning.not_applied')]]
         </div>
       </template>
       <template is="dom-if" if="[[hasLocalAttributes]]">
         <h4 class="attributes-text">
-          The following attributes are already set in customize.yaml<br />
+          [[localize('ui.panel.config.customize.attributes_customize')]]<br />
         </h4>
         <ha-form-customize-attributes
           attributes="{{localAttributes}}"
@@ -46,9 +45,8 @@ class HaFormCustomize extends PolymerElement {
       </template>
       <template is="dom-if" if="[[hasGlobalAttributes]]">
         <h4 class="attributes-text">
-          The following attributes are customized from outside of
-          customize.yaml<br />
-          Possibly via a domain, a glob or a different include.
+          [[localize('ui.panel.config.customize.attributes_outside')]]<br />
+          [[localize('ui.panel.config.customize.different_include')]]
         </h4>
         <ha-form-customize-attributes
           attributes="{{globalAttributes}}"
@@ -56,8 +54,8 @@ class HaFormCustomize extends PolymerElement {
       </template>
       <template is="dom-if" if="[[hasExistingAttributes]]">
         <h4 class="attributes-text">
-          The following attributes of the entity are set programatically.<br />
-          You can override them if you like.
+          [[localize('ui.panel.config.customize.attributes_set')]]<br />
+          [[localize('ui.panel.config.customize.attributes_override')]]
         </h4>
         <ha-form-customize-attributes
           attributes="{{existingAttributes}}"
@@ -65,7 +63,7 @@ class HaFormCustomize extends PolymerElement {
       </template>
       <template is="dom-if" if="[[hasNewAttributes]]">
         <h4 class="attributes-text">
-          The following attributes weren't set. Set them if you like.
+          [[localize('ui.panel.config.customize.attributes_not_set')]]
         </h4>
         <ha-form-customize-attributes
           attributes="{{newAttributes}}"
@@ -73,7 +71,7 @@ class HaFormCustomize extends PolymerElement {
       </template>
       <div class="form-group">
         <paper-dropdown-menu
-          label="Pick an attribute to override"
+          label="[[localize('ui.panel.config.customize.pick_attribute')]]"
           class="flex"
           dynamic-align=""
         >
diff --git a/src/panels/config/customize/types/ha-customize-icon.js b/src/panels/config/customize/types/ha-customize-icon.js
index 563d9e3f99e3..c9a5eaa232d0 100644
--- a/src/panels/config/customize/types/ha-customize-icon.js
+++ b/src/panels/config/customize/types/ha-customize-icon.js
@@ -20,7 +20,7 @@ class HaCustomizeIcon extends PolymerElement {
       <iron-icon class="icon-image" icon="[[item.value]]"></iron-icon>
       <paper-input
         disabled="[[item.secondary]]"
-        label="icon"
+        label="[[localize('ui.panel.lovelace.editor.card.generic.icon')]]"
         value="{{item.value}}"
       >
       </paper-input>
diff --git a/src/panels/config/customize/types/ha-customize-key-value.js b/src/panels/config/customize/types/ha-customize-key-value.js
index e30b9b0e6a70..f439b9145bf8 100644
--- a/src/panels/config/customize/types/ha-customize-key-value.js
+++ b/src/panels/config/customize/types/ha-customize-key-value.js
@@ -19,13 +19,13 @@ class HaCustomizeKeyValue extends PolymerElement {
       <paper-input
         disabled="[[item.secondary]]"
         class="key"
-        label="Attribute name"
+        label="[[localize('ui.panel.config.customize.attribute_name')]]"
         value="{{item.attribute}}"
       >
       </paper-input>
       <paper-input
         disabled="[[item.secondary]]"
-        label="Attribute value"
+        label="[[localize('ui.panel.config.customize.attribute_value')]]"
         value="{{item.value}}"
       >
       </paper-input>
diff --git a/src/translations/en.json b/src/translations/en.json
index 4c0b4be9e280..bfd5e3d740c6 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -726,7 +726,21 @@
           "picker": {
             "header": "Customization",
             "introduction": "Tweak per-entity attributes. Added/edited customizations will take effect immediately. Removed customizations will take effect when the entity is updated."
-          }
+          },
+          "warning": {
+              "include_sentence": "It seems that your configuration.yaml doesn't properly",
+              "include_link": "include customize.yaml",
+              "not_applied": "Changes made here are written in it, but will not be applied after a configuration reload unless the include is in place."
+          },
+          "attributes_customize": "The following attributes are already set in customize.yaml",
+          "attributes_outside": "The following attributes are customized from outside of customize.yaml",
+          "different_include": "Possibly via a domain, a glob or a different include.",
+          "attributes_set": "The following attributes of the entity are set programmatically.",
+          "attributes_override": "You can override them if you like.",
+          "attributes_not_set": "The following attributes weren't set. Set them if you like.",
+          "pick_attribute": "Pick an attribute to override",
+          "attribute_name": "Attribute name",
+          "attribute_value": "Attribute value"
         },
         "automation": {
           "caption": "Automation",

From d527ee48c65c80aa6a0dd2a1c6cbbd3c0474710f Mon Sep 17 00:00:00 2001
From: springstan <floorb@gmx.de>
Date: Thu, 24 Oct 2019 16:17:15 +0200
Subject: [PATCH 2/7] Translated mutliple pages:  - devices  - entity-registry 
 - config-entry  - dashboard -> hint to advanced mode toggle

---
 .../config/dashboard/ha-config-dashboard.js   |  2 +-
 .../config/devices/ha-config-device-page.ts   | 24 ++++++++++++++-----
 .../config/devices/ha-devices-data-table.ts   | 12 +++++-----
 .../dialog-entity-registry-detail.ts          |  4 +++-
 .../config-entry/ha-config-entry-page.ts      |  6 ++++-
 src/translations/en.json                      | 22 +++++++++++++++--
 6 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/panels/config/dashboard/ha-config-dashboard.js b/src/panels/config/dashboard/ha-config-dashboard.js
index e47377fa841f..4dc1ed214ac6 100644
--- a/src/panels/config/dashboard/ha-config-dashboard.js
+++ b/src/panels/config/dashboard/ha-config-dashboard.js
@@ -124,7 +124,7 @@ class HaConfigDashboard extends NavigateMixin(LocalizeMixin(PolymerElement)) {
 
           <template is='dom-if' if='[[!showAdvanced]]'>
             <div class='promo-advanced'>
-              Missing config options? Enable advanced mode on <a href="/profile">your profile page.</a>
+            [[localize('ui.panel.profile.advanced_mode.hint_enable')]] <a href="/profile">[[localize('ui.panel.profile.advanced_mode.link_profile_page')]]</a>.
             </div>
           </template>
         </ha-config-section>
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index e238d511b527..70ba49d70336 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -122,7 +122,11 @@ export class HaConfigDevicePage extends LitElement {
 
     if (!device) {
       return html`
-        <hass-error-screen error="Device not found."></hass-error-screen>
+        <hass-error-screen
+          error="${this.hass.localize(
+            "ui.panel.config.devices.device_not_found"
+          )}"
+        ></hass-error-screen>
       `;
     }
 
@@ -136,9 +140,11 @@ export class HaConfigDevicePage extends LitElement {
           @click=${this._showSettings}
         ></paper-icon-button>
         <ha-config-section .isWide=${!this.narrow}>
-          <span slot="header">Device info</span>
+          <span slot="header"
+            >${this.hass.localize("ui.panel.config.devices.info")}</span
+          >
           <span slot="introduction">
-            Here are all the details of your device.
+            ${this.hass.localize("ui.panel.config.devices.details")}
           </span>
           <ha-device-card
             .hass=${this.hass}
@@ -149,7 +155,9 @@ export class HaConfigDevicePage extends LitElement {
 
           ${entities.length
             ? html`
-                <div class="header">Entities</div>
+                <div class="header">
+                  ${this.hass.localize("ui.panel.config.devices.entities")}
+                </div>
                 <ha-device-entities-card
                   .hass=${this.hass}
                   .entities=${entities}
@@ -161,7 +169,9 @@ export class HaConfigDevicePage extends LitElement {
           this._conditions.length ||
           this._actions.length
             ? html`
-                <div class="header">Automations</div>
+                <div class="header">
+                  ${this.hass.localize("ui.panel.config.devices.automations")}
+                </div>
                 ${this._triggers.length
                   ? html`
                       <ha-device-triggers-card
@@ -222,7 +232,9 @@ export class HaConfigDevicePage extends LitElement {
         const renameEntityid =
           this.showAdvanced &&
           confirm(
-            "Do you also want to rename the entity id's of your entities?"
+            this.hass.localize(
+              "ui.panel.config.devices.confirm_rename_entity_ids"
+            )
           );
 
         const updateProms = entities.map((entity) => {
diff --git a/src/panels/config/devices/ha-devices-data-table.ts b/src/panels/config/devices/ha-devices-data-table.ts
index 32ba9d881c60..64d7f13e7581 100644
--- a/src/panels/config/devices/ha-devices-data-table.ts
+++ b/src/panels/config/devices/ha-devices-data-table.ts
@@ -159,33 +159,33 @@ export class HaDevicesDataTable extends LitElement {
           }
         : {
             name: {
-              title: "Device",
+              title: this.hass.localize('ui.panel.config.devices.data_table.device'),
               sortable: true,
               filterable: true,
               direction: "asc",
             },
             manufacturer: {
-              title: "Manufacturer",
+              title: this.hass.localize('ui.panel.config.devices.data_table.manufacturer'),
               sortable: true,
               filterable: true,
             },
             model: {
-              title: "Model",
+              title: this.hass.localize('ui.panel.config.devices.data_table.model'),
               sortable: true,
               filterable: true,
             },
             area: {
-              title: "Area",
+              title: this.hass.localize('ui.panel.config.devices.data_table.area'),
               sortable: true,
               filterable: true,
             },
             integration: {
-              title: "Integration",
+              title: this.hass.localize('ui.panel.config.devices.data_table.integration'),
               sortable: true,
               filterable: true,
             },
             battery_entity: {
-              title: "Battery",
+              title: this.hass.localize('ui.panel.config.devices.data_table.battery'),
               sortable: true,
               type: "numeric",
               template: (batteryEntity: string) => {
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 29d8d9d78a82..06d6391f7645 100644
--- a/src/panels/config/entity_registry/dialog-entity-registry-detail.ts
+++ b/src/panels/config/entity_registry/dialog-entity-registry-detail.ts
@@ -130,7 +130,9 @@ class DialogEntityRegistryDetail extends LitElement {
                     ${this.hass.localize(
                       "ui.panel.config.entity_registry.editor.enabled_description"
                     )}
-                    <br />Note: this might not work yet with all integrations.
+                    <br />${this.hass.localize(
+                      "ui.panel.config.entity_registry.editor.note"
+                    )}
                   </div>
                 </div>
               </ha-switch>
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 6028d698aabc..91bf0007e228 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
@@ -63,7 +63,11 @@ class HaConfigEntryPage extends LitElement {
 
     if (!configEntry) {
       return html`
-        <hass-error-screen error="Integration not found."></hass-error-screen>
+        <hass-error-screen
+          error="${this.hass.localize(
+            "ui.panel.config.integrations.error_not_found"
+          )}"
+        ></hass-error-screen>
       `;
     }
 
diff --git a/src/translations/en.json b/src/translations/en.json
index bfd5e3d740c6..48deff359b18 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1145,6 +1145,20 @@
             "actions": {
               "caption": "When something is triggered..."
             }
+          },
+          "device_not_found": "Device not found.",
+          "info": "Device info",
+          "details": "Here are all the details of your device.",
+          "entities": "Entities",
+          "automations": "Automations",
+          "confirm_rename_entity_ids": "Do you also want to rename the entity id's of your entities?",
+          "data_table": {
+              "device": "Device",
+              "manufacturer": "Manufacturer",
+              "model": "Model",
+              "area": "Area",
+              "integration": "Integration",
+              "battery": "Battery"
           }
         },
         "entity_registry": {
@@ -1172,7 +1186,8 @@
             "delete": "DELETE",
             "confirm_delete": "Are you sure you want to delete this entry?",
             "confirm_delete2": "Deleting an entry will not remove the entity from Home Assistant. To do this, you will need to remove the integration '{platform}' from Home Assistant.",
-            "update": "UPDATE"
+            "update": "UPDATE",
+            "note": "Note: this might not work yet with all integrations."
           }
         },
         "person": {
@@ -1212,6 +1227,7 @@
           "home_assistant_website": "Home Assistant website",
           "configure": "Configure",
           "none": "Nothing configured yet",
+          "error_not_found": "Integration not found.",
           "config_entry": {
             "settings_button": "Edit settings for {integration}",
             "system_options_button": "System options for {integration}",
@@ -1657,7 +1673,9 @@
         },
         "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."
+          "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.",
+          "hint_enable": "Missing config options? Enable advanced mode on",
+          "link_profile_page": "your profile page"
         },
         "refresh_tokens": {
           "header": "Refresh Tokens",

From 2eb07b43bf508ac9cfb4baee2078199735f212f4 Mon Sep 17 00:00:00 2001
From: springstan <floorb@gmx.de>
Date: Thu, 24 Oct 2019 16:42:27 +0200
Subject: [PATCH 3/7] Translated custom panel confirm message

---
 src/panels/custom/ha-panel-custom.ts | 24 +++++++++++++++++-------
 src/translations/en.json             |  7 +++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/panels/custom/ha-panel-custom.ts b/src/panels/custom/ha-panel-custom.ts
index 1703e1e9faee..2afc2dd09ac5 100644
--- a/src/panels/custom/ha-panel-custom.ts
+++ b/src/panels/custom/ha-panel-custom.ts
@@ -78,13 +78,23 @@ export class HaPanelCustom extends UpdatingElement {
       !["localhost", "127.0.0.1", location.hostname].includes(tempA.hostname)
     ) {
       if (
-        !confirm(`Do you trust the external panel "${config.name}" at "${
-          tempA.href
-        }"?
-
-It will have access to all data in Home Assistant.
-
-(Check docs for the panel_custom component to hide this message)`)
+        !confirm(
+          this.hass.localize(
+            "ui.panel.custom.external_panel.question_trust",
+            "name",
+            config.name,
+            "link",
+            tempA.href
+          ) +
+            "\n\n" +
+            this.hass.localize(
+              "ui.panel.custom.external_panel.complete_access"
+            ) +
+            "\n\n" +
+            "(" +
+            this.hass.localize("ui.panel.custom.external_panel.hide_message") +
+            ")"
+        )
       ) {
         return;
       }
diff --git a/src/translations/en.json b/src/translations/en.json
index 48deff359b18..ac7a13be5b1e 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1984,6 +1984,13 @@
           "more_integrations": "More",
           "finish": "Finish"
         }
+      },
+      "custom": {
+          "external_panel": {
+              "question_trust": "Do you trust the external panel {name} at {link}?",
+              "complete_access": "It will have access to all data in Home Assistant.",
+              "hide_message": "Check docs for the panel_custom component to hide this message"
+          }
       }
     }
   }

From ba18c79c066b314bc4960a9b82cefd631ae4dad2 Mon Sep 17 00:00:00 2001
From: springstan <floorb@gmx.de>
Date: Thu, 24 Oct 2019 18:33:43 +0200
Subject: [PATCH 4/7] Added translation for no entries in logbook

---
 src/panels/logbook/ha-logbook.js | 2 +-
 src/translations/en.json         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/panels/logbook/ha-logbook.js b/src/panels/logbook/ha-logbook.js
index 5a173b13cc8a..cc56c5fcacc4 100644
--- a/src/panels/logbook/ha-logbook.js
+++ b/src/panels/logbook/ha-logbook.js
@@ -55,7 +55,7 @@ class HaLogbook extends EventsMixin(PolymerElement) {
       </style>
 
       <template is="dom-if" if="[[!entries.length]]">
-        No logbook entries found.
+        [[localize('ui.panel.logbook.no_entries')]]
       </template>
 
       <template is="dom-repeat" items="[[entries]]">
diff --git a/src/translations/en.json b/src/translations/en.json
index ac7a13be5b1e..ef03467b8450 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1393,7 +1393,8 @@
       },
       "logbook": {
         "showing_entries": "[%key:ui::panel::history::showing_entries%]",
-        "period": "Period"
+        "period": "Period",
+        "no_entries": "No logbook entries found."
       },
       "lovelace": {
         "cards": {

From bbf41f9149631072c2c9717edadf98b0eb2010b1 Mon Sep 17 00:00:00 2001
From: springstan <floorb@gmx.de>
Date: Fri, 25 Oct 2019 18:24:13 +0200
Subject: [PATCH 5/7] Updated translation keys, tested and removed ha-types
 file translations

---
 .../config/customize/ha-form-customize.js     |  3 +-
 .../customize/types/ha-customize-icon.js      |  2 +-
 .../customize/types/ha-customize-key-value.js |  4 +--
 .../config/dashboard/ha-config-dashboard.js   |  4 ++-
 .../config/devices/ha-devices-data-table.ts   | 24 +++++++++----
 .../config-entry/ha-config-entry-page.ts      |  2 +-
 src/panels/logbook/ha-logbook.js              |  7 ++--
 src/translations/en.json                      | 36 +++++++++----------
 8 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/panels/config/customize/ha-form-customize.js b/src/panels/config/customize/ha-form-customize.js
index 800784d3f242..c83cbfb152d2 100644
--- a/src/panels/config/customize/ha-form-customize.js
+++ b/src/panels/config/customize/ha-form-customize.js
@@ -3,13 +3,14 @@ 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 LocalizeMixin from "../../../mixins/localize-mixin";
 
 import hassAttributeUtil from "../../../util/hass-attributes-util";
 import "./ha-form-customize-attributes";
 
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 
-class HaFormCustomize extends PolymerElement {
+class HaFormCustomize extends LocalizeMixin(PolymerElement) {
   static get template() {
     return html`
       <style include="iron-flex ha-style ha-form-style">
diff --git a/src/panels/config/customize/types/ha-customize-icon.js b/src/panels/config/customize/types/ha-customize-icon.js
index c9a5eaa232d0..563d9e3f99e3 100644
--- a/src/panels/config/customize/types/ha-customize-icon.js
+++ b/src/panels/config/customize/types/ha-customize-icon.js
@@ -20,7 +20,7 @@ class HaCustomizeIcon extends PolymerElement {
       <iron-icon class="icon-image" icon="[[item.value]]"></iron-icon>
       <paper-input
         disabled="[[item.secondary]]"
-        label="[[localize('ui.panel.lovelace.editor.card.generic.icon')]]"
+        label="icon"
         value="{{item.value}}"
       >
       </paper-input>
diff --git a/src/panels/config/customize/types/ha-customize-key-value.js b/src/panels/config/customize/types/ha-customize-key-value.js
index f439b9145bf8..e30b9b0e6a70 100644
--- a/src/panels/config/customize/types/ha-customize-key-value.js
+++ b/src/panels/config/customize/types/ha-customize-key-value.js
@@ -19,13 +19,13 @@ class HaCustomizeKeyValue extends PolymerElement {
       <paper-input
         disabled="[[item.secondary]]"
         class="key"
-        label="[[localize('ui.panel.config.customize.attribute_name')]]"
+        label="Attribute name"
         value="{{item.attribute}}"
       >
       </paper-input>
       <paper-input
         disabled="[[item.secondary]]"
-        label="[[localize('ui.panel.config.customize.attribute_value')]]"
+        label="Attribute value"
         value="{{item.value}}"
       >
       </paper-input>
diff --git a/src/panels/config/dashboard/ha-config-dashboard.js b/src/panels/config/dashboard/ha-config-dashboard.js
index 4dc1ed214ac6..244340e29167 100644
--- a/src/panels/config/dashboard/ha-config-dashboard.js
+++ b/src/panels/config/dashboard/ha-config-dashboard.js
@@ -124,7 +124,9 @@ class HaConfigDashboard extends NavigateMixin(LocalizeMixin(PolymerElement)) {
 
           <template is='dom-if' if='[[!showAdvanced]]'>
             <div class='promo-advanced'>
-            [[localize('ui.panel.profile.advanced_mode.hint_enable')]] <a href="/profile">[[localize('ui.panel.profile.advanced_mode.link_profile_page')]]</a>.
+            [[localize('ui.panel.profile.advanced_mode.hint_enable')]] <a
+            href="/profile"
+            >[[localize('ui.panel.profile.advanced_mode.link_profile_page')]]</a>.
             </div>
           </template>
         </ha-config-section>
diff --git a/src/panels/config/devices/ha-devices-data-table.ts b/src/panels/config/devices/ha-devices-data-table.ts
index 64d7f13e7581..20969fc85904 100644
--- a/src/panels/config/devices/ha-devices-data-table.ts
+++ b/src/panels/config/devices/ha-devices-data-table.ts
@@ -159,33 +159,45 @@ export class HaDevicesDataTable extends LitElement {
           }
         : {
             name: {
-              title: this.hass.localize('ui.panel.config.devices.data_table.device'),
+              title: this.hass.localize(
+                "ui.panel.config.devices.data_table.device"
+              ),
               sortable: true,
               filterable: true,
               direction: "asc",
             },
             manufacturer: {
-              title: this.hass.localize('ui.panel.config.devices.data_table.manufacturer'),
+              title: this.hass.localize(
+                "ui.panel.config.devices.data_table.manufacturer"
+              ),
               sortable: true,
               filterable: true,
             },
             model: {
-              title: this.hass.localize('ui.panel.config.devices.data_table.model'),
+              title: this.hass.localize(
+                "ui.panel.config.devices.data_table.model"
+              ),
               sortable: true,
               filterable: true,
             },
             area: {
-              title: this.hass.localize('ui.panel.config.devices.data_table.area'),
+              title: this.hass.localize(
+                "ui.panel.config.devices.data_table.area"
+              ),
               sortable: true,
               filterable: true,
             },
             integration: {
-              title: this.hass.localize('ui.panel.config.devices.data_table.integration'),
+              title: this.hass.localize(
+                "ui.panel.config.devices.data_table.integration"
+              ),
               sortable: true,
               filterable: true,
             },
             battery_entity: {
-              title: this.hass.localize('ui.panel.config.devices.data_table.battery'),
+              title: this.hass.localize(
+                "ui.panel.config.devices.data_table.battery"
+              ),
               sortable: true,
               type: "numeric",
               template: (batteryEntity: string) => {
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 91bf0007e228..3dc2dbb3b6bc 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
@@ -65,7 +65,7 @@ class HaConfigEntryPage extends LitElement {
       return html`
         <hass-error-screen
           error="${this.hass.localize(
-            "ui.panel.config.integrations.error_not_found"
+            "ui.panel.config.integrations.integration_not_found"
           )}"
         ></hass-error-screen>
       `;
diff --git a/src/panels/logbook/ha-logbook.js b/src/panels/logbook/ha-logbook.js
index cc56c5fcacc4..e05423acb348 100644
--- a/src/panels/logbook/ha-logbook.js
+++ b/src/panels/logbook/ha-logbook.js
@@ -6,13 +6,14 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import formatTime from "../../common/datetime/format_time";
 import formatDate from "../../common/datetime/format_date";
 import { EventsMixin } from "../../mixins/events-mixin";
+import LocalizeMixin from "../../mixins/localize-mixin";
 import { domainIcon } from "../../common/entity/domain_icon";
 import { computeRTL } from "../../common/util/compute_rtl";
 
 /*
  * @appliesMixin EventsMixin
  */
-class HaLogbook extends EventsMixin(PolymerElement) {
+class HaLogbook extends LocalizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
       <style include="iron-flex"></style>
@@ -54,8 +55,8 @@ class HaLogbook extends EventsMixin(PolymerElement) {
         }
       </style>
 
-      <template is="dom-if" if="[[!entries.length]]">
-        [[localize('ui.panel.logbook.no_entries')]]
+      <template is="dom-if" if="true">
+        [[localize('ui.panel.logbook.entries_not_found')]]
       </template>
 
       <template is="dom-repeat" items="[[entries]]">
diff --git a/src/translations/en.json b/src/translations/en.json
index ef03467b8450..047da4a6134e 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -728,9 +728,9 @@
             "introduction": "Tweak per-entity attributes. Added/edited customizations will take effect immediately. Removed customizations will take effect when the entity is updated."
           },
           "warning": {
-              "include_sentence": "It seems that your configuration.yaml doesn't properly",
-              "include_link": "include customize.yaml",
-              "not_applied": "Changes made here are written in it, but will not be applied after a configuration reload unless the include is in place."
+            "include_sentence": "It seems that your configuration.yaml doesn't properly",
+            "include_link": "include customize.yaml",
+            "not_applied": "Changes made here are written in it, but will not be applied after a configuration reload unless the include is in place."
           },
           "attributes_customize": "The following attributes are already set in customize.yaml",
           "attributes_outside": "The following attributes are customized from outside of customize.yaml",
@@ -738,9 +738,7 @@
           "attributes_set": "The following attributes of the entity are set programmatically.",
           "attributes_override": "You can override them if you like.",
           "attributes_not_set": "The following attributes weren't set. Set them if you like.",
-          "pick_attribute": "Pick an attribute to override",
-          "attribute_name": "Attribute name",
-          "attribute_value": "Attribute value"
+          "pick_attribute": "Pick an attribute to override"
         },
         "automation": {
           "caption": "Automation",
@@ -1153,12 +1151,12 @@
           "automations": "Automations",
           "confirm_rename_entity_ids": "Do you also want to rename the entity id's of your entities?",
           "data_table": {
-              "device": "Device",
-              "manufacturer": "Manufacturer",
-              "model": "Model",
-              "area": "Area",
-              "integration": "Integration",
-              "battery": "Battery"
+            "device": "Device",
+            "manufacturer": "Manufacturer",
+            "model": "Model",
+            "area": "Area",
+            "integration": "Integration",
+            "battery": "Battery"
           }
         },
         "entity_registry": {
@@ -1227,7 +1225,7 @@
           "home_assistant_website": "Home Assistant website",
           "configure": "Configure",
           "none": "Nothing configured yet",
-          "error_not_found": "Integration not found.",
+          "integration_not_found": "Integration not found.",
           "config_entry": {
             "settings_button": "Edit settings for {integration}",
             "system_options_button": "System options for {integration}",
@@ -1394,7 +1392,7 @@
       "logbook": {
         "showing_entries": "[%key:ui::panel::history::showing_entries%]",
         "period": "Period",
-        "no_entries": "No logbook entries found."
+        "entries_not_found": "No logbook entries found."
       },
       "lovelace": {
         "cards": {
@@ -1987,11 +1985,11 @@
         }
       },
       "custom": {
-          "external_panel": {
-              "question_trust": "Do you trust the external panel {name} at {link}?",
-              "complete_access": "It will have access to all data in Home Assistant.",
-              "hide_message": "Check docs for the panel_custom component to hide this message"
-          }
+        "external_panel": {
+          "question_trust": "Do you trust the external panel {name} at {link}?",
+          "complete_access": "It will have access to all data in Home Assistant.",
+          "hide_message": "Check docs for the panel_custom component to hide this message"
+        }
       }
     }
   }

From 40901ad96002bab6f9f5041d79a3f227d39d5e4f Mon Sep 17 00:00:00 2001
From: springstan <floorb@gmx.de>
Date: Fri, 25 Oct 2019 18:27:11 +0200
Subject: [PATCH 6/7] Removed setting an if to true for testing

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

diff --git a/src/panels/logbook/ha-logbook.js b/src/panels/logbook/ha-logbook.js
index e05423acb348..3faa6be64fba 100644
--- a/src/panels/logbook/ha-logbook.js
+++ b/src/panels/logbook/ha-logbook.js
@@ -55,7 +55,7 @@ class HaLogbook extends LocalizeMixin(EventsMixin(PolymerElement)) {
         }
       </style>
 
-      <template is="dom-if" if="true">
+      <template is="dom-if" if="[[!entries.length]]">
         [[localize('ui.panel.logbook.entries_not_found')]]
       </template>
 

From 4b6810be37ef69730daed9a9ffb1c4046b2be5a2 Mon Sep 17 00:00:00 2001
From: springstan <floorb@gmx.de>
Date: Tue, 29 Oct 2019 14:39:22 +0100
Subject: [PATCH 7/7] Use template literal instead of string concatenation

---
 src/panels/custom/ha-panel-custom.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/panels/custom/ha-panel-custom.ts b/src/panels/custom/ha-panel-custom.ts
index 2afc2dd09ac5..c9be5a5c15f2 100644
--- a/src/panels/custom/ha-panel-custom.ts
+++ b/src/panels/custom/ha-panel-custom.ts
@@ -79,21 +79,21 @@ export class HaPanelCustom extends UpdatingElement {
     ) {
       if (
         !confirm(
-          this.hass.localize(
+          `${this.hass.localize(
             "ui.panel.custom.external_panel.question_trust",
             "name",
             config.name,
             "link",
             tempA.href
-          ) +
-            "\n\n" +
-            this.hass.localize(
-              "ui.panel.custom.external_panel.complete_access"
-            ) +
-            "\n\n" +
-            "(" +
-            this.hass.localize("ui.panel.custom.external_panel.hide_message") +
-            ")"
+          )}
+
+           ${this.hass.localize(
+             "ui.panel.custom.external_panel.complete_access"
+           )}
+
+           (${this.hass.localize(
+             "ui.panel.custom.external_panel.hide_message"
+           )})`
         )
       ) {
         return;