diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index 7a4f8d7292..b4b130f671 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -51,7 +51,7 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
 <!--
   Provide details about the versions you are using, which helps us reproducing
   and finding the issue quicker. Version information is found in the
-  Home Assistant frontend: Developer tools -> Info.
+  Home Assistant frontend: Configuration -> Info.
 
   Browser version and operating system is important! Please try to replicate
   your issue in a different browser and be sure to include your findings.
diff --git a/build-scripts/gulp/entry-html.js b/build-scripts/gulp/entry-html.js
index f79950e156..e95f2f6091 100644
--- a/build-scripts/gulp/entry-html.js
+++ b/build-scripts/gulp/entry-html.js
@@ -265,7 +265,10 @@ gulp.task("gen-index-gallery-prod", (done) => {
 });
 
 gulp.task("gen-index-hassio-dev", async () => {
-  writeHassioEntrypoint("entrypoint.js", "entrypoints.js");
+  writeHassioEntrypoint(
+    `${paths.hassio_publicPath}/frontend_latest/entrypoint.js`,
+    `${paths.hassio_publicPath}/frontend_es5/entrypoint.js`
+  );
 });
 
 gulp.task("gen-index-hassio-prod", async () => {
@@ -289,10 +292,10 @@ function writeHassioEntrypoint(latestEntrypoint, es5Entrypoint) {
     path.resolve(paths.hassio_output_root, "entrypoint.js"),
     `
 try {
-  new Function("import('${paths.hassio_publicPath}/frontend_latest/${latestEntrypoint}')")();
+  new Function("import('${latestEntrypoint}')")();
 } catch (err) {
   var el = document.createElement('script');
-  el.src = '${paths.hassio_publicPath}/frontend_es5/${es5Entrypoint}';
+  el.src = '${es5Entrypoint}';
   document.body.appendChild(el);
 }
   `,
diff --git a/setup.py b/setup.py
index f40d87d94a..904d1ff62f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20200701.0",
+    version="20200702.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/fake_data/provide_hass.ts b/src/fake_data/provide_hass.ts
index 039ed4085e..c5d015b14f 100644
--- a/src/fake_data/provide_hass.ts
+++ b/src/fake_data/provide_hass.ts
@@ -203,6 +203,7 @@ export const provideHass = (
     translationMetadata: translationMetadata as any,
     dockedSidebar: "auto",
     vibrate: true,
+    suspendWhenHidden: false,
     moreInfoEntityId: null as any,
     // @ts-ignore
     async callService(domain, service, data) {
diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index 667af80170..d4ea24beab 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -11,6 +11,7 @@ import {
 } from "../util/register-service-worker";
 import "./ha-init-page";
 import "./home-assistant-main";
+import { storeState } from "../util/ha-pref-storage";
 
 @customElement("home-assistant")
 export class HomeAssistantAppEl extends HassElement {
@@ -55,6 +56,10 @@ export class HomeAssistantAppEl extends HassElement {
     import(
       /* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min"
     );
+    this.addEventListener("hass-suspend-when-hidden", (ev) => {
+      this._updateHass({ suspendWhenHidden: ev.detail.suspend });
+      storeState(this.hass!);
+    });
   }
 
   protected updated(changedProps: PropertyValues): void {
@@ -76,8 +81,6 @@ export class HomeAssistantAppEl extends HassElement {
     // @ts-ignore
     this._loadHassTranslations(this.hass!.language, "state");
 
-    this.addEventListener("unsuspend-app", () => this._onVisible(), false);
-
     document.addEventListener(
       "visibilitychange",
       () => this._checkVisibility(),
@@ -170,15 +173,17 @@ export class HomeAssistantAppEl extends HassElement {
         this._visiblePromiseResolve = resolve;
       })
     );
-    // We close the connection to Home Assistant after being hidden for 5 minutes
-    this._hiddenTimeout = window.setTimeout(() => {
-      this._hiddenTimeout = undefined;
-      // setTimeout can be delayed in the background and only fire
-      // when we switch to the tab or app again (Hey Android!)
-      if (!document.hidden) {
-        this._suspendApp();
-      }
-    }, 300000);
+    if (this.hass!.suspendWhenHidden !== false) {
+      // We close the connection to Home Assistant after being hidden for 5 minutes
+      this._hiddenTimeout = window.setTimeout(() => {
+        this._hiddenTimeout = undefined;
+        // setTimeout can be delayed in the background and only fire
+        // when we switch to the tab or app again (Hey Android!)
+        if (!document.hidden) {
+          this._suspendApp();
+        }
+      }, 300000);
+    }
     window.addEventListener("focus", () => this._onVisible(), { once: true });
   }
 
diff --git a/src/layouts/partial-panel-resolver.ts b/src/layouts/partial-panel-resolver.ts
index a2db064c91..0d9838cb19 100644
--- a/src/layouts/partial-panel-resolver.ts
+++ b/src/layouts/partial-panel-resolver.ts
@@ -162,6 +162,10 @@ class PartialPanelResolver extends HassRouterPage {
   }
 
   private _checkVisibility() {
+    if (this.hass.suspendWhenHidden === false) {
+      return;
+    }
+
     if (document.hidden) {
       this._onHidden();
     } else {
diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts
index 58166e74ba..9fdb8add69 100644
--- a/src/panels/config/dashboard/ha-config-dashboard.ts
+++ b/src/panels/config/dashboard/ha-config-dashboard.ts
@@ -122,7 +122,7 @@ class HaConfigDashboard extends LitElement {
         : ""}
     </ha-config-section>`;
 
-    if (!this.narrow) {
+    if (!this.narrow && this.hass.dockedSidebar !== "always_hidden") {
       return content;
     }
 
diff --git a/src/panels/developer-tools/template/developer-tools-template.js b/src/panels/developer-tools/template/developer-tools-template.js
index 5f26a3e820..cf6369ee2e 100644
--- a/src/panels/developer-tools/template/developer-tools-template.js
+++ b/src/panels/developer-tools/template/developer-tools-template.js
@@ -159,7 +159,7 @@ For loop example:
   }
 
   computeFormClasses(narrow) {
-    return narrow ? "content fit" : "content fit layout horizontal";
+    return narrow ? "content" : "content layout horizontal";
   }
 
   computeRenderedClasses(error) {
diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts
index 19f98d3f60..21e43a2aa7 100644
--- a/src/panels/history/ha-panel-history.ts
+++ b/src/panels/history/ha-panel-history.ts
@@ -111,7 +111,7 @@ class HaPanelHistory extends LitElement {
       todayCopy.setDate(today.getDate() - today.getDay())
     );
     const thisWeekEnd = new Date(
-      todayCopy.setDate(today.getDate() - today.getDay() + 7)
+      todayCopy.setDate(thisWeekStart.getDate() + 7)
     );
     thisWeekEnd.setMilliseconds(thisWeekEnd.getMilliseconds() - 1);
 
@@ -119,7 +119,7 @@ class HaPanelHistory extends LitElement {
       todayCopy.setDate(today.getDate() - today.getDay() - 7)
     );
     const lastWeekEnd = new Date(
-      todayCopy.setDate(today.getDate() - today.getDay())
+      todayCopy.setDate(lastWeekStart.getDate() + 7)
     );
     lastWeekEnd.setMilliseconds(lastWeekEnd.getMilliseconds() - 1);
 
diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts
index b51c07d50c..62eebaad51 100644
--- a/src/panels/logbook/ha-panel-logbook.ts
+++ b/src/panels/logbook/ha-panel-logbook.ts
@@ -113,10 +113,12 @@ export class HaPanelLogbook extends LitElement {
         </div>
 
         ${this._isLoading
-          ? html`<ha-circular-progress
-              active
-              alt=${this.hass.localize("ui.common.loading")}
-            ></ha-circular-progress>`
+          ? html`<div class="progress-wrapper">
+              <ha-circular-progress
+                active
+                alt=${this.hass.localize("ui.common.loading")}
+              ></ha-circular-progress>
+            </div>`
           : html`<ha-logbook
               .hass=${this.hass}
               .entries=${this._entries}
@@ -149,7 +151,7 @@ export class HaPanelLogbook extends LitElement {
       todayCopy.setDate(today.getDate() - today.getDay())
     );
     const thisWeekEnd = new Date(
-      todayCopy.setDate(today.getDate() - today.getDay() + 7)
+      todayCopy.setDate(thisWeekStart.getDate() + 7)
     );
     thisWeekEnd.setMilliseconds(thisWeekEnd.getMilliseconds() - 1);
 
@@ -157,7 +159,7 @@ export class HaPanelLogbook extends LitElement {
       todayCopy.setDate(today.getDate() - today.getDay() - 7)
     );
     const lastWeekEnd = new Date(
-      todayCopy.setDate(today.getDate() - today.getDay())
+      todayCopy.setDate(lastWeekStart.getDate() + 7)
     );
     lastWeekEnd.setMilliseconds(lastWeekEnd.getMilliseconds() - 1);
 
@@ -248,11 +250,13 @@ export class HaPanelLogbook extends LitElement {
     return [
       haStyle,
       css`
-        ha-logbook {
+        ha-logbook,
+        .progress-wrapper {
           height: calc(100vh - 136px);
         }
 
-        :host([narrow]) ha-logbook {
+        :host([narrow]) ha-logbook,
+        :host([narrow]) .progress-wrapper {
           height: calc(100vh - 198px);
         }
 
@@ -265,6 +269,10 @@ export class HaPanelLogbook extends LitElement {
           margin-right: 0;
         }
 
+        .progress-wrapper {
+          position: relative;
+        }
+
         ha-circular-progress {
           position: absolute;
           left: 50%;
@@ -272,10 +280,6 @@ export class HaPanelLogbook extends LitElement {
           transform: translate(-50%, -50%);
         }
 
-        .wrap {
-          margin-bottom: 24px;
-        }
-
         .filters {
           display: flex;
           align-items: flex-end;
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 404c0df8eb..0f58b84822 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
@@ -128,6 +128,9 @@ export class HuiCardEditor extends LitElement {
   }
 
   public refreshYamlEditor(focus = false) {
+    if (this._configElement?.refreshYamlEditor) {
+      this._configElement.refreshYamlEditor(focus);
+    }
     if (!this._yamlEditor?.codemirror) {
       return;
     }
diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
index 0086ec0b1c..daf244defb 100644
--- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
@@ -56,6 +56,10 @@ export class HuiConditionalCardEditor extends LitElement
     this._config = cardConfigStruct(config);
   }
 
+  public refreshYamlEditor(focus) {
+    this._cardEditorEl?.refreshYamlEditor(focus);
+  }
+
   protected render(): TemplateResult {
     if (!this.hass || !this._config) {
       return html``;
@@ -195,7 +199,7 @@ export class HuiConditionalCardEditor extends LitElement
   private _setMode(value: boolean): void {
     this._GUImode = value;
     if (this._cardEditorEl) {
-      this._cardEditorEl!.GUImode = value;
+      this._cardEditorEl.GUImode = value;
     }
   }
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
index 6b46e48ec5..33c0cfbeb3 100644
--- a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
@@ -51,6 +51,10 @@ export class HuiStackCardEditor extends LitElement
     this._config = cardConfigStruct(config);
   }
 
+  public refreshYamlEditor(focus) {
+    this._cardEditorEl?.refreshYamlEditor(focus);
+  }
+
   protected render(): TemplateResult {
     if (!this.hass || !this._config) {
       return html``;
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index c2623ec683..adfcd98e01 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -57,4 +57,5 @@ export interface LovelaceCardEditor extends HTMLElement {
   hass?: HomeAssistant;
   lovelace?: LovelaceConfig;
   setConfig(config: LovelaceCardConfig): void;
+  refreshYamlEditor?: (focus: boolean) => void;
 }
diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts
index 4f8d07e584..e5837150f4 100644
--- a/src/panels/profile/ha-panel-profile.ts
+++ b/src/panels/profile/ha-panel-profile.ts
@@ -35,6 +35,7 @@ import "./ha-pick-theme-row";
 import "./ha-push-notifications-row";
 import "./ha-refresh-tokens-card";
 import "./ha-set-vibrate-row";
+import "./ha-set-suspend-row";
 
 class HaPanelProfile extends LitElement {
   @property() public hass!: HomeAssistant;
@@ -137,6 +138,10 @@ class HaPanelProfile extends LitElement {
                   ></ha-advanced-mode-row>
                 `
               : ""}
+            <ha-set-suspend-row
+              .narrow=${this.narrow}
+              .hass=${this.hass}
+            ></ha-set-suspend-row>
 
             <div class="card-actions">
               <mwc-button class="warning" @click=${this._handleLogOut}>
diff --git a/src/panels/profile/ha-set-suspend-row.ts b/src/panels/profile/ha-set-suspend-row.ts
new file mode 100644
index 0000000000..d4c4d30b69
--- /dev/null
+++ b/src/panels/profile/ha-set-suspend-row.ts
@@ -0,0 +1,65 @@
+import {
+  customElement,
+  html,
+  LitElement,
+  property,
+  TemplateResult,
+} from "lit-element";
+import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
+import "../../components/ha-switch";
+import type { HaSwitch } from "../../components/ha-switch";
+import type { HomeAssistant } from "../../types";
+import "./ha-settings-row";
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "hass-suspend-when-hidden": { suspend: HomeAssistant["suspendWhenHidden"] };
+  }
+  // for add event listener
+  interface HTMLElementEventMap {
+    "hass-suspend-when-hidden": HASSDomEvent<{
+      suspend: HomeAssistant["suspendWhenHidden"];
+    }>;
+  }
+}
+
+@customElement("ha-set-suspend-row")
+class HaSetSuspendRow extends LitElement {
+  @property() public hass!: HomeAssistant;
+
+  @property() public narrow!: boolean;
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-settings-row .narrow=${this.narrow}>
+        <span slot="heading">
+          ${this.hass.localize("ui.panel.profile.suspend.header")}
+        </span>
+        <span slot="description">
+          ${this.hass.localize("ui.panel.profile.suspend.description")}
+        </span>
+        <ha-switch
+          .checked=${this.hass.suspendWhenHidden}
+          @change=${this._checkedChanged}
+        ></ha-switch>
+      </ha-settings-row>
+    `;
+  }
+
+  private async _checkedChanged(ev: Event) {
+    const suspend = (ev.target as HaSwitch).checked;
+    if (suspend === this.hass.suspendWhenHidden) {
+      return;
+    }
+    fireEvent(this, "hass-suspend-when-hidden", {
+      suspend,
+    });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-set-suspend-row": HaSetSuspendRow;
+  }
+}
diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
index 43496426a8..a5bb5daa2b 100644
--- a/src/state/connection-mixin.ts
+++ b/src/state/connection-mixin.ts
@@ -47,6 +47,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
         translationMetadata,
         dockedSidebar: "docked",
         vibrate: true,
+        suspendWhenHidden: true,
         moreInfoEntityId: null,
         hassUrl: (path = "") => new URL(path, auth.data.hassUrl).toString(),
         callService: async (domain, service, serviceData = {}) => {
diff --git a/src/translations/en.json b/src/translations/en.json
index aa8e417707..fab0367798 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -2106,6 +2106,10 @@
           "header": "Vibrate",
           "description": "Enable or disable vibration on this device when controlling devices."
         },
+        "suspend": {
+          "header": "Automatically close connection",
+          "description": "Should we close the connection to the server after being hidden for 5 minutes?"
+        },
         "push_notifications": {
           "header": "Push Notifications",
           "description": "Send notifications to this device.",
diff --git a/src/types.ts b/src/types.ts
index aff205c13b..31684b0bb7 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -209,7 +209,7 @@ export interface HomeAssistant {
   resources: Resources;
   localize: LocalizeFunc;
   translationMetadata: TranslationMetadata;
-
+  suspendWhenHidden: boolean;
   vibrate: boolean;
   dockedSidebar: "docked" | "always_hidden" | "auto";
   defaultPanel: string;
diff --git a/src/util/ha-pref-storage.ts b/src/util/ha-pref-storage.ts
index ac5319bfa6..404aabb0d9 100644
--- a/src/util/ha-pref-storage.ts
+++ b/src/util/ha-pref-storage.ts
@@ -5,6 +5,7 @@ const STORED_STATE = [
   "selectedTheme",
   "selectedLanguage",
   "vibrate",
+  "suspendWhenHidden",
   "defaultPanel",
 ];
 const STORAGE = window.localStorage || {};
diff --git a/translations/frontend/af.json b/translations/frontend/af.json
index add446e5d7..48daeed370 100644
--- a/translations/frontend/af.json
+++ b/translations/frontend/af.json
@@ -467,8 +467,8 @@
                 }
             },
             "history_charts": {
-                "loading_history": "Laai tans staatsgeskiedenis ...",
-                "no_history_found": "Geen staatgeskiedenis gevind nie."
+                "loading_history": "Laai tans toestandsgeskiedenis ...",
+                "no_history_found": "Geen toestandsgeskiedenis gevind nie."
             },
             "related-items": {
                 "area": "Area",
@@ -715,8 +715,8 @@
                                     "value_template": "Waarde templaat (opsioneel)"
                                 },
                                 "state": {
-                                    "label": "Staat",
-                                    "state": "Staat"
+                                    "label": "Toestand",
+                                    "state": "Toestand"
                                 },
                                 "sun": {
                                     "after": "Na:",
@@ -796,7 +796,7 @@
                                 "state": {
                                     "for": "Vir",
                                     "from": "Vanaf",
-                                    "label": "Staat",
+                                    "label": "Toestand",
                                     "to": "Tot en met"
                                 },
                                 "sun": {
@@ -1021,6 +1021,7 @@
                         "delete": "Verwyder",
                         "delete_confirm": "Is u seker u wil hierdie integrasie skrap?",
                         "device_unavailable": "toestel nie beskikbaar nie",
+                        "documentation": "Dokumentasie",
                         "entity_unavailable": "entiteit nie beskikbaar nie",
                         "firmware": "Fermware: {version}",
                         "hub": "Gekonnekteer via",
@@ -1165,7 +1166,7 @@
                             "add": "Voeg 'n toestel by",
                             "delete": "Verwyder toestel",
                             "header": "toestelle",
-                            "introduction": "Voeg die toestelle wat u wil insluit in u toneel by. Stel al die toestelle op die staat wat u wil hê vir hierdie toneel."
+                            "introduction": "Voeg die toestelle wat u wil insluit in u toneel by. Stel toestande van toestelle na verlange in vir hierdie toneel."
                         },
                         "entities": {
                             "add": "Voeg 'n entiteit by",
@@ -1325,7 +1326,7 @@
                     "edit_home_zone_narrow": "Die ligging van u tuissone kan vanaf die algemene konfigurasiebladsy verander word. Die radius van die Tuis-sone kan nog nie vanaf die voorkant verander word nie. Wil u na die algemene opset gaan?",
                     "go_to_core_config": "Gaan na Algemene konfigurasie?",
                     "home_zone_core_config": "Die ligging van u tuissone kan vanaf die algemene konfigurasiebladsy verander word. Die radius van die Tuis-sone kan nog nie vanaf die voorkant verander word nie. Wil u na die algemene opset gaan?",
-                    "introduction": "Met sones kan u sekere streke op aarde spesifiseer. As 'n persoon binne 'n sone is, neem die staat die naam van die sone af. Sones kan ook as 'n sneller of toestand gebruik word binne outomatiseringsinstellings.",
+                    "introduction": "Met sones kan u sekere streke op aarde spesifiseer. As 'n persoon binne 'n sone is, neem die toestand die sonenaam aan. Sones kan ook as 'n sneller of toestand gebruik word in outomatiseringsinstellings.",
                     "no_zones_created_yet": "Lyk asof jy nog geen sones geskep het nie."
                 },
                 "zwave": {
@@ -1431,6 +1432,9 @@
                         "add_item": "Voeg item by",
                         "checked_items": "Gemerkte items",
                         "clear_items": "Maak die gemerkte items skoon"
+                    },
+                    "starting": {
+                        "description": "Home Assistant begin tans, wag asseblief ..."
                     }
                 },
                 "changed_toast": {
@@ -1442,6 +1446,9 @@
                         "button": {
                             "name": "Knoppie"
                         },
+                        "humidifier": {
+                            "description": "Die Luchtbevochtigerkaart verleen beheer oor u lugbevochtiger-entiteit. Hiermee kan u die humiditeit en modus van die entiteit verander."
+                        },
                         "shopping-list": {
                             "integration_not_loaded": "Hierdie kaart vereis die ' shopping_list ' integrasie wat opgestel moet word."
                         }
diff --git a/translations/frontend/ca.json b/translations/frontend/ca.json
index 19cbf98b18..f28caf3ae0 100644
--- a/translations/frontend/ca.json
+++ b/translations/frontend/ca.json
@@ -1431,6 +1431,7 @@
                         "delete_confirm": "Estàs segur que vols eliminar aquesta integració?",
                         "device_unavailable": "dispositiu no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositiu}\n  other {dispositius}\n}",
+                        "documentation": "Documentació",
                         "entities": "{count} {count, plural,\n  one {entitat}\n  other {entitats}\n}",
                         "entity_unavailable": "entitat no disponible",
                         "firmware": "Firmware: {version}",
diff --git a/translations/frontend/es.json b/translations/frontend/es.json
index ae82017897..9f4537b1cc 100644
--- a/translations/frontend/es.json
+++ b/translations/frontend/es.json
@@ -1431,6 +1431,7 @@
                         "delete_confirm": "¿Estás seguro de que quieres eliminar esta integración?",
                         "device_unavailable": "dispositivo no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositivo}\n  other {dispositivos}\n}",
+                        "documentation": "Documentación",
                         "entities": "{count} {count, plural,\n  one {entidad}\n  other {entidades}\n}",
                         "entity_unavailable": "entidad no disponible",
                         "firmware": "Firmware: {version}",
diff --git a/translations/frontend/is.json b/translations/frontend/is.json
index 80c8a45ad3..1a4ba2b4ab 100644
--- a/translations/frontend/is.json
+++ b/translations/frontend/is.json
@@ -47,6 +47,13 @@
                 "none": "Ekkert",
                 "sleep": "Svefn"
             }
+        },
+        "humidifier": {
+            "mode": {
+                "auto": "Sjálfvirkt",
+                "away": "Fjarverandi",
+                "home": "Heima"
+            }
         }
     },
     "state_badge": {
@@ -367,6 +374,10 @@
                 "reverse": "Afturábak",
                 "speed": "Hraði"
             },
+            "humidifier": {
+                "mode": "Hamur",
+                "on_entity": "{name} í gangi"
+            },
             "light": {
                 "brightness": "Birtustig",
                 "color_temperature": "Litastig",
@@ -392,6 +403,9 @@
             "script": {
                 "execute": "Framkvæma"
             },
+            "service": {
+                "run": "Keyra"
+            },
             "timer": {
                 "actions": {
                     "cancel": "hætta við",
@@ -448,10 +462,13 @@
         },
         "common": {
             "and": "og",
+            "back": "Til baka",
             "cancel": "Hætta við",
             "close": "Loka",
             "delete": "Eyða",
+            "error_required": "Skilyrt",
             "loading": "Hleð",
+            "menu": "Valmynd",
             "next": "Næsta",
             "no": "Nei",
             "previous": "Fyrri",
@@ -467,11 +484,19 @@
                     "failed_create_area": "Ekki tókst að stofna svæði.",
                     "name": "Nafn"
                 },
-                "clear": "Hreinsa"
+                "area": "Svæði",
+                "clear": "Hreinsa",
+                "show_areas": "Birta svæði"
+            },
+            "date-range-picker": {
+                "end_date": "Loka dagsetning",
+                "select": "Velja",
+                "start_date": "Upphafs dagsetning"
             },
             "device-picker": {
                 "clear": "Hreinsa",
                 "device": "Tæki",
+                "no_area": "Ekkert svæði",
                 "show_devices": "Sýna tæki"
             },
             "entity": {
@@ -515,7 +540,11 @@
                 "dismiss": "Vísa frá",
                 "editor": {
                     "delete": "Eyða",
+                    "enabled_cause": "Afvirkjað vegna {cause}.",
+                    "enabled_label": "Virkja einingu",
+                    "entity_id": "Kenni eingar",
                     "icon": "Yfirskrifa táknmynd",
+                    "name": "Yfirskrifa nafn",
                     "update": "Uppfæra"
                 },
                 "related": "Tengt",
@@ -538,21 +567,36 @@
                     "time": "Tími"
                 },
                 "input_number": {
+                    "max": "Hámarksgildi",
+                    "min": "Lágmarksgildi",
+                    "mode": "Birtingarmáti",
                     "unit_of_measurement": "Mælieining"
                 },
                 "input_select": {
-                    "add": "Bæta við"
+                    "add": "Bæta við",
+                    "add_option": "Bæta við valkosti",
+                    "options": "Valkostir"
                 },
                 "input_text": {
+                    "max": "Hámarkslengd",
+                    "min": "Lágmarkslengd",
+                    "mode": "Birtingarmáti",
                     "password": "Lykilorð",
                     "text": "Texti"
                 },
                 "required_error_msg": "þetta er skilyrtur reitur"
             },
             "more_info_control": {
-                "script": {
-                    "last_action": "Síðasta aðgerð"
+                "edit": "Breyta einingu",
+                "restored": {
+                    "confirm_remove_title": "Fjarlægja einingu?",
+                    "remove_action": "Fjarlægja einingu"
                 },
+                "script": {
+                    "last_action": "Síðasta aðgerð",
+                    "last_triggered": "Síðast kveikt"
+                },
+                "settings": "Stillingar fyrir einingu",
                 "sun": {
                     "elevation": "Hækkun",
                     "rising": "Upprisa",
@@ -566,7 +610,9 @@
                 }
             },
             "mqtt_device_debug_info": {
-                "entities": "Einingar"
+                "entities": "Einingar",
+                "no_entities": "Engar einingar",
+                "show_as_yaml": "Birta sem YAML"
             },
             "options_flow": {
                 "form": {
@@ -629,12 +675,16 @@
                 "areas": {
                     "caption": "Svæðaskrá",
                     "data_table": {
-                        "area": "Svæði"
+                        "area": "Svæði",
+                        "devices": "Tæki"
                     },
                     "description": "Yfirlit yfir öll svæði á heimilinu þínu.",
                     "editor": {
                         "create": "STOFNA",
                         "delete": "EYÐA",
+                        "name": "Nafn",
+                        "name_required": "Nafn er skilyrt",
+                        "unknown_error": "Óþekkt villa",
                         "update": "UPPFÆRA"
                     },
                     "picker": {
@@ -667,6 +717,7 @@
                                     "label": "Töf"
                                 },
                                 "device_id": {
+                                    "action": "Aðgerð",
                                     "extra_fields": {
                                         "code": "Kóði"
                                     },
@@ -677,6 +728,9 @@
                                     "label": "Skjóta viðburði",
                                     "service_data": "Þjónustu gögn"
                                 },
+                                "scene": {
+                                    "label": "Virkja senu"
+                                },
                                 "service": {
                                     "label": "Kalla í þjónustu",
                                     "service_data": "Þjónustugögn"
@@ -704,6 +758,7 @@
                                     "label": "Og"
                                 },
                                 "device": {
+                                    "condition": "Skilyrði",
                                     "extra_fields": {
                                         "above": "Yfir",
                                         "below": "Undir",
@@ -761,6 +816,8 @@
                         "introduction": "Notaðu sjálfvirkni til að glæða húsið þitt lífi",
                         "load_error_not_editable": "Eingöngu er hægt að breyta sjálfvirkni í automations.yaml",
                         "load_error_unknown": "Villa kom upp við að hlaða inn sjálfvirkni  ({err_no}).",
+                        "move_down": "Færa niður",
+                        "move_up": "Færa upp",
                         "save": "Vista",
                         "triggers": {
                             "add": "Bæta við kveikju",
@@ -876,7 +933,9 @@
                         "connection_status": "Staða tengingar við skýið",
                         "fetching_subscription": "Sæki áskrift...",
                         "google": {
+                            "enter_pin_error": "Ekki tókst að vista pin kóða:",
                             "security_devices": "Öryggistæki",
+                            "sync_entities": "Samstilla einingar við Google",
                             "title": "Google Assistant"
                         },
                         "integrations": "Samþættingar",
@@ -890,6 +949,7 @@
                         "sign_out": "Skrá út",
                         "webhooks": {
                             "loading": "Hleð ...",
+                            "no_hooks_yet2": " eða með því að stofna ",
                             "title": "Webhooks"
                         }
                     },
@@ -908,7 +968,8 @@
                         "close": "Loka",
                         "confirm_disable": "Ertu viss um að þú viljir afvirkja þennan vefkrók?",
                         "copied_to_clipboard": "Afritað á klemmuspjald",
-                        "view_documentation": "Skoða skjölun"
+                        "view_documentation": "Skoða skjölun",
+                        "webhook_for": "Vefkrókur fyrir {name}"
                     },
                     "forgot_password": {
                         "email": "Netfang",
@@ -927,10 +988,13 @@
                         "email": "Netfang",
                         "email_error_msg": "Ógilt netfang",
                         "forgot_password": "gleymt lykilorð?",
+                        "introduction2": "Þessi þjónusta er rekin af samstarfsaðila okkar",
+                        "introduction3": "Home Assistant skýið er áskriftarþjónusta með mánaðar prufuáskrift. Engar greiðsluupplýsingar nauðsynlegar.",
                         "learn_more_link": "Læra meira um Home Assistant skýið",
                         "password": "Lykilorð",
                         "password_error_msg": "Lykilorð eru að minnsta kosti 8 stafir",
-                        "sign_in": "Skrá inn"
+                        "sign_in": "Skrá inn",
+                        "title": "Skýja innskráning"
                     },
                     "register": {
                         "create_account": "Stofna aðgang",
@@ -942,7 +1006,8 @@
                         "link_terms_conditions": "Skilmálar og skilyrði",
                         "password": "Lykilorð",
                         "password_error_msg": "Lykilorð eru að minnsta kosti 8 stafir",
-                        "resend_confirm_email": "Endursenda staðfestingarpóst"
+                        "resend_confirm_email": "Endursenda staðfestingarpóst",
+                        "start_trial": "Hefja prufu"
                     }
                 },
                 "core": {
@@ -976,6 +1041,7 @@
                     "caption": "Séraðlögun",
                     "description": "Séraðlögun fyrir einingarnar þínar",
                     "picker": {
+                        "entity": "Eining",
                         "header": "Séraðlögun"
                     }
                 },
@@ -999,6 +1065,7 @@
                         "device": "Tæki",
                         "integration": "Samþætting",
                         "manufacturer": "Framleiðandi",
+                        "no_area": "Ekkert svæði",
                         "no_devices": "Engin tæki"
                     },
                     "delete": "Eyða",
@@ -1006,9 +1073,12 @@
                     "device_info": "Upplýsingar um tæki",
                     "device_not_found": "Tæki fannst ekki.",
                     "entities": {
+                        "add_entities_lovelace": "Bæta við í Lovelace",
+                        "disabled_entities": "+{count} {count, plural,\n  one {óvirk eining}\n  other {óvirkar einingar}\n}",
                         "entities": "Einingar"
                     },
                     "name": "Nafn",
+                    "no_devices": "Engin tæki",
                     "scene": {
                         "no_scenes": "Engar senur",
                         "scenes": "Senur"
@@ -1043,8 +1113,10 @@
                         },
                         "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.",
                         "remove_selected": {
-                            "button": "Fjarlægja val"
+                            "button": "Fjarlægja val",
+                            "confirm_title": "Viltu fjarlægja {number} einingar?"
                         },
+                        "selected": "{number} valin",
                         "status": {
                             "disabled": "Afvirkjað",
                             "ok": "í lagi",
@@ -1054,7 +1126,8 @@
                     }
                 },
                 "filtering": {
-                    "clear": "Hreinsa"
+                    "clear": "Hreinsa",
+                    "filtering_by": "Sía eftir"
                 },
                 "header": "Stilla af Home Assistant",
                 "helpers": {
@@ -1070,15 +1143,20 @@
                     "types": {
                         "input_datetime": "Dagsetning og/eða tími",
                         "input_number": "Númer",
+                        "input_select": "Fellivalmynd",
                         "input_text": "Texti"
                     }
                 },
                 "info": {
+                    "caption": "Upplýsingar",
                     "documentation": "Skjölun",
                     "icons_by": "Smátákn eftir",
                     "integrations": "Samþættingar",
                     "title": "Upplýsingar"
                 },
+                "integration_panel_move": {
+                    "link_integration_page": "Samþættingar síða"
+                },
                 "integrations": {
                     "add_integration": "Bæta við samþættingu",
                     "caption": "Samþættingar",
@@ -1088,6 +1166,9 @@
                         "delete_button": "Eyða {integration}",
                         "delete_confirm": "Ertu viss um að þú viljir eyða þessari samþættingu?",
                         "device_unavailable": "Tæki ekki tiltækt",
+                        "devices": "{count} {count, plural,\n  one {tæki}\n  other {tæki}\n}",
+                        "documentation": "Skjölun",
+                        "entities": "{count} {count, plural,\n  one {eining}\n  other {einingar}\n}",
                         "entity_unavailable": "Eining ekki tiltæk",
                         "firmware": "Fastbúnaðarútgáfa: {version}",
                         "hub": "Tengt gegnum",
@@ -1095,9 +1176,11 @@
                         "no_area": "Ekkert svæði",
                         "no_device": "Einingar án tækja",
                         "no_devices": "Þessi samþætting hefur engin tæki.",
+                        "options": "Valkostir",
                         "rename": "Endurnefna",
                         "restart_confirm": "Endurræsa Home Assitant til að klára að fjarlægja þessa samþættingu",
-                        "settings_button": "Breyta stillingum fyrir {integration}"
+                        "settings_button": "Breyta stillingum fyrir {integration}",
+                        "system_options": "Kerfisvalkostir"
                     },
                     "config_flow": {
                         "aborted": "Hætt var við",
@@ -1127,7 +1210,8 @@
                 },
                 "introduction": "Hér er mögulegt að stilla af íhluti og Home Assistant. Því miður er ekki hægt að breyta öllu í gegnum viðmótið ennþá, en við erum að vinna í því.",
                 "logs": {
-                    "clear": "Hreinsa"
+                    "clear": "Hreinsa",
+                    "refresh": "Endurnýja"
                 },
                 "lovelace": {
                     "caption": "Lovelace mælaborð",
@@ -1143,8 +1227,10 @@
                             "edit_dashboard": "Breyta mælaborði",
                             "icon": "Táknmynd",
                             "new_dashboard": "bæta við nýju mælaborði",
+                            "require_admin": "Aðeins stjórnandi",
                             "show_sidebar": "Sýna í hliðarstiku",
                             "title": "Titill",
+                            "title_required": "Titill er skilyrtur.",
                             "update": "Uppfæra",
                             "url": "Slóð"
                         },
@@ -1153,6 +1239,7 @@
                             "headers": {
                                 "default": "Sjálfgefið",
                                 "filename": "Skráarnafn",
+                                "require_admin": "Aðeins stjórnandi",
                                 "sidebar": "Sýna í hliðarstiku",
                                 "title": "Titill"
                             },
@@ -1183,6 +1270,7 @@
                     }
                 },
                 "mqtt": {
+                    "listening_to": "Hlusta á",
                     "title": "MQTT"
                 },
                 "person": {
@@ -1310,6 +1398,13 @@
                         "owner": "Eigandi",
                         "unnamed_user": "Ónefndur notandi",
                         "update_user": "Uppfæra"
+                    },
+                    "picker": {
+                        "headers": {
+                            "group": "Hópur",
+                            "name": "Nafn",
+                            "system": "Kerfi"
+                        }
                     }
                 },
                 "zha": {
@@ -1319,7 +1414,16 @@
                         "search_again": "Leita aftur",
                         "spinner": "Leitað að ZHA Zigbee tækjum..."
                     },
+                    "add": {
+                        "caption": "Bæta við tækjum"
+                    },
                     "caption": "ZHA",
+                    "cluster_commands": {
+                        "header": "Klasa skipanir"
+                    },
+                    "clusters": {
+                        "header": "Klasar"
+                    },
                     "common": {
                         "add_devices": "Bæta við tækjum",
                         "clusters": "Klasar",
@@ -1346,6 +1450,9 @@
                     "network_management": {
                         "header": "Netumsýsla"
                     },
+                    "network": {
+                        "caption": "Net"
+                    },
                     "node_management": {
                         "header": "Tækjaumsýsla"
                     }
@@ -1360,6 +1467,7 @@
                         "longitude": "Lengdargráða",
                         "name": "Nafn",
                         "radius": "Radíus",
+                        "required_error_msg": "þetta er skilyrtur reitur",
                         "update": "Uppfæra"
                     }
                 },
@@ -1385,6 +1493,10 @@
                         "seconds": "sekúndur",
                         "set_config_parameter": "Stilltu Config Parameter"
                     },
+                    "node_management": {
+                        "entity_info": "Upplýsingar um einingu",
+                        "group": "Hópur"
+                    },
                     "ozw_log": {
                         "header": "OZW annáll"
                     },
@@ -1402,16 +1514,24 @@
             "developer-tools": {
                 "tabs": {
                     "events": {
-                        "title": "Viðburðir"
+                        "alert_event_type": "Gerð viðburðar er skilyrtur reitur",
+                        "count_listeners": " ({count}  hlustendur)",
+                        "fire_event": "Skjóta viðburði",
+                        "listen_to_events": "Hlusta eftir viðburðum",
+                        "title": "Viðburðir",
+                        "type": "Gerð viðburðar"
                     },
                     "services": {
                         "call_service": "Kalla í þjónustu",
                         "column_description": "Lýsing",
                         "column_example": "Dæmi",
                         "data": "Þjónustugögn (YAML, valkvæmt)",
+                        "description": "Þjónustu þróunartólið leyfir þér að kalla í allar þjónustur sem eru tiltækar innan Home Assistant",
+                        "select_service": "Veldu þjónustu til að sjá lýsingu",
                         "title": "Þjónustur"
                     },
                     "states": {
+                        "current_entities": "Tiltækar einingar",
                         "more_info": "Frekari upplýsingar",
                         "set_state": "Setja stöðu",
                         "state": "Staða",
@@ -1424,10 +1544,22 @@
             },
             "history": {
                 "period": "Tímabil",
+                "ranges": {
+                    "last_week": "Í síðustu viku",
+                    "this_week": "Í þessari viku",
+                    "today": "Í dag",
+                    "yesterday": "Í gær"
+                },
                 "showing_entries": "Sýni færslur fyrir"
             },
             "logbook": {
                 "period": "Tímabil",
+                "ranges": {
+                    "last_week": "Í síðustu viku",
+                    "this_week": "Í þessari viku",
+                    "today": "Í dag",
+                    "yesterday": "Í gær"
+                },
                 "showing_entries": "Sýni færslur fyrir"
             },
             "lovelace": {
@@ -1465,6 +1597,8 @@
                             "name": "Hnappur"
                         },
                         "conditional": {
+                            "card": "Spjald",
+                            "change_type": "Breyta gerð",
                             "conditions": "Skilyrði"
                         },
                         "config": {
@@ -1491,6 +1625,7 @@
                         },
                         "generic": {
                             "aspect_ratio": "Hlutfall",
+                            "attribute": "Eigindi",
                             "camera_image": "Myndavélaeining",
                             "camera_view": "Sjónarhorn myndavélar",
                             "entities": "Einingar",
@@ -1521,6 +1656,9 @@
                         "horizontal-stack": {
                             "name": "Láréttur stafli"
                         },
+                        "humidifier": {
+                            "name": "Rakatæki"
+                        },
                         "iframe": {
                             "name": "iFrame"
                         },
@@ -1560,6 +1698,10 @@
                             "show_forecast": "Sýna veðurspá"
                         }
                     },
+                    "cardpicker": {
+                        "custom_card": "Sérsniðið",
+                        "no_description": "Engin lýsing tiltæk."
+                    },
                     "edit_card": {
                         "add": "Bæta við spjaldi",
                         "delete": "Eyða",
@@ -1606,6 +1748,7 @@
                         "save": "Taka stjórnina"
                     },
                     "suggest_card": {
+                        "add": "Bæta við í Lovelace viðmót",
                         "create_own": "Velja annað spjald",
                         "header": "Hér er tillaga fyrir þig"
                     }
@@ -1623,7 +1766,8 @@
                     "last_changed": "Síðast breytt"
                 },
                 "warning": {
-                    "entity_not_found": "Eining ekki tiltæk: {entity}"
+                    "entity_not_found": "Eining ekki tiltæk: {entity}",
+                    "entity_unavailable": "{entity} er ekki tiltæk eins og er"
                 }
             },
             "mailbox": {
@@ -1637,6 +1781,7 @@
                 "authorizing_client": "Þú ert að fara að veita {clientId} aðgang að Home Assistant uppsetningunni.",
                 "form": {
                     "error": "Villa: {error}",
+                    "next": "Næsta",
                     "providers": {
                         "command_line": {
                             "abort": {
diff --git a/translations/frontend/ru.json b/translations/frontend/ru.json
index 806cbe4c0a..fd2989794a 100644
--- a/translations/frontend/ru.json
+++ b/translations/frontend/ru.json
@@ -1431,6 +1431,7 @@
                         "delete_confirm": "Вы уверены, что хотите удалить эту интеграцию?",
                         "device_unavailable": "устройство недоступно",
                         "devices": "{count} {count, plural,\n  one {устройство}\n  other {устройств}\n}",
+                        "documentation": "Документация",
                         "entities": "{count} {count, plural,\n  one {объект}\n  other {объектов}\n}",
                         "entity_unavailable": "объект недоступен",
                         "firmware": "Прошивка: {version}",
@@ -1784,7 +1785,7 @@
                         "caption": "Добавить устройства",
                         "description": "Добавить устройства в сеть Zigbee"
                     },
-                    "button": "Настроить",
+                    "button": "Настройка",
                     "caption": "Zigbee Home Automation",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Атрибуты выбранного кластера",
@@ -1905,7 +1906,7 @@
                     "no_zones_created_yet": "У Вас еще нет добавленных зон."
                 },
                 "zwave": {
-                    "button": "Настроить",
+                    "button": "Настройка",
                     "caption": "Z-Wave",
                     "common": {
                         "index": "Индекс",
diff --git a/translations/frontend/zh-Hans.json b/translations/frontend/zh-Hans.json
index 8e16a6f848..8dac5f5969 100644
--- a/translations/frontend/zh-Hans.json
+++ b/translations/frontend/zh-Hans.json
@@ -1431,6 +1431,7 @@
                         "delete_confirm": "您确定要删除此集成吗？",
                         "device_unavailable": "设备不可用",
                         "devices": "{count} {count, plural,\n  one {个设备}\n  other {个设备}\n}",
+                        "documentation": "文档",
                         "entities": "{count} {count, plural,\n  one {个实体}\n  other {个实体}\n}",
                         "entity_unavailable": "实体不可用",
                         "firmware": "固件：{version}",
diff --git a/translations/frontend/zh-Hant.json b/translations/frontend/zh-Hant.json
index 5c0fbc1f5f..8cd8272259 100644
--- a/translations/frontend/zh-Hant.json
+++ b/translations/frontend/zh-Hant.json
@@ -1431,6 +1431,7 @@
                         "delete_confirm": "確定要刪除此整合？",
                         "device_unavailable": "設備不可用",
                         "devices": "{count} {count, plural,\n  one {個設備}\n  other {個設備}\n}",
+                        "documentation": "相關文件",
                         "entities": "{count} {count, plural,\n  one {個物件}\n  other {個物件}\n}",
                         "entity_unavailable": "物件不可用",
                         "firmware": "韌體：{version}",