From 3865c1943c57b878d400597d0124504063829055 Mon Sep 17 00:00:00 2001
From: Timmo <contact@timmo.xyz>
Date: Fri, 12 Jul 2019 23:31:38 +0100
Subject: [PATCH 01/10] :hammer: Fix mqtt dev tools missing class (#3359)

---
 .../mqtt/developer-tools-mqtt.js              | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/panels/developer-tools/mqtt/developer-tools-mqtt.js b/src/panels/developer-tools/mqtt/developer-tools-mqtt.js
index a2e80c0d94..ceaef39b4c 100644
--- a/src/panels/developer-tools/mqtt/developer-tools-mqtt.js
+++ b/src/panels/developer-tools/mqtt/developer-tools-mqtt.js
@@ -38,20 +38,22 @@ class HaPanelDevMqtt extends PolymerElement {
       >
       </app-localstorage-document>
 
-      <ha-card header="Publish a packet">
-        <div class="card-content">
-          <paper-input label="topic" value="{{topic}}"></paper-input>
+      <div class="content">
+        <ha-card header="Publish a packet">
+          <div class="card-content">
+            <paper-input label="topic" value="{{topic}}"></paper-input>
 
-          <paper-textarea
-            always-float-label
-            label="Payload (template allowed)"
-            value="{{payload}}"
-          ></paper-textarea>
-        </div>
-        <div class="card-actions">
-          <mwc-button on-click="_publish">Publish</mwc-button>
-        </div>
-      </ha-card>
+            <paper-textarea
+              always-float-label
+              label="Payload (template allowed)"
+              value="{{payload}}"
+            ></paper-textarea>
+          </div>
+          <div class="card-actions">
+            <mwc-button on-click="_publish">Publish</mwc-button>
+          </div>
+        </ha-card>
+      </div>
     `;
   }
 

From e36454f08faedc1d125f3539fc09a2eddd35cad0 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 12 Jul 2019 22:36:36 -0700
Subject: [PATCH 02/10] Fix token card not showing (#3362)

---
 src/panels/profile/ha-panel-profile.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/panels/profile/ha-panel-profile.js b/src/panels/profile/ha-panel-profile.js
index e8ccba74ae..1cefa17524 100644
--- a/src/panels/profile/ha-panel-profile.js
+++ b/src/panels/profile/ha-panel-profile.js
@@ -55,7 +55,10 @@ class HaPanelProfile extends EventsMixin(LocalizeMixin(PolymerElement)) {
       <app-header-layout has-scrolling-region>
         <app-header slot="header" fixed>
           <app-toolbar>
-            <ha-menu-button hass='[[hass]]' narrow='[[narrow]]'></ha-menu-button>
+            <ha-menu-button
+              hass="[[hass]]"
+              narrow="[[narrow]]"
+            ></ha-menu-button>
             <div main-title>[[localize('panel.profile')]]</div>
           </app-toolbar>
         </app-header>
@@ -104,7 +107,7 @@ class HaPanelProfile extends EventsMixin(LocalizeMixin(PolymerElement)) {
           <ha-advanced-mode-card
             hass="[[hass]]"
             core-user-data="[[_coreUserData]]"
-          ></ha-mfa-modules-card>
+          ></ha-advanced-mode-card>
 
           <ha-refresh-tokens-card
             hass="[[hass]]"

From 7a12cbf96eaa581bf5143c56f5086866155d3cff Mon Sep 17 00:00:00 2001
From: Sean Mooney <sean.mooney@gmail.com>
Date: Sat, 13 Jul 2019 02:45:27 -0400
Subject: [PATCH 03/10] Add link to Alexa skill on Cloud page (#3364)

This adds a direct link to the Home Assistant Alexa skill, which is more convenient than telling the user to search for it themselves. On mobile devices it can open the skill directly in the Alexa app which is nice.

Also tweaked the wording from "activate" to "enable" since that is what Amazon uses.
---
 src/panels/config/cloud/account/cloud-alexa-pref.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/panels/config/cloud/account/cloud-alexa-pref.ts b/src/panels/config/cloud/account/cloud-alexa-pref.ts
index 9e140f0e0d..dcbeee76be 100644
--- a/src/panels/config/cloud/account/cloud-alexa-pref.ts
+++ b/src/panels/config/cloud/account/cloud-alexa-pref.ts
@@ -41,8 +41,12 @@ export class CloudAlexaPref extends LitElement {
           control all your Home Assistant devices via any Alexa-enabled device.
           <ul>
             <li>
-              To activate, search in the Alexa app for the Home Assistant Smart
-              Home skill.
+              <a
+                href="https://skills-store.amazon.com/deeplink/dp/B0772J1QKB?deviceType=app"
+                target="_blank"
+              >
+                Enable the Home Assistant skill for Alexa
+              </a>
             </li>
             <li>
               <a

From 8bbc442b7e2ebc37189d143b04eb86693d1de8a6 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 14 Jul 2019 13:30:50 -0700
Subject: [PATCH 04/10] Correctly check frontend version (#3365)

---
 src/components/ha-menu-button.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ha-menu-button.ts b/src/components/ha-menu-button.ts
index 15a5887adb..ed97a569a8 100644
--- a/src/components/ha-menu-button.ts
+++ b/src/components/ha-menu-button.ts
@@ -72,7 +72,7 @@ class HaMenuButton extends LitElement {
     // on older frontends too, that don't have an always visible menu button
     // in the sidebar.
     this._alwaysVisible =
-      (Number((window.parent as any).frontendVersion) || 0) >= 20190710;
+      (Number((window.parent as any).frontendVersion) || 0) < 20190710;
   }
 
   protected updated(changedProps) {

From cdb2a1a424ae26912c3b99a604a974f6fd551f08 Mon Sep 17 00:00:00 2001
From: Timmo <contact@timmo.xyz>
Date: Sun, 14 Jul 2019 21:47:33 +0100
Subject: [PATCH 05/10] Integrations - Add Search (#3361)

* :sparkles: Add search to flow picker

* :hammer: Autofocus

* :hammer: squash extra space

* Update src/dialogs/config-flow/step-flow-pick-handler.ts

Co-Authored-By: Paulus Schoutsen <paulus@home-assistant.io>

* Update src/dialogs/config-flow/step-flow-pick-handler.ts

Co-Authored-By: Paulus Schoutsen <paulus@home-assistant.io>
---
 src/common/search/search-input.ts             | 83 +++++++++++++++++++
 .../config-flow/step-flow-pick-handler.ts     | 65 ++++++++++++---
 2 files changed, 138 insertions(+), 10 deletions(-)
 create mode 100644 src/common/search/search-input.ts

diff --git a/src/common/search/search-input.ts b/src/common/search/search-input.ts
new file mode 100644
index 0000000000..deb36885b7
--- /dev/null
+++ b/src/common/search/search-input.ts
@@ -0,0 +1,83 @@
+import { TemplateResult, html } from "lit-html";
+import {
+  css,
+  CSSResult,
+  customElement,
+  LitElement,
+  property,
+} from "lit-element";
+import { fireEvent } from "../dom/fire_event";
+import "@polymer/iron-icon/iron-icon";
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-icon-button/paper-icon-button";
+import "@material/mwc-button";
+
+@customElement("search-input")
+class SearchInput extends LitElement {
+  @property() private filter?: string;
+
+  protected render(): TemplateResult | void {
+    return html`
+      <div class="search-container">
+        <paper-input
+          autofocus
+          label="Search"
+          .value=${this.filter}
+          @value-changed=${this._filterInputChanged}
+        >
+          <iron-icon
+            icon="mdi:magnify"
+            slot="prefix"
+            class="prefix"
+          ></iron-icon>
+          ${this.filter &&
+            html`
+              <paper-icon-button
+                slot="suffix"
+                class="suffix"
+                @click=${this._clearSearch}
+                icon="mdi:close"
+                alt="Clear"
+                title="Clear"
+              ></paper-icon-button>
+            `}
+        </paper-input>
+      </div>
+    `;
+  }
+
+  private async _filterChanged(value: string) {
+    fireEvent(this, "value-changed", { value: String(value) });
+  }
+
+  private async _filterInputChanged(e) {
+    this._filterChanged(e.target.value);
+  }
+
+  private async _clearSearch() {
+    this._filterChanged("");
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      paper-input {
+        flex: 1 1 auto;
+        margin: 0 16px;
+      }
+      .search-container {
+        display: inline-flex;
+        width: 100%;
+        align-items: center;
+      }
+      .prefix {
+        margin: 8px;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "search-input": SearchInput;
+  }
+}
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index ef64b0798a..0fbe0ba597 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -1,10 +1,11 @@
 import {
-  LitElement,
-  TemplateResult,
-  html,
   css,
-  customElement,
   CSSResult,
+  customElement,
+  html,
+  LitElement,
+  property,
+  TemplateResult,
 } from "lit-element";
 import "@polymer/paper-spinner/paper-spinner-lite";
 import "@polymer/paper-item/paper-item";
@@ -12,23 +13,62 @@ import "@polymer/paper-item/paper-item-body";
 import { HomeAssistant } from "../../types";
 import { createConfigFlow } from "../../data/config_entries";
 import { fireEvent } from "../../common/dom/fire_event";
+import memoizeOne from "memoize-one";
+import * as Fuse from "fuse.js";
+
 import "../../components/ha-icon-next";
+import "../../common/search/search-input";
+
+interface HandlerObj {
+  name: string;
+  slug: string;
+}
 
 @customElement("step-flow-pick-handler")
 class StepFlowPickHandler extends LitElement {
-  public hass!: HomeAssistant;
-  public handlers!: string[];
+  @property() public hass!: HomeAssistant;
+  @property() public handlers!: string[];
+  @property() private filter?: string;
+
+  private _getHandlers = memoizeOne((h: string[], filter?: string) => {
+    const handlers: HandlerObj[] = h.map((handler) => {
+      return {
+        name: this.hass.localize(`component.${handler}.config.title`),
+        slug: handler,
+      };
+    });
+
+    if (filter) {
+      const options: Fuse.FuseOptions<HandlerObj> = {
+        keys: ["name", "slug"],
+        caseSensitive: false,
+        minMatchCharLength: 2,
+        threshold: 0.2,
+      };
+      const fuse = new Fuse(handlers, options);
+      return fuse.search(filter);
+    }
+    return handlers.sort((a, b) =>
+      a.name.toUpperCase() < b.name.toUpperCase() ? -1 : 1
+    );
+  });
 
   protected render(): TemplateResult | void {
+    const handlers = this._getHandlers(this.handlers, this.filter);
+
     return html`
       <h2>${this.hass.localize("ui.panel.config.integrations.new")}</h2>
       <div>
-        ${this.handlers.map(
-          (handler) =>
+        <search-input
+          .filter=${this.filter}
+          @value-changed=${this._filterChanged}
+        ></search-input>
+        ${handlers.map(
+          (handler: HandlerObj) =>
             html`
               <paper-item @click=${this._handlerPicked} .handler=${handler}>
                 <paper-item-body>
-                  ${this.hass.localize(`component.${handler}.config.title`)}
+                  ${handler.name}
                 </paper-item-body>
                 <ha-icon-next></ha-icon-next>
               </paper-item>
@@ -38,15 +78,20 @@ class StepFlowPickHandler extends LitElement {
     `;
   }
 
+  private async _filterChanged(e) {
+    this.filter = e.detail.value;
+  }
+
   private async _handlerPicked(ev) {
     fireEvent(this, "flow-update", {
-      stepPromise: createConfigFlow(this.hass, ev.currentTarget.handler),
+      stepPromise: createConfigFlow(this.hass, ev.currentTarget.handler.slug),
     });
   }
 
   static get styles(): CSSResult {
     return css`
       h2 {
+        margin-bottom: 2px;
         padding-left: 16px;
       }
       div {

From beb1fe1e64b66d2ab752fd7c6c42c594eb0beeed Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 15 Jul 2019 13:05:06 -0700
Subject: [PATCH 06/10] Update translations

---
 src/translations/en.json  |   7 +-
 translations/ca.json      |  26 +++-
 translations/en.json      |  26 +++-
 translations/nb.json      |  26 +++-
 translations/nl.json      |  26 +++-
 translations/pl.json      |  26 +++-
 translations/ro.json      | 250 ++++++++++++++++++++++++++++++++++++--
 translations/ru.json      |  26 +++-
 translations/sl.json      |  26 +++-
 translations/zh-Hant.json |  26 +++-
 10 files changed, 439 insertions(+), 26 deletions(-)

diff --git a/src/translations/en.json b/src/translations/en.json
index b6e6d7f158..e99b5329a1 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -52,12 +52,7 @@
     "history": "History",
     "mailbox": "Mailbox",
     "shopping_list": "Shopping list",
-    "dev-services": "Services",
-    "dev-states": "States",
-    "dev-events": "Events",
-    "dev-templates": "Templates",
-    "dev-mqtt": "MQTT",
-    "dev-info": "Info",
+    "developer_tools": "Developer Tools",
     "profile": "Profile"
   },
   "state": {
diff --git a/translations/ca.json b/translations/ca.json
index a610f92500..e6aef3d220 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Gestiona la teva xarxa Z-Wave"
+                    "description": "Gestiona la teva xarxa Z-Wave",
+                    "network_management": {
+                        "header": "Gestió de la xarxa Z-Wave",
+                        "introduction": "Executa ordres a la xarxa Z-Wave. No es rebrà cap resposta si la majoria de les ordres han tingut èxit, però pots consultar el registre OZW."
+                    },
+                    "network_status": {
+                        "network_stopped": "Xarxa Z-Wave aturada",
+                        "network_starting": "Iniciant xarxa Z-Wave...",
+                        "network_starting_note": "Això pot trigar una estona en funció de la mida de la teva xarxa.",
+                        "network_started": "Xarxa Z-Wave iniciada",
+                        "network_started_note_some_queried": "S'han consultat els nodes desperts. Els nodes adormits es consultaran quan es despertin.",
+                        "network_started_note_all_queried": "S'han consultat tots els nodes."
+                    },
+                    "services": {
+                        "start_network": "Inicia la xarxa",
+                        "stop_network": "Atura la xarxa",
+                        "heal_network": "Guareix la xarxa",
+                        "test_network": "Prova la xarxa",
+                        "soft_reset": "Reinici suau",
+                        "save_config": "Desa la configuració",
+                        "add_node_secure": "Afegeix node amb seguretat",
+                        "add_node": "Afegeix node",
+                        "remove_node": "Elimina node",
+                        "cancel_command": "Cancel·lar ordre"
+                    }
                 },
                 "users": {
                     "caption": "Usuaris",
diff --git a/translations/en.json b/translations/en.json
index 3786632a20..9e35f63f4d 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Manage your Z-Wave network"
+                    "description": "Manage your Z-Wave network",
+                    "network_management": {
+                        "header": "Z-Wave Network Management",
+                        "introduction": "Run commands that affect the Z-Wave network. You won't get feedback on whether most commands succeeded, but you can check the OZW Log to try to find out."
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave Network Stopped",
+                        "network_starting": "Starting Z-Wave Network...",
+                        "network_starting_note": "This may take a while depending on the size of your network.",
+                        "network_started": "Z-Wave Network Started",
+                        "network_started_note_some_queried": "Awake nodes have been queried. Sleeping nodes will be queried when they wake.",
+                        "network_started_note_all_queried": "All nodes have been queried."
+                    },
+                    "services": {
+                        "start_network": "Start Network",
+                        "stop_network": "Stop Network",
+                        "heal_network": "Heal Network",
+                        "test_network": "Test Network",
+                        "soft_reset": "Soft Reset",
+                        "save_config": "Save Config",
+                        "add_node_secure": "Add Node Secure",
+                        "add_node": "Add Node",
+                        "remove_node": "Remove Node",
+                        "cancel_command": "Cancel Command"
+                    }
                 },
                 "users": {
                     "caption": "Users",
diff --git a/translations/nb.json b/translations/nb.json
index ebc38b3287..16e51be52b 100644
--- a/translations/nb.json
+++ b/translations/nb.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Administrer ditt Z-Wave-nettverk"
+                    "description": "Administrer ditt Z-Wave-nettverk",
+                    "network_management": {
+                        "header": "Z-Wave nettverksadministrasjon",
+                        "introduction": "Kjør kommandoer som påvirker Z-Wave nettverket. Du får ikke tilbakemelding på om de fleste kommandoer lykkes, men du kan sjekke OZW-loggen for å prøve å finne det ut."
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave nettverket stoppet",
+                        "network_starting": "Starter Z-Wave nettverk...",
+                        "network_starting_note": "Dette kan ta en stund, avhengig av størrelsen på nettverket ditt.",
+                        "network_started": "Z-Wave nettverk startet",
+                        "network_started_note_some_queried": "Våkne noder har blitt forespurt. Sovende noder vil bli spurt når de våkner.",
+                        "network_started_note_all_queried": "Alle noder er forespurt."
+                    },
+                    "services": {
+                        "start_network": "Start nettverk",
+                        "stop_network": "Stopp nettverk",
+                        "heal_network": "Helbrede nettverk",
+                        "test_network": "Test nettverk",
+                        "soft_reset": "Myk tilbakestilling",
+                        "save_config": "Lagre konfigurasjon",
+                        "add_node_secure": "Legg til sikker node",
+                        "add_node": "Legg til node",
+                        "remove_node": "Fjern node",
+                        "cancel_command": "Avbryt kommando"
+                    }
                 },
                 "users": {
                     "caption": "Brukere",
diff --git a/translations/nl.json b/translations/nl.json
index 901fe5e902..79c758e823 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Beheer je Z-Wave-netwerk"
+                    "description": "Beheer je Z-Wave-netwerk",
+                    "network_management": {
+                        "header": "Z-Wave netwerkbeheer",
+                        "introduction": "Voer opdrachten uit die van invloed zijn op het Z-Wave-netwerk. Je krijgt geen feedback of de meeste commando's gelukt zijn, maar je kunt wel het OZW Logboek raadplegen om te proberen uit te vinden of het gelukt is."
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave netwerk gestopt",
+                        "network_starting": "Z-Wave netwerk starten...",
+                        "network_starting_note": "Dit kan een tijdje duren, afhankelijk van de grootte van uw netwerk.",
+                        "network_started": "Z-Wave Netwerk gestart",
+                        "network_started_note_some_queried": "Alle wakkere nodes zijn opgevraagd. Slapende nodes worden opgevraagd wanneer ze wakker worden.",
+                        "network_started_note_all_queried": "Alle nodes zijn opgevraagd."
+                    },
+                    "services": {
+                        "start_network": "Start netwerk",
+                        "stop_network": "Stop Netwerk",
+                        "heal_network": "Herstel Netwerk",
+                        "test_network": "Test Netwerk",
+                        "soft_reset": "Soft Reset",
+                        "save_config": "Configuratie Opslaan",
+                        "add_node_secure": "Toevoegen Node Secure",
+                        "add_node": "Node toevoegen",
+                        "remove_node": "Node verwijderen",
+                        "cancel_command": "Opdracht annuleren"
+                    }
                 },
                 "users": {
                     "caption": "Gebruikers",
diff --git a/translations/pl.json b/translations/pl.json
index 3312959568..d50e8d218b 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Zarządzaj swoją siecią Z-Wave"
+                    "description": "Zarządzaj swoją siecią Z-Wave",
+                    "network_management": {
+                        "header": "Zarządzanie siecią Z-Wave",
+                        "introduction": "Uruchom polecenia sterujące siecią Z-Wave. Nie otrzymasz informacji o tym, czy wykonanie poleceń się powiodło, ale możesz szukać informacji na ten temat w logu OZW."
+                    },
+                    "network_status": {
+                        "network_stopped": "Zatrzymano sieć Z-Wave",
+                        "network_starting": "Uruchamianie sieci Z-Wave ...",
+                        "network_starting_note": "Może to chwilę potrwać, w zależności od rozmiaru sieci.",
+                        "network_started": "Uruchomiono sieć Z-Wave",
+                        "network_started_note_some_queried": "Wybudzone węzły zostały odpytane. Niewybudzone węzły będą odpytane, kiedy się wybudzą.",
+                        "network_started_note_all_queried": "Wszystkie węzły zostały odpytane."
+                    },
+                    "services": {
+                        "start_network": "Uruchom sieć",
+                        "stop_network": "Zatrzymaj sieć",
+                        "heal_network": "Uzdrawiaj sieć",
+                        "test_network": "Testuj sieć",
+                        "soft_reset": "Miękki reset",
+                        "save_config": "Zapisz konfigurację",
+                        "add_node_secure": "Dodaj bezpieczny węzeł",
+                        "add_node": "Dodaj węzeł",
+                        "remove_node": "Usuń węzeł",
+                        "cancel_command": "Anuluj polecenie"
+                    }
                 },
                 "users": {
                     "caption": "Użytkownicy",
diff --git a/translations/ro.json b/translations/ro.json
index f7d4f6dc8c..bcba9b5c52 100644
--- a/translations/ro.json
+++ b/translations/ro.json
@@ -145,7 +145,8 @@
             "high_demand": "Consum mare",
             "heat_pump": "Pompă de căldură",
             "gas": "Gaz",
-            "manual": "Manual"
+            "manual": "Manual",
+            "heat_cool": "Auto"
         },
         "configurator": {
             "configure": "Configurează",
@@ -265,12 +266,21 @@
             "on": "Pornit",
             "paused": "Întrerupt",
             "returning": "În curs de întoarcere la doc"
+        },
+        "timer": {
+            "active": "activ"
+        },
+        "person": {
+            "home": "Acasă",
+            "not_home": "Plecat"
         }
     },
     "state_badge": {
         "default": {
             "unknown": "Nec",
-            "unavailable": "Indisp"
+            "unavailable": "Indisp",
+            "error": "Eroare",
+            "entity_not_found": "Entitatea nu a fost găsită"
         },
         "alarm_control_panel": {
             "armed": "Armat",
@@ -287,6 +297,10 @@
         "device_tracker": {
             "home": "Acasă",
             "not_home": "Plecat"
+        },
+        "person": {
+            "home": "Acasa",
+            "not_home": "Plecat"
         }
     },
     "ui": {
@@ -339,13 +353,30 @@
                                 "introduction": "Controlează-ți serverul Home Assistant ... chiar din Home Assistant.",
                                 "restart": "Repornire",
                                 "stop": "Oprire"
+                            },
+                            "core_config": {
+                                "edit_requires_storage": "Editorul a fost dezactivat deoarece configurația a fost stocata în configuration.yaml.",
+                                "location_name": "Numele instalarii Home Assistant",
+                                "latitude": "Latitudine",
+                                "longitude": "Longitudine",
+                                "elevation": "Altitudine",
+                                "elevation_meters": "metri",
+                                "time_zone": "Fus orar",
+                                "unit_system": "Unitatea De Sistem",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metric",
+                                "metric_example": "Celsius, kilograme",
+                                "save_button": "Salvați"
                             }
                         }
                     }
                 },
                 "customize": {
                     "caption": "Personalizare",
-                    "description": "Personalizați-vă entitățile"
+                    "description": "Personalizați-vă entitățile",
+                    "picker": {
+                        "header": "Personalizare"
+                    }
                 },
                 "automation": {
                     "caption": "Automatizări",
@@ -423,6 +454,11 @@
                                     "event": "Eveniment",
                                     "enter": "Intră",
                                     "leave": "Ieși"
+                                },
+                                "time_pattern": {
+                                    "hours": "Ore",
+                                    "minutes": "Minute",
+                                    "seconds": "Secunde"
                                 }
                             }
                         },
@@ -503,7 +539,8 @@
                                     "service_data": "Date serviciu"
                                 }
                             }
-                        }
+                        },
+                        "load_error_not_editable": "Numai automatizările din automations.yaml pot fi editate."
                     }
                 },
                 "script": {
@@ -512,7 +549,27 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Gestionați-vă rețeaua Z-Wave"
+                    "description": "Gestionați-vă rețeaua Z-Wave",
+                    "network_management": {
+                        "header": "Administrarea retelei Z-Wave"
+                    },
+                    "network_status": {
+                        "network_stopped": "Rețeaua Z-Wave Oprita",
+                        "network_starting": "Pornesc rețeaua Z-Wave ...",
+                        "network_starting_note": "Acest lucru poate dura ceva timp, în funcție de dimensiunea rețelei dvs.",
+                        "network_started": "Rețeaua Z-Wave a fost pornita"
+                    },
+                    "services": {
+                        "start_network": "Porniți rețeaua",
+                        "stop_network": "Opriți rețeaua",
+                        "test_network": "Testati Reteaua",
+                        "soft_reset": "Resetare soft",
+                        "save_config": "Salvați Configurația",
+                        "add_node_secure": "Adăugare nod securizat",
+                        "add_node": "Adăugare nod",
+                        "remove_node": "Eliminare nod",
+                        "cancel_command": "Anulați comanda"
+                    }
                 },
                 "users": {
                     "caption": "Utilizatori",
@@ -525,7 +582,15 @@
                         "change_password": "Schimbaţi parola",
                         "activate_user": "Activați utilizatorul",
                         "deactivate_user": "Dezactivați utilizatorul",
-                        "delete_user": "Ștergeți utilizatorul"
+                        "delete_user": "Ștergeți utilizatorul",
+                        "caption": "Vizualizați utilizatorul"
+                    },
+                    "add_user": {
+                        "caption": "Adăugați utilizator",
+                        "name": "Nume",
+                        "username": "Nume de utilizator",
+                        "password": "Parola",
+                        "create": "Creează"
                     }
                 },
                 "cloud": {
@@ -550,7 +615,61 @@
                         "via": "Conectat prin",
                         "firmware": "Firmware: {version}",
                         "device_unavailable": "dispozitiv indisponibil",
-                        "entity_unavailable": "Entitatea nu este disponibilă"
+                        "entity_unavailable": "Entitatea nu este disponibilă",
+                        "no_area": "Nici o zonă",
+                        "hub": "Conectat prin"
+                    },
+                    "config_flow": {
+                        "external_step": {
+                            "description": "Acest pas necesită să vizitați un site web extern pentru a fi finalizat.",
+                            "open_site": "Deschideți site-ul web"
+                        }
+                    }
+                },
+                "area_registry": {
+                    "create_area": "CREARE ZONĂ",
+                    "editor": {
+                        "default_name": "Zonă nouă",
+                        "delete": "ȘTERGEȚI",
+                        "update": "ACTUALIZAȚI",
+                        "create": "CREAȚI"
+                    },
+                    "picker": {
+                        "no_areas": "Se pare că nu ai nici o zonă încă!",
+                        "create_area": "CREARE ZONĂ"
+                    }
+                },
+                "entity_registry": {
+                    "picker": {
+                        "header": "Registrul de entități",
+                        "unavailable": "(indisponibil)"
+                    },
+                    "editor": {
+                        "unavailable": "Această entitate nu este disponibilă momentan.",
+                        "default_name": "Zonă nouă",
+                        "delete": "ȘTERGE",
+                        "update": "ACTUALIZAȚI"
+                    }
+                },
+                "person": {
+                    "caption": "Persoane",
+                    "description": "Gestionează persoanele pe care Home Assistant le urmărește.",
+                    "detail": {
+                        "name": "Nume",
+                        "device_tracker_intro": "Selectați dispozitivele care aparțin acestei persoane.",
+                        "device_tracker_picked": "Urmăriți dispozitivul",
+                        "device_tracker_pick": "Alegeți dispozitivul pentru a urmări"
+                    }
+                },
+                "zha": {
+                    "services": {
+                        "updateDeviceName": "Setați un nume personalizat pentru acest dispozitiv în registrul de dispozitive.",
+                        "remove": "Eliminați un dispozitiv din rețeaua ZigBee."
+                    },
+                    "device_card": {
+                        "device_name_placeholder": "Nume dat de utilizator",
+                        "area_picker_label": "Zonă",
+                        "update_name_button": "Actualizați numele"
                     }
                 }
             },
@@ -696,6 +815,24 @@
                             }
                         },
                         "command_line": {
+                            "step": {
+                                "init": {
+                                    "data": {
+                                        "username": "Utilizator",
+                                        "password": "Parola"
+                                    }
+                                },
+                                "mfa": {
+                                    "data": {
+                                        "code": "Cod Autentificare in doi pasi"
+                                    },
+                                    "description": "Deschide **{mfa_module_name}** pe dispozitivul tau pentru a vedea codul autentificare in doi pasi si a confirma identitatea:"
+                                }
+                            },
+                            "error": {
+                                "invalid_auth": "Utilizator sau parola invalida",
+                                "invalid_code": "Cod invalid pentru autentificare"
+                            },
                             "abort": {
                                 "login_expired": "Sesiunea a expirat, va rugam logati-va din nou."
                             }
@@ -711,11 +848,80 @@
                     "data": {
                         "name": "Nume",
                         "username": "Nume de utilizator",
-                        "password": "Parola"
+                        "password": "Parola",
+                        "password_confirm": "Confirmare parolă"
                     },
                     "create_account": "Creează cont",
                     "error": {
-                        "required_fields": "Completați toate câmpurile obligatorii"
+                        "required_fields": "Completați toate câmpurile obligatorii",
+                        "password_not_match": "Parolele nu se potrivesc"
+                    }
+                },
+                "core-config": {
+                    "intro_location": "Am vrea să știm unde locuiți. Aceste informații vă vor ajuta să afișați informații și să configurați automatizări bazate pe soare. Aceste date nu sunt niciodată distribuite în afara rețelei dvs.",
+                    "intro_location_detect": "Vă putem ajuta să completați aceste informații făcând o cerere unică unui serviciu extern.",
+                    "location_name_default": "Acasă",
+                    "button_detect": "Detecteaza",
+                    "finish": "Următorul"
+                }
+            },
+            "lovelace": {
+                "editor": {
+                    "edit_card": {
+                        "move": "Muta"
+                    },
+                    "raw_editor": {
+                        "header": "Editați configurația",
+                        "save": "Salvați",
+                        "unsaved_changes": "Modificări nesalvate",
+                        "saved": "Salvat"
+                    }
+                },
+                "cards": {
+                    "picture-elements": {
+                        "hold": "Țineți apăsat:",
+                        "navigate_to": "Navigați la {location}"
+                    }
+                },
+                "changed_toast": {
+                    "message": "Configurația Lovelace a fost actualizată, doriți să reîmprospătați?",
+                    "refresh": "Reîmprospătare"
+                },
+                "reload_lovelace": "Reîncarcă Lovelace"
+            },
+            "page-demo": {
+                "cards": {
+                    "demo": {
+                        "demo_by": "dupa {name}",
+                        "next_demo": "Următorul demo",
+                        "introduction": "Bine ai venit acasa! Ați ajuns la demo-ul Home Assistant, unde prezentăm cele mai bune interfețe utilizator, create de comunitatea noastră."
+                    }
+                },
+                "config": {
+                    "arsaboo": {
+                        "names": {
+                            "hallway": "Hol",
+                            "master_bedroom": "Dormitor Principal",
+                            "left": "Stânga",
+                            "right": "Dreapta",
+                            "mirror": "Oglindă"
+                        },
+                        "labels": {
+                            "lights": "Lumini",
+                            "information": "informație",
+                            "morning_commute": "Naveta De Dimineață",
+                            "commute_home": "Naveta la domiciliu",
+                            "entertainment": "Divertisment",
+                            "activity": "Activitate",
+                            "hdmi_input": "Intrare HDMI",
+                            "hdmi_switcher": "Comutator HDMI",
+                            "volume": "Volum",
+                            "total_tv_time": "Timp total de televiziune",
+                            "turn_tv_off": "Opriți televizorul"
+                        },
+                        "unit": {
+                            "minutes_abbr": "min"
+                        }
                     }
                 }
             }
@@ -732,7 +938,7 @@
             "day": "{count}{count, plural,\n  one { zi }\n  other { zile }\n}",
             "week": "{count}{count, plural,\n  one { săptămână }\n  other { săptămâni }\n}",
             "second": "{count} {count, plural,\none {secunda}\nother {secunde}\n}",
-            "minute": "{count} {count, plural,\n  one { minute }\n  other { minutes }\n}",
+            "minute": "{count} {count, plural,\n  one { minut }\n  other { minute }\n}",
             "hour": "{count}{count, plural,\n  one { zi }\n  other { zile }\n}"
         },
         "login-form": {
@@ -786,7 +992,8 @@
                 "clear_code": "Şterge",
                 "disarm": "Dezarmat",
                 "arm_home": "Armat acasă",
-                "arm_away": "Armat plecat"
+                "arm_away": "Armat plecat",
+                "arm_custom_bypass": "Bypass personalizat"
             },
             "automation": {
                 "last_triggered": "Ultima declanșare",
@@ -933,7 +1140,9 @@
         "weblink": "Legătură web",
         "zwave": "Z-Wave",
         "vacuum": "Aspirator",
-        "system_health": "Stare Sistem"
+        "hassio": "Hass.io",
+        "system_health": "Stare Sistem",
+        "person": "Persoană"
     },
     "attribute": {
         "weather": {
@@ -941,5 +1150,22 @@
             "visibility": "Vizibilitate",
             "wind_speed": "Viteza vântului"
         }
+    },
+    "groups": {
+        "system-admin": "Administratori",
+        "system-users": "Utilizatori",
+        "system-read-only": "Utilizatori cu drepturi de citire"
+    },
+    "state_attributes": {
+        "climate": {
+            "preset_mode": {
+                "none": "Nici unul",
+                "away": "Plecat",
+                "boost": "Boost",
+                "comfort": "Confort",
+                "home": "Acasă",
+                "activity": "Activitate"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/translations/ru.json b/translations/ru.json
index f8b44f6102..cf0013bdce 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Управляйте Вашей сетью Z-Wave"
+                    "description": "Управляйте Вашей сетью Z-Wave",
+                    "network_management": {
+                        "header": "Управление сетью Z-Wave",
+                        "introduction": "Управляйте сетью Z-Wave с помощью представленных команд. Информацию о результате выполненных команд Вы можете получить в журнале OZW."
+                    },
+                    "network_status": {
+                        "network_stopped": "Сеть Z-Wave отключена",
+                        "network_starting": "Запуск сети Z-Wave...",
+                        "network_starting_note": "Это может занять некоторое время в зависимости от размера Вашей сети.",
+                        "network_started": "Сеть Z-Wave работает",
+                        "network_started_note_some_queried": "Активные узлы были опрошены. Спящие узлы будут опрошены, когда выйдут из режима сна.",
+                        "network_started_note_all_queried": "Все узлы были опрошены."
+                    },
+                    "services": {
+                        "start_network": "Включить",
+                        "stop_network": "Отключить",
+                        "heal_network": "Исправить сеть",
+                        "test_network": "Тестировать",
+                        "soft_reset": "Сброс",
+                        "save_config": "Сохранить конфигурацию",
+                        "add_node_secure": "Добавить защищенный узел",
+                        "add_node": "Добавить узел",
+                        "remove_node": "Удалить узел",
+                        "cancel_command": "Отменить команду"
+                    }
                 },
                 "users": {
                     "caption": "Пользователи",
diff --git a/translations/sl.json b/translations/sl.json
index 74c6bf0a56..6bcb8a37b1 100644
--- a/translations/sl.json
+++ b/translations/sl.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Upravljajte Z-Wave omrežje"
+                    "description": "Upravljajte Z-Wave omrežje",
+                    "network_management": {
+                        "header": "Upravljanje z omrežjem Z-Wave",
+                        "introduction": "Zaženite ukaze, ki vplivajo na omrežje Z-Wave. Ne boste dobili povratne informacije o tem, ali je večina ukazov uspela, vendar lahko preverite dnevnik OZW, da boste izvedeli več."
+                    },
+                    "network_status": {
+                        "network_stopped": "Omrežje Z-Wave ustavljeno",
+                        "network_starting": "Zaganjam Z-Wave Omrežje...",
+                        "network_starting_note": "Odvisno od velikosti vašega omrežja, lahko to traja nekaj časa.",
+                        "network_started": "Z-Wave omrežje zagnano",
+                        "network_started_note_some_queried": "Budna vozlišča so bila poizvedana. Speča bodo, ko se zbudijo.",
+                        "network_started_note_all_queried": "Vsa vozlišča so bila poizvedena."
+                    },
+                    "services": {
+                        "start_network": "Zaženite omrežje",
+                        "stop_network": "Ustavite omrežje",
+                        "heal_network": "Pozdravite omrežje",
+                        "test_network": "Preizkusite omrežje",
+                        "soft_reset": "Resetiraj",
+                        "save_config": "Shrani konfiguracijo",
+                        "add_node_secure": "Dodaj vozlišče varno",
+                        "add_node": "Dodaj vozlišče",
+                        "remove_node": "Odstrani vozlišče",
+                        "cancel_command": "Prekliči ukaz"
+                    }
                 },
                 "users": {
                     "caption": "Uporabniki",
diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json
index 8d24ca4c25..a68f0349b8 100644
--- a/translations/zh-Hant.json
+++ b/translations/zh-Hant.json
@@ -572,7 +572,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "管理 Z-Wave 網絡"
+                    "description": "管理 Z-Wave 網絡",
+                    "network_management": {
+                        "header": "Z-Wave 網路管理",
+                        "introduction": "執行令命將會影響 Z-Wave 網路。將無法獲得回饋或指令是否成功執行，但可透過 OZW 日誌進行查詢。"
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave 網路已停止",
+                        "network_starting": "正在啟用 Z-Wave 網路...",
+                        "network_starting_note": "根據您的網路規模，啟用可能需要一點時間。",
+                        "network_started": "Z-Wave 網路已啟用",
+                        "network_started_note_some_queried": "已查詢喚醒之節點。睡眠中節點將於喚醒後進行查詢。",
+                        "network_started_note_all_queried": "已查詢所有節點。"
+                    },
+                    "services": {
+                        "start_network": "啟用網路",
+                        "stop_network": "停止網路",
+                        "heal_network": "修復網路",
+                        "test_network": "測試網路",
+                        "soft_reset": "重開機",
+                        "save_config": "儲存設定",
+                        "add_node_secure": "新增節點來源",
+                        "add_node": "新增節點",
+                        "remove_node": "移除節點",
+                        "cancel_command": "取消命令"
+                    }
                 },
                 "users": {
                     "caption": "用戶",

From 9eaeafdd6a40483ed1ba1bf8d98f54234f95d32d Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 15 Jul 2019 13:05:11 -0700
Subject: [PATCH 07/10] Bumped version to 20190715.0

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

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

From 07dee9c5bbd0be90ad526e15591c0888c5d5a16c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 15 Jul 2019 13:11:37 -0700
Subject: [PATCH 08/10] Update translations

---
 translations/af.json      |  3 +--
 translations/ar.json      |  5 ++---
 translations/bg.json      |  3 +--
 translations/bs.json      |  6 +++---
 translations/ca.json      |  3 +--
 translations/cs.json      |  3 +--
 translations/cy.json      |  4 ++--
 translations/da.json      |  3 +--
 translations/de.json      | 29 ++++++++++++++++++++++++++---
 translations/el.json      |  3 +--
 translations/en.json      |  3 +--
 translations/es-419.json  |  3 +--
 translations/es.json      |  3 +--
 translations/et.json      |  5 ++---
 translations/eu.json      |  3 +--
 translations/fa.json      |  1 -
 translations/fi.json      |  3 +--
 translations/fr.json      |  3 +--
 translations/gsw.json     |  1 -
 translations/he.json      |  3 +--
 translations/hi.json      |  6 +++---
 translations/hr.json      |  5 ++---
 translations/hu.json      |  3 +--
 translations/id.json      |  2 +-
 translations/is.json      |  3 +--
 translations/it.json      |  3 +--
 translations/ja.json      |  4 ++--
 translations/ko.json      |  3 +--
 translations/lb.json      |  3 +--
 translations/lv.json      |  5 ++---
 translations/nb.json      |  3 +--
 translations/nl.json      |  3 +--
 translations/nn.json      |  5 ++---
 translations/pl.json      |  3 +--
 translations/pt-BR.json   |  3 +--
 translations/pt.json      |  3 +--
 translations/ro.json      |  5 ++---
 translations/ru.json      |  3 +--
 translations/sk.json      |  3 +--
 translations/sl.json      |  3 +--
 translations/sv.json      |  3 +--
 translations/te.json      |  4 ++--
 translations/th.json      |  3 +--
 translations/tr.json      |  5 ++---
 translations/uk.json      |  5 ++---
 translations/vi.json      |  5 ++---
 translations/zh-Hans.json |  3 +--
 translations/zh-Hant.json |  3 +--
 48 files changed, 87 insertions(+), 105 deletions(-)

diff --git a/translations/af.json b/translations/af.json
index db6947cf97..acdb9cfc10 100644
--- a/translations/af.json
+++ b/translations/af.json
@@ -13,6 +13,7 @@
         "dev-templates": "Template",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Ontwikkelaar gereedskap",
         "calendar": "Kalender",
         "profile": "Profiel"
     },
@@ -720,7 +721,6 @@
                 },
                 "current_user": "U is tans aangemeld as {fullName} .",
                 "is_owner": "U is 'n eienaar.",
-                "logout": "Meld af",
                 "change_password": {
                     "header": "Verander Wagwoord",
                     "current_password": "Huidige Wagwoord",
@@ -933,7 +933,6 @@
         },
         "sidebar": {
             "log_out": "Meld af",
-            "developer_tools": "Ontwikkelaar gereedskap",
             "external_app_configuration": "App Konfigurasie"
         },
         "common": {
diff --git a/translations/ar.json b/translations/ar.json
index eec26a957e..bff8d2eabd 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -13,6 +13,7 @@
         "dev-templates": "نماذج",
         "dev-mqtt": "MQTT",
         "dev-info": "معلومات",
+        "developer_tools": "ادوات المطورين",
         "calendar": "التقويم",
         "profile": "الملف الشخصي"
     },
@@ -615,7 +616,6 @@
                 },
                 "current_user": "أنت مسجّل الدخول حاليًا كـ {fullName} .",
                 "is_owner": "أنت مالك",
-                "logout": "تسجيل الخروج",
                 "change_password": {
                     "header": "تغيير كلمة السر",
                     "current_password": "كلمة السر الحالية",
@@ -688,8 +688,7 @@
             }
         },
         "sidebar": {
-            "log_out": "تسجيل الخروج",
-            "developer_tools": "ادوات المطورين"
+            "log_out": "تسجيل الخروج"
         },
         "common": {
             "loading": "جار التحميل",
diff --git a/translations/bg.json b/translations/bg.json
index 6bc7062675..7852458272 100644
--- a/translations/bg.json
+++ b/translations/bg.json
@@ -13,6 +13,7 @@
         "dev-templates": "Шаблони",
         "dev-mqtt": "MQTT",
         "dev-info": "Информация",
+        "developer_tools": "Инструменти за разработчици",
         "calendar": "Календар",
         "profile": "Профил"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "В момента сте влезли като {fullName}.",
                 "is_owner": "Вие сте собственик.",
-                "logout": "Изход",
                 "change_password": {
                     "header": "Смяна на парола",
                     "current_password": "Настояща парола",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Изход",
-            "developer_tools": "Инструменти за разработчици",
             "external_app_configuration": "Конфигурация на приложение"
         },
         "common": {
diff --git a/translations/bs.json b/translations/bs.json
index 3da6c46eab..24e353834e 100644
--- a/translations/bs.json
+++ b/translations/bs.json
@@ -12,7 +12,8 @@
         "dev-events": "Događanja",
         "dev-templates": "Predlošci",
         "dev-mqtt": "MQTT",
-        "dev-info": "Info"
+        "dev-info": "Info",
+        "developer_tools": "Alatke za razvoj"
     },
     "state": {
         "default": {
@@ -263,8 +264,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Izlaz",
-            "developer_tools": "Alatke za razvoj"
+            "log_out": "Izlaz"
         },
         "common": {
             "loading": "Učitava",
diff --git a/translations/ca.json b/translations/ca.json
index e6aef3d220..551d5a0445 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -13,6 +13,7 @@
         "dev-templates": "Plantilles",
         "dev-mqtt": "MQTT",
         "dev-info": "Informació",
+        "developer_tools": "Eines per a desenvolupadors",
         "calendar": "Calendari",
         "profile": "Perfil"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "Has iniciat la sessió com a {fullName}.",
                 "is_owner": "Ets propietari.",
-                "logout": "Tancar sessió",
                 "change_password": {
                     "header": "Canvi de contrasenya",
                     "current_password": "Contrasenya actual",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Desconnectar",
-            "developer_tools": "Eines per a desenvolupadors",
             "external_app_configuration": "Configuració de l’aplicació"
         },
         "common": {
diff --git a/translations/cs.json b/translations/cs.json
index 6fe83e01c0..3daf029efd 100644
--- a/translations/cs.json
+++ b/translations/cs.json
@@ -13,6 +13,7 @@
         "dev-templates": "Šablony",
         "dev-mqtt": "MQTT",
         "dev-info": "Informace",
+        "developer_tools": "Vývojářské nástroje",
         "calendar": "Kalendář",
         "profile": "Profil"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Nyní jste přihlášeni jako {fullName}.",
                 "is_owner": "Jste vlastník.",
-                "logout": "Odhlásit se",
                 "change_password": {
                     "header": "Změnit heslo",
                     "current_password": "Současné heslo",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Odhlásit se",
-            "developer_tools": "Vývojářské nástroje",
             "external_app_configuration": "Konfigurace aplikace"
         },
         "common": {
diff --git a/translations/cy.json b/translations/cy.json
index 62de0150d8..15d682e36c 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -12,7 +12,8 @@
         "dev-events": "Digwyddiadau",
         "dev-templates": "Templedi",
         "dev-mqtt": "MQTT",
-        "dev-info": "Gwybodaeth"
+        "dev-info": "Gwybodaeth",
+        "developer_tools": "Offer datblygwr"
     },
     "state": {
         "default": {
@@ -849,7 +850,6 @@
         },
         "sidebar": {
             "log_out": "Allgofnodi",
-            "developer_tools": "Offer datblygwr",
             "external_app_configuration": "Ffurfweddu App"
         },
         "common": {
diff --git a/translations/da.json b/translations/da.json
index 402878acc2..fb8dc316f4 100644
--- a/translations/da.json
+++ b/translations/da.json
@@ -13,6 +13,7 @@
         "dev-templates": "Skabeloner",
         "dev-mqtt": "MQTT",
         "dev-info": "Udvikler Information",
+        "developer_tools": "Udviklerværktøjer",
         "calendar": "Kalender",
         "profile": "Profil"
     },
@@ -740,7 +741,6 @@
                 },
                 "current_user": "Du er logget ind som {fullName} .",
                 "is_owner": "Du er ejer.",
-                "logout": "Log af",
                 "change_password": {
                     "header": "Skift adgangskode",
                     "current_password": "Nuværende adgangskode",
@@ -1013,7 +1013,6 @@
         },
         "sidebar": {
             "log_out": "Log af",
-            "developer_tools": "Udviklerværktøjer",
             "external_app_configuration": "App Konfiguration"
         },
         "common": {
diff --git a/translations/de.json b/translations/de.json
index bce922b430..6c270db21d 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -13,6 +13,7 @@
         "dev-templates": "Templates",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Entwicklerwerkzeuge",
         "calendar": "Kalender",
         "profile": "Profil"
     },
@@ -572,7 +573,31 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Z-Wave-Netzwerk verwalten"
+                    "description": "Z-Wave-Netzwerk verwalten",
+                    "network_management": {
+                        "header": "Z-Wave Netzwerkverwaltung",
+                        "introduction": "Führt Befehle aus, die das Z-Wave Netzwerk betreffen. Es wird keine Rückmeldung darüber geben, ob die meisten Befehle erfolgreich waren, aber das OZW-Protokoll kann Hinweise darauf enthalten."
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave Netzwerk gestoppt",
+                        "network_starting": "Z-Wave Netzwerk wird gestartet ...",
+                        "network_starting_note": "Dies kann je nach Größe des Netzwerks eine Weile dauern.",
+                        "network_started": "Z-Wave Netzwerk gestartet",
+                        "network_started_note_some_queried": "Wache Knoten wurden abgefragt. Schlafende knoten werden abgefragt wenn sie aufwachen.",
+                        "network_started_note_all_queried": "Alle Knoten wurden abgefragt."
+                    },
+                    "services": {
+                        "start_network": "Netzwerk starten",
+                        "stop_network": "Netzwerk stoppen",
+                        "heal_network": "Netzwerk heilen",
+                        "test_network": "Netzwerk testen",
+                        "soft_reset": "Soft Reset",
+                        "save_config": "Konfiguration speichern",
+                        "add_node_secure": "Knoten verschlüsselt hinzufügen",
+                        "add_node": "Knoten hinzufügen",
+                        "remove_node": "Knoten entfernen",
+                        "cancel_command": "Befehl abbrechen"
+                    }
                 },
                 "users": {
                     "caption": "Benutzer",
@@ -745,7 +770,6 @@
                 },
                 "current_user": "Du bist derzeit als {fullName} angemeldet.",
                 "is_owner": "Du bist der Besitzer",
-                "logout": "Abmelden",
                 "change_password": {
                     "header": "Passwort ändern",
                     "current_password": "Aktuelles Passwort",
@@ -1019,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Abmelden",
-            "developer_tools": "Entwicklerwerkzeuge",
             "external_app_configuration": "App-Konfiguration"
         },
         "common": {
diff --git a/translations/el.json b/translations/el.json
index f0d93a4ec5..62455cf532 100644
--- a/translations/el.json
+++ b/translations/el.json
@@ -13,6 +13,7 @@
         "dev-templates": "Πρότυπα",
         "dev-mqtt": "MQTT",
         "dev-info": "Πληροφορίες",
+        "developer_tools": "Εργαλεία προγραμματιστή",
         "calendar": "Ημερολόγιο",
         "profile": "Προφίλ"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Αυτήν τη στιγμή είστε συνδεδεμένος ως {fullName} .",
                 "is_owner": "Είστε ιδιοκτήτης.",
-                "logout": "Αποσύνδεση",
                 "change_password": {
                     "header": "Αλλαγή Κωδικού",
                     "current_password": "Τρέχων κωδικός",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Αποσύνδεση",
-            "developer_tools": "Εργαλεία προγραμματιστή",
             "external_app_configuration": "Διαμόρφωση Εφαρμογής"
         },
         "common": {
diff --git a/translations/en.json b/translations/en.json
index 9e35f63f4d..ee0ffd6cc7 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -13,6 +13,7 @@
         "dev-templates": "Templates",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Developer tools",
         "calendar": "Calendar",
         "profile": "Profile"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "You are currently logged in as {fullName}.",
                 "is_owner": "You are an owner.",
-                "logout": "Log out",
                 "change_password": {
                     "header": "Change Password",
                     "current_password": "Current Password",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Log out",
-            "developer_tools": "Developer tools",
             "external_app_configuration": "App Configuration"
         },
         "common": {
diff --git a/translations/es-419.json b/translations/es-419.json
index 2f40a5737d..207648c725 100644
--- a/translations/es-419.json
+++ b/translations/es-419.json
@@ -13,6 +13,7 @@
         "dev-templates": "Plantillas",
         "dev-mqtt": "",
         "dev-info": "Información",
+        "developer_tools": "Herramientas para desarrolladores",
         "calendar": "Calendario",
         "profile": "Perfil"
     },
@@ -745,7 +746,6 @@
                 },
                 "current_user": "Actualmente estás conectado como {fullName} .",
                 "is_owner": "Eres propietario.",
-                "logout": "Cerrar sesión",
                 "change_password": {
                     "header": "Cambiar contraseña",
                     "current_password": "Contraseña actual",
@@ -1019,7 +1019,6 @@
         },
         "sidebar": {
             "log_out": "Cerrar sesión",
-            "developer_tools": "Herramientas para desarrolladores",
             "external_app_configuration": "Configuración de la aplicación"
         },
         "common": {
diff --git a/translations/es.json b/translations/es.json
index cc65d59300..927f562bbe 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -13,6 +13,7 @@
         "dev-templates": "Plantillas",
         "dev-mqtt": "MQTT",
         "dev-info": "Información",
+        "developer_tools": "Herramientas para desarrolladores",
         "calendar": "Calendario",
         "profile": "Perfil"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Has iniciado sesión como {fullName} .",
                 "is_owner": "Eres propietario.",
-                "logout": "Cerrar sesión",
                 "change_password": {
                     "header": "Cambiar contraseña",
                     "current_password": "Contraseña actual",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Cerrar sesión",
-            "developer_tools": "Herramientas para desarrolladores",
             "external_app_configuration": "Configuración de la aplicación"
         },
         "common": {
diff --git a/translations/et.json b/translations/et.json
index 6beca61e66..2c32904445 100644
--- a/translations/et.json
+++ b/translations/et.json
@@ -13,6 +13,7 @@
         "dev-templates": "Mallid",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Arendaja tööriistad",
         "calendar": "Kalender",
         "profile": "Profiil"
     },
@@ -711,7 +712,6 @@
                 },
                 "current_user": "Oled praegu sisse logitud kui {fullName}.",
                 "is_owner": "Oled omanik.",
-                "logout": "Logi välja",
                 "change_password": {
                     "header": "Muuda salasõna",
                     "current_password": "Praegune salasõna",
@@ -905,8 +905,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Logi välja",
-            "developer_tools": "Arendaja tööriistad"
+            "log_out": "Logi välja"
         },
         "common": {
             "loading": "Laadimine",
diff --git a/translations/eu.json b/translations/eu.json
index ed80a1161e..48bddcd407 100644
--- a/translations/eu.json
+++ b/translations/eu.json
@@ -13,6 +13,7 @@
         "dev-templates": "Txantiloiak",
         "dev-mqtt": "MQTT",
         "dev-info": "Informazioa",
+        "developer_tools": "Garatzaileentzako tresnak",
         "calendar": "Egutegia",
         "profile": "Profila"
     },
@@ -553,7 +554,6 @@
                 },
                 "current_user": "{fullName} moduan hasi duzu saioa.",
                 "is_owner": "Jabea zara",
-                "logout": "Saioa itxi",
                 "change_password": {
                     "header": "Pasahitza aldatu",
                     "current_password": "Egungo pasahitza",
@@ -726,7 +726,6 @@
         },
         "sidebar": {
             "log_out": "Saioa itxi",
-            "developer_tools": "Garatzaileentzako tresnak",
             "external_app_configuration": "Aplikazioaren Konfigurazioa"
         },
         "common": {
diff --git a/translations/fa.json b/translations/fa.json
index f614f4dc8f..76ca649b56 100644
--- a/translations/fa.json
+++ b/translations/fa.json
@@ -656,7 +656,6 @@
                     "not_used": "هرگز استفاده نشده است"
                 },
                 "current_user": "شما در حال حاضر به عنوان {fullName} وارد شده اید.",
-                "logout": "خروج",
                 "change_password": {
                     "header": "تغییر رمز عبور"
                 },
diff --git a/translations/fi.json b/translations/fi.json
index 2f5b9b9962..9ce7e8f76e 100644
--- a/translations/fi.json
+++ b/translations/fi.json
@@ -13,6 +13,7 @@
         "dev-templates": "Mallit",
         "dev-mqtt": "MQTT",
         "dev-info": "Tiedot",
+        "developer_tools": "Kehittäjän työkalut",
         "calendar": "Kalenteri",
         "profile": "Profiili"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Olet tällä hetkellä kirjautuneena tunnuksella {fullName}.",
                 "is_owner": "Olet omistaja.",
-                "logout": "Kirjaudu ulos",
                 "change_password": {
                     "header": "Vaihda salasana",
                     "current_password": "Nykyinen salasana",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Kirjaudu ulos",
-            "developer_tools": "Kehittäjän työkalut",
             "external_app_configuration": "Sovelluksen määritykset"
         },
         "common": {
diff --git a/translations/fr.json b/translations/fr.json
index 911223f365..ab54cf2764 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -13,6 +13,7 @@
         "dev-templates": "Templates",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Outils de développement",
         "calendar": "Calendrier",
         "profile": "Profil"
     },
@@ -745,7 +746,6 @@
                 },
                 "current_user": "Vous êtes actuellement connecté tant que {fullName}.",
                 "is_owner": "Vous êtes propriétaire",
-                "logout": "Déconnexion",
                 "change_password": {
                     "header": "Changer le mot de passe",
                     "current_password": "Mot de passe actuel",
@@ -1019,7 +1019,6 @@
         },
         "sidebar": {
             "log_out": "Déconnexion",
-            "developer_tools": "Outils de développement",
             "external_app_configuration": "Configuration de l'application"
         },
         "common": {
diff --git a/translations/gsw.json b/translations/gsw.json
index be5039ff9c..bb44bd5fb2 100644
--- a/translations/gsw.json
+++ b/translations/gsw.json
@@ -399,7 +399,6 @@
                     "prompt_name": "Name?"
                 },
                 "is_owner": "Du bisch dr Bsitzer",
-                "logout": "Uslogge",
                 "change_password": {
                     "header": "Passwort wächsle",
                     "current_password": "Aktuells Passwort",
diff --git a/translations/he.json b/translations/he.json
index 09f9d41b60..4e016f5ac5 100644
--- a/translations/he.json
+++ b/translations/he.json
@@ -13,6 +13,7 @@
         "dev-templates": "תבניות",
         "dev-mqtt": "MQTT",
         "dev-info": "מידע",
+        "developer_tools": "כלים למפתחים",
         "calendar": "לוח שנה",
         "profile": "פרופיל"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "אתה מחובר כעת כ- {fullName} .",
                 "is_owner": "אתה הבעלים.",
-                "logout": "התנתק",
                 "change_password": {
                     "header": "שינוי סיסמה",
                     "current_password": "סיסמה נוכחית",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "התנתק",
-            "developer_tools": "כלים למפתחים",
             "external_app_configuration": "הגדרות היישום"
         },
         "common": {
diff --git a/translations/hi.json b/translations/hi.json
index 4770ce525c..b5ed116b23 100644
--- a/translations/hi.json
+++ b/translations/hi.json
@@ -11,7 +11,8 @@
         "dev-events": "घटनाओं",
         "dev-templates": "टेम्पलेट्स",
         "dev-mqtt": "MQTT",
-        "dev-info": "जानकारी"
+        "dev-info": "जानकारी",
+        "developer_tools": "डेवलपर उपकरण"
     },
     "state": {
         "default": {
@@ -206,8 +207,7 @@
             }
         },
         "sidebar": {
-            "log_out": "लॉग आउट",
-            "developer_tools": "डेवलपर उपकरण"
+            "log_out": "लॉग आउट"
         }
     },
     "domain": {
diff --git a/translations/hr.json b/translations/hr.json
index 2ae78ce711..e4e7d63d99 100644
--- a/translations/hr.json
+++ b/translations/hr.json
@@ -13,6 +13,7 @@
         "dev-templates": "Predlošci",
         "dev-mqtt": "MQTT",
         "dev-info": "Informacije",
+        "developer_tools": "Razvojni alati",
         "calendar": "Kalendar",
         "profile": "Profil"
     },
@@ -588,7 +589,6 @@
                 },
                 "current_user": "Trenutačno ste prijavljeni kao {fullName} .",
                 "is_owner": "Vi ste vlasnik.",
-                "logout": "Odjava",
                 "change_password": {
                     "header": "Promijeni lozinku",
                     "current_password": "Trenutna lozinka",
@@ -750,8 +750,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Odjava",
-            "developer_tools": "Razvojni alati"
+            "log_out": "Odjava"
         },
         "common": {
             "loading": "Učitavam",
diff --git a/translations/hu.json b/translations/hu.json
index 5cbb2ce7e9..f4d0d9fc7f 100644
--- a/translations/hu.json
+++ b/translations/hu.json
@@ -13,6 +13,7 @@
         "dev-templates": "Sablonok",
         "dev-mqtt": "MQTT",
         "dev-info": "Infó",
+        "developer_tools": "Fejlesztői eszközök",
         "calendar": "Naptár",
         "profile": "Profil"
     },
@@ -745,7 +746,6 @@
                 },
                 "current_user": "Jelenleg {fullName} felhasználóként vagy bejelentkezve.",
                 "is_owner": "Tulajdonos vagy.",
-                "logout": "Kijelentkezés",
                 "change_password": {
                     "header": "Jelszó Módosítása",
                     "current_password": "Jelenlegi Jelszó",
@@ -1019,7 +1019,6 @@
         },
         "sidebar": {
             "log_out": "Kijelentkezés",
-            "developer_tools": "Fejlesztői eszközök",
             "external_app_configuration": "App Konfiguráció"
         },
         "common": {
diff --git a/translations/id.json b/translations/id.json
index 63bc82b0a6..e4156af4e9 100644
--- a/translations/id.json
+++ b/translations/id.json
@@ -13,6 +13,7 @@
         "dev-templates": "Template",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Alat pengembang",
         "calendar": "Kalender"
     },
     "state": {
@@ -805,7 +806,6 @@
         },
         "sidebar": {
             "log_out": "Keluar",
-            "developer_tools": "Alat pengembang",
             "external_app_configuration": "Konfigurasi Aplikasi"
         },
         "common": {
diff --git a/translations/is.json b/translations/is.json
index 87a66f4a5e..7dff987057 100644
--- a/translations/is.json
+++ b/translations/is.json
@@ -13,6 +13,7 @@
         "dev-templates": "Skapalón",
         "dev-mqtt": "MQTT",
         "dev-info": "Upplýsingar",
+        "developer_tools": "Þróunarverkfæri",
         "calendar": "Dagatal",
         "profile": "Prófíll"
     },
@@ -664,7 +665,6 @@
                 },
                 "current_user": "Þú ert skráð(ur) inn sem {fullName}.",
                 "is_owner": "Þú ert eigandi.",
-                "logout": "Skrá út",
                 "change_password": {
                     "header": "Breyta lykilorði",
                     "current_password": "Núverandi lykilorð",
@@ -919,7 +919,6 @@
         },
         "sidebar": {
             "log_out": "Skrá út",
-            "developer_tools": "Þróunarverkfæri",
             "external_app_configuration": "Stillingar forrits"
         },
         "common": {
diff --git a/translations/it.json b/translations/it.json
index 46962c8965..fff35ed5a1 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -13,6 +13,7 @@
         "dev-templates": "Modelli",
         "dev-mqtt": "MQTT",
         "dev-info": "Informazioni",
+        "developer_tools": "Strumenti per gli sviluppatori",
         "calendar": "Calendario",
         "profile": "Profilo"
     },
@@ -745,7 +746,6 @@
                 },
                 "current_user": "Sei attualmente connesso come {fullName} .",
                 "is_owner": "Sei un proprietario.",
-                "logout": "Esci",
                 "change_password": {
                     "header": "Cambia password",
                     "current_password": "Password corrente",
@@ -1019,7 +1019,6 @@
         },
         "sidebar": {
             "log_out": "Esci",
-            "developer_tools": "Strumenti per gli sviluppatori",
             "external_app_configuration": "Configurazione App"
         },
         "common": {
diff --git a/translations/ja.json b/translations/ja.json
index 7ce3e3aeaf..847c6ccbfe 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -11,6 +11,7 @@
         "dev-events": "イベント",
         "dev-templates": "テンプレート",
         "dev-mqtt": "MQTT",
+        "developer_tools": "開発者ツール",
         "calendar": "カレンダー"
     },
     "state": {
@@ -331,8 +332,7 @@
             }
         },
         "sidebar": {
-            "log_out": "ログアウト",
-            "developer_tools": "開発者ツール"
+            "log_out": "ログアウト"
         },
         "common": {
             "loading": "読込中",
diff --git a/translations/ko.json b/translations/ko.json
index 708c88ce36..0e0c2cac62 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -13,6 +13,7 @@
         "dev-templates": "템플릿",
         "dev-mqtt": "MQTT",
         "dev-info": "정보",
+        "developer_tools": "개발자도구",
         "calendar": "캘린더",
         "profile": "프로필"
     },
@@ -745,7 +746,6 @@
                 },
                 "current_user": "현재 {fullName} 로(으로) 로그인 한 상태 입니다.",
                 "is_owner": "관리자 계정 입니다.",
-                "logout": "로그아웃",
                 "change_password": {
                     "header": "비밀번호 변경",
                     "current_password": "현재 비밀번호",
@@ -1019,7 +1019,6 @@
         },
         "sidebar": {
             "log_out": "로그아웃",
-            "developer_tools": "개발자도구",
             "external_app_configuration": "앱 구성"
         },
         "common": {
diff --git a/translations/lb.json b/translations/lb.json
index a7c069cc23..0d727e0122 100644
--- a/translations/lb.json
+++ b/translations/lb.json
@@ -13,6 +13,7 @@
         "dev-templates": "Modeller",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Entwécklungsgeschir",
         "calendar": "Kalenner",
         "profile": "Profil"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Dir sidd aktuell ageloggt als {fullName}.",
                 "is_owner": "Dir sidd Proprietär.",
-                "logout": "Ausloggen",
                 "change_password": {
                     "header": "Passwuert änneren",
                     "current_password": "Aktuellt Passwuert",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Ausloggen",
-            "developer_tools": "Entwécklungsgeschir",
             "external_app_configuration": "App Konfiguratioun"
         },
         "common": {
diff --git a/translations/lv.json b/translations/lv.json
index ae082849e9..8974de86ce 100644
--- a/translations/lv.json
+++ b/translations/lv.json
@@ -13,6 +13,7 @@
         "dev-templates": "Veidnes",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Izstrādātāju rīki",
         "calendar": "Kalendārs",
         "profile": "Profils"
     },
@@ -630,7 +631,6 @@
                 },
                 "current_user": "Jūs šobrīd esat pieteicies kā {fullName}.",
                 "is_owner": "Jūs esat īpašnieks.",
-                "logout": "Atteikties",
                 "change_password": {
                     "header": "Mainīt paroli",
                     "current_password": "Pašreizējā parole",
@@ -825,8 +825,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Iziet",
-            "developer_tools": "Izstrādātāju rīki"
+            "log_out": "Iziet"
         },
         "common": {
             "loading": "Ielāde",
diff --git a/translations/nb.json b/translations/nb.json
index 16e51be52b..5f3d33ba65 100644
--- a/translations/nb.json
+++ b/translations/nb.json
@@ -13,6 +13,7 @@
         "dev-templates": "Maler",
         "dev-mqtt": "MQTT",
         "dev-info": "Informasjon",
+        "developer_tools": "Utviklerverktøy",
         "calendar": "Kalender",
         "profile": "Profil"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "Du er logget inn som {fullName}.",
                 "is_owner": "Du er en eier.",
-                "logout": "Logg ut",
                 "change_password": {
                     "header": "Endre passord",
                     "current_password": "Nåværende passord",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Logg ut",
-            "developer_tools": "Utviklerverktøy",
             "external_app_configuration": "Appkonfigurasjon"
         },
         "common": {
diff --git a/translations/nl.json b/translations/nl.json
index 79c758e823..ea1190939b 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -13,6 +13,7 @@
         "dev-templates": "Sjablonen",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Ontwikkelaarstools",
         "calendar": "Kalender",
         "profile": "Profiel"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "U bent momenteel ingelogd als {fullName}.",
                 "is_owner": "U bent eigenaar.",
-                "logout": "Uitloggen",
                 "change_password": {
                     "header": "Wachtwoord wijzigen",
                     "current_password": "Huidige wachtwoord",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Uitloggen",
-            "developer_tools": "Ontwikkelaarstools",
             "external_app_configuration": "App configuratie"
         },
         "common": {
diff --git a/translations/nn.json b/translations/nn.json
index 14ab7f6123..17b3aeaa4c 100644
--- a/translations/nn.json
+++ b/translations/nn.json
@@ -13,6 +13,7 @@
         "dev-templates": "Malar",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Utviklarverkty",
         "calendar": "Kalendrar",
         "profile": "Profil"
     },
@@ -740,7 +741,6 @@
                 },
                 "current_user": "Du er for augeblinken logga inn som {fullName}.",
                 "is_owner": "Du er ein eigar",
-                "logout": "Logg ut",
                 "change_password": {
                     "header": "Bytt passord",
                     "current_password": "Noverande passord",
@@ -986,8 +986,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Logg ut",
-            "developer_tools": "Utviklarverkty"
+            "log_out": "Logg ut"
         },
         "common": {
             "loading": "Lastar",
diff --git a/translations/pl.json b/translations/pl.json
index d50e8d218b..6001b6a8dc 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -13,6 +13,7 @@
         "dev-templates": "Szablony",
         "dev-mqtt": "MQTT",
         "dev-info": "Informacje",
+        "developer_tools": "Narzędzia deweloperskie",
         "calendar": "Kalendarz",
         "profile": "Profil"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "Jesteś obecnie zalogowany jako {fullName}.",
                 "is_owner": "Jesteś właścicielem.",
-                "logout": "Wyloguj",
                 "change_password": {
                     "header": "Zmień hasło",
                     "current_password": "Bieżące hasło",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Wyloguj",
-            "developer_tools": "Narzędzia deweloperskie",
             "external_app_configuration": "Konfiguracja aplikacji"
         },
         "common": {
diff --git a/translations/pt-BR.json b/translations/pt-BR.json
index 16e9ff907d..c88be5b110 100644
--- a/translations/pt-BR.json
+++ b/translations/pt-BR.json
@@ -13,6 +13,7 @@
         "dev-templates": "Modelos",
         "dev-mqtt": "",
         "dev-info": "Informações",
+        "developer_tools": "Ferramentas do desenvolvedor",
         "calendar": "Calendário",
         "profile": "Perfil"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Você está logado como {fullName} .",
                 "is_owner": "Você é um proprietário.",
-                "logout": "Sair",
                 "change_password": {
                     "header": "Alterar senha",
                     "current_password": "Senha atual",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Sair",
-            "developer_tools": "Ferramentas do desenvolvedor",
             "external_app_configuration": "Configuração do aplicativo"
         },
         "common": {
diff --git a/translations/pt.json b/translations/pt.json
index f61022bb11..c9e196dcf9 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -13,6 +13,7 @@
         "dev-templates": "Modelos",
         "dev-mqtt": "MQTT",
         "dev-info": "Informações",
+        "developer_tools": "Ferramentas de programação",
         "calendar": "Calendário",
         "profile": "Perfil"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Esta atualmente ligado como {fullName}",
                 "is_owner": "Você é um proprietário.",
-                "logout": "Sair",
                 "change_password": {
                     "header": "Alterar palavra-passe",
                     "current_password": "Palavra-passe atual",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Sair",
-            "developer_tools": "Ferramentas de programação",
             "external_app_configuration": "Configuração da Aplicação"
         },
         "common": {
diff --git a/translations/ro.json b/translations/ro.json
index bcba9b5c52..372d1e342c 100644
--- a/translations/ro.json
+++ b/translations/ro.json
@@ -13,6 +13,7 @@
         "dev-templates": "Sabloane",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Instrumente de dezvoltare",
         "calendar": "Calendar",
         "profile": "Profil"
     },
@@ -721,7 +722,6 @@
                 },
                 "current_user": "În prezent sunteți conectat ca {fullName} .",
                 "is_owner": "Sunteți proprietar.",
-                "logout": "Deconectați-vă",
                 "change_password": {
                     "header": "Schimbaţi parola",
                     "current_password": "Parola Curentă",
@@ -927,8 +927,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Deconectare",
-            "developer_tools": "Instrumente de dezvoltare"
+            "log_out": "Deconectare"
         },
         "common": {
             "loading": "Se încarcă",
diff --git a/translations/ru.json b/translations/ru.json
index cf0013bdce..2515a80f54 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -13,6 +13,7 @@
         "dev-templates": "Шаблоны",
         "dev-mqtt": "MQTT",
         "dev-info": "Информация",
+        "developer_tools": "Инструменты разработчика",
         "calendar": "Календарь",
         "profile": "Профиль"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "Добро пожаловать, {fullName}! Вы вошли в систему.",
                 "is_owner": "Вы являетесь владельцем.",
-                "logout": "Выйти",
                 "change_password": {
                     "header": "Изменить пароль",
                     "current_password": "Текущий пароль",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Выход",
-            "developer_tools": "Инструменты разработчика",
             "external_app_configuration": "Настройки приложения"
         },
         "common": {
diff --git a/translations/sk.json b/translations/sk.json
index 6e7488b87a..bd3496997b 100644
--- a/translations/sk.json
+++ b/translations/sk.json
@@ -13,6 +13,7 @@
         "dev-templates": "Šablóny",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Vývojárske nástroje",
         "calendar": "Kalendár",
         "profile": "Profil"
     },
@@ -745,7 +746,6 @@
                 },
                 "current_user": "Momentálne ste prihlásení ako {fullName}.",
                 "is_owner": "Ste vlastníkom.",
-                "logout": "Odhlásiť sa",
                 "change_password": {
                     "header": "Zmena hesla",
                     "current_password": "Aktuálne heslo",
@@ -1019,7 +1019,6 @@
         },
         "sidebar": {
             "log_out": "Odhlásiť sa",
-            "developer_tools": "Vývojárske nástroje",
             "external_app_configuration": "Konfigurácia aplikácie"
         },
         "common": {
diff --git a/translations/sl.json b/translations/sl.json
index 6bcb8a37b1..afd4806eea 100644
--- a/translations/sl.json
+++ b/translations/sl.json
@@ -13,6 +13,7 @@
         "dev-templates": "Predloge",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Orodja za razvijalce",
         "calendar": "Koledar",
         "profile": "Profil"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "Trenutno ste prijavljeni kot {fullName} .",
                 "is_owner": "Ste lastnik.",
-                "logout": "Odjava",
                 "change_password": {
                     "header": "Spremeni geslo",
                     "current_password": "Trenutno geslo",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "Odjava",
-            "developer_tools": "Orodja za razvijalce",
             "external_app_configuration": "Konfiguracija aplikacije"
         },
         "common": {
diff --git a/translations/sv.json b/translations/sv.json
index d3e0f225bc..2d9b0986e0 100644
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -13,6 +13,7 @@
         "dev-templates": "Mallar",
         "dev-mqtt": "MQTT",
         "dev-info": "Info",
+        "developer_tools": "Utvecklarverktyg",
         "calendar": "Kalender",
         "profile": "Profil"
     },
@@ -744,7 +745,6 @@
                 },
                 "current_user": "Du är inloggad som {fullName}.",
                 "is_owner": "Du är en ägare.",
-                "logout": "Logga ut",
                 "change_password": {
                     "header": "Ändra lösenord",
                     "current_password": "Nuvarande lösenord",
@@ -1018,7 +1018,6 @@
         },
         "sidebar": {
             "log_out": "Logga ut",
-            "developer_tools": "Utvecklarverktyg",
             "external_app_configuration": "Appkonfiguration"
         },
         "common": {
diff --git a/translations/te.json b/translations/te.json
index 439409d5f1..a9c750d869 100644
--- a/translations/te.json
+++ b/translations/te.json
@@ -13,6 +13,7 @@
         "dev-templates": "టెంప్లేట్లు",
         "dev-mqtt": "MQTT",
         "dev-info": "సమాచారం",
+        "developer_tools": "డెవలపర్ టూల్స్",
         "calendar": "క్యాలెండర్"
     },
     "state": {
@@ -526,8 +527,7 @@
             }
         },
         "sidebar": {
-            "log_out": "లాగ్ అవుట్",
-            "developer_tools": "డెవలపర్ టూల్స్"
+            "log_out": "లాగ్ అవుట్"
         },
         "common": {
             "loading": "లోడింగ్",
diff --git a/translations/th.json b/translations/th.json
index 841c5a5f59..50d72192c7 100644
--- a/translations/th.json
+++ b/translations/th.json
@@ -13,6 +13,7 @@
         "dev-templates": "แม่แบบ",
         "dev-mqtt": "MQTT",
         "dev-info": "ข้อมูล",
+        "developer_tools": "เครื่องมือสำหรับนักพัฒนา",
         "calendar": "ปฏิทิน",
         "profile": "ข้อมูลส่วนตัว"
     },
@@ -743,7 +744,6 @@
                 },
                 "current_user": "ขณะนี้คุณเข้าสู่ระบบในชื่อ {fullName}",
                 "is_owner": "ในฐานะ \"เจ้าของ\"",
-                "logout": "ชื่อผู้ใช้",
                 "change_password": {
                     "header": "เปลี่ยนรหัสผ่าน",
                     "current_password": "รหัสผ่านปัจจุบัน",
@@ -974,7 +974,6 @@
         },
         "sidebar": {
             "log_out": "ออกจากระบบ",
-            "developer_tools": "เครื่องมือสำหรับนักพัฒนา",
             "external_app_configuration": "การกำหนดค่าแอพ"
         },
         "common": {
diff --git a/translations/tr.json b/translations/tr.json
index 5bc5c77aa9..6d10e633b0 100644
--- a/translations/tr.json
+++ b/translations/tr.json
@@ -13,6 +13,7 @@
         "dev-templates": "Taslaklar",
         "dev-mqtt": "MQTT",
         "dev-info": "Bilgi",
+        "developer_tools": "Geliştirici araçları",
         "calendar": "Takvim",
         "profile": "Profil"
     },
@@ -529,7 +530,6 @@
                 },
                 "current_user": "{fullName} olarak giriş yaptınız.",
                 "is_owner": "Sahipsiniz.",
-                "logout": "Çıkış yap",
                 "change_password": {
                     "header": "Parolayı Değiştir",
                     "current_password": "Güncel Parola",
@@ -680,8 +680,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Çıkış yap",
-            "developer_tools": "Geliştirici araçları"
+            "log_out": "Çıkış yap"
         },
         "common": {
             "loading": "Yükleniyor",
diff --git a/translations/uk.json b/translations/uk.json
index bee3ff3e0e..f4528c3b2d 100644
--- a/translations/uk.json
+++ b/translations/uk.json
@@ -13,6 +13,7 @@
         "dev-templates": "Шаблони",
         "dev-mqtt": "MQTT",
         "dev-info": "Інформація",
+        "developer_tools": "Інструменти для розробників",
         "calendar": "Календар",
         "profile": "Профіль"
     },
@@ -698,7 +699,6 @@
                 },
                 "current_user": "Ви ввійшли як {fullName}.",
                 "is_owner": "Ви є власником.",
-                "logout": "Вийти",
                 "change_password": {
                     "header": "Змінити пароль",
                     "current_password": "Поточний пароль",
@@ -883,8 +883,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Вийти",
-            "developer_tools": "Інструменти для розробників"
+            "log_out": "Вийти"
         },
         "common": {
             "loading": "Завантаження",
diff --git a/translations/vi.json b/translations/vi.json
index c4d1757a59..3fa677041b 100644
--- a/translations/vi.json
+++ b/translations/vi.json
@@ -13,6 +13,7 @@
         "dev-templates": "Mẫu sẵn",
         "dev-mqtt": "MQTT",
         "dev-info": "Thông tin",
+        "developer_tools": "Công cụ Nhà phát triển",
         "calendar": "Lịch",
         "profile": "Hồ sơ"
     },
@@ -702,7 +703,6 @@
                 },
                 "current_user": "Bạn hiện đang đăng nhập với tên {fullName} .",
                 "is_owner": "Bạn là chủ sở hữu.",
-                "logout": "Đăng xuất",
                 "change_password": {
                     "header": "Đổi mật khẩu",
                     "current_password": "Mật khẩu hiện tại",
@@ -904,8 +904,7 @@
             }
         },
         "sidebar": {
-            "log_out": "Đăng xuất",
-            "developer_tools": "Công cụ Nhà phát triển"
+            "log_out": "Đăng xuất"
         },
         "common": {
             "loading": "Đang tải",
diff --git a/translations/zh-Hans.json b/translations/zh-Hans.json
index c3d196ef6a..4935d67f16 100644
--- a/translations/zh-Hans.json
+++ b/translations/zh-Hans.json
@@ -13,6 +13,7 @@
         "dev-templates": "模板",
         "dev-mqtt": "MQTT",
         "dev-info": "信息",
+        "developer_tools": "开发者工具",
         "calendar": "日历",
         "profile": "用户资料"
     },
@@ -745,7 +746,6 @@
                 },
                 "current_user": "您目前以 {fullName} 的身份登录。",
                 "is_owner": "您拥有所有者权限。",
-                "logout": "退出",
                 "change_password": {
                     "header": "更改密码",
                     "current_password": "当前密码",
@@ -1019,7 +1019,6 @@
         },
         "sidebar": {
             "log_out": "退出",
-            "developer_tools": "开发者工具",
             "external_app_configuration": "应用配置"
         },
         "common": {
diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json
index a68f0349b8..509ba6f560 100644
--- a/translations/zh-Hant.json
+++ b/translations/zh-Hant.json
@@ -13,6 +13,7 @@
         "dev-templates": "模板",
         "dev-mqtt": "MQTT",
         "dev-info": "資訊",
+        "developer_tools": "開發工具",
         "calendar": "行事曆",
         "profile": "個人設定"
     },
@@ -769,7 +770,6 @@
                 },
                 "current_user": "目前登入身份：{fullName}。",
                 "is_owner": "你為擁有者。",
-                "logout": "登出",
                 "change_password": {
                     "header": "變更密碼",
                     "current_password": "目前密碼",
@@ -1043,7 +1043,6 @@
         },
         "sidebar": {
             "log_out": "登出",
-            "developer_tools": "開發工具",
             "external_app_configuration": "App 設定"
         },
         "common": {

From 5ff33224ed4a8e6bfb3fdc9924c5a0c82250c4dc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 15 Jul 2019 13:15:50 -0700
Subject: [PATCH 09/10] Remove unused keys

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

diff --git a/src/translations/en.json b/src/translations/en.json
index e99b5329a1..9d537ab07f 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -546,9 +546,7 @@
       "connection_lost": "Connection lost. Reconnecting…"
     },
     "sidebar": {
-      "developer_tools": "Developer tools",
-      "external_app_configuration": "App Configuration",
-      "log_out": "Log out"
+      "external_app_configuration": "App Configuration"
     },
     "panel": {
       "config": {

From 8238b700b08a8fa227144feeccf83f843da73917 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 15 Jul 2019 13:38:44 -0700
Subject: [PATCH 10/10] Update translations uno mas

---
 build-scripts/gulp/translations.js            |  1 +
 .../ha-panel-developer-tools.ts               | 24 ++++++++++++-----
 src/translations/en.json                      | 22 ++++++++++++++++
 translations/af.json                          | 24 +++++++++++++----
 translations/ar.json                          | 24 +++++++++++++----
 translations/bg.json                          | 24 +++++++++++++----
 translations/bs.json                          | 24 +++++++++++++----
 translations/ca.json                          | 24 +++++++++++++----
 translations/cs.json                          | 24 +++++++++++++----
 translations/cy.json                          | 24 +++++++++++++----
 translations/da.json                          | 24 +++++++++++++----
 translations/de.json                          | 24 +++++++++++++----
 translations/el.json                          | 24 +++++++++++++----
 translations/en.json                          | 26 ++++++++++++++-----
 translations/es-419.json                      | 24 +++++++++++++----
 translations/es.json                          | 24 +++++++++++++----
 translations/et.json                          | 24 +++++++++++++----
 translations/eu.json                          | 24 +++++++++++++----
 translations/fa.json                          | 24 +++++++++++++----
 translations/fi.json                          | 24 +++++++++++++----
 translations/fr.json                          | 24 +++++++++++++----
 translations/gsw.json                         | 14 +++++++---
 translations/he.json                          | 24 +++++++++++++----
 translations/hi.json                          | 20 +++++++++++---
 translations/hr.json                          | 24 +++++++++++++----
 translations/hu.json                          | 24 +++++++++++++----
 translations/id.json                          | 24 +++++++++++++----
 translations/is.json                          | 24 +++++++++++++----
 translations/it.json                          | 24 +++++++++++++----
 translations/ja.json                          | 20 +++++++++++---
 translations/ko.json                          | 24 +++++++++++++----
 translations/lb.json                          | 24 +++++++++++++----
 translations/lt.json                          | 18 ++++++++-----
 translations/lv.json                          | 24 +++++++++++++----
 translations/nb.json                          | 24 +++++++++++++----
 translations/nl.json                          | 24 +++++++++++++----
 translations/nn.json                          | 24 +++++++++++++----
 translations/pl.json                          | 24 +++++++++++++----
 translations/pt-BR.json                       | 24 +++++++++++++----
 translations/pt.json                          | 24 +++++++++++++----
 translations/ro.json                          | 24 +++++++++++++----
 translations/ru.json                          | 24 +++++++++++++----
 translations/sk.json                          | 24 +++++++++++++----
 translations/sl.json                          | 24 +++++++++++++----
 translations/sr-Latn.json                     | 10 +++++--
 translations/sr.json                          |  8 +++++-
 translations/sv.json                          | 24 +++++++++++++----
 translations/ta.json                          | 20 +++++++++-----
 translations/te.json                          | 24 +++++++++++++----
 translations/th.json                          | 24 +++++++++++++----
 translations/tr.json                          | 24 +++++++++++++----
 translations/uk.json                          | 24 +++++++++++++----
 translations/vi.json                          | 24 +++++++++++++----
 translations/zh-Hans.json                     | 24 +++++++++++++----
 translations/zh-Hant.json                     | 24 +++++++++++++----
 55 files changed, 978 insertions(+), 261 deletions(-)

diff --git a/build-scripts/gulp/translations.js b/build-scripts/gulp/translations.js
index cda82a6c01..014df9f018 100755
--- a/build-scripts/gulp/translations.js
+++ b/build-scripts/gulp/translations.js
@@ -36,6 +36,7 @@ const TRANSLATION_FRAGMENTS = [
   "page-authorize",
   "page-demo",
   "page-onboarding",
+  "developer-tools",
 ];
 
 const tasks = [];
diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts
index 98a1d74e23..f982cc1f1a 100644
--- a/src/panels/developer-tools/ha-panel-developer-tools.ts
+++ b/src/panels/developer-tools/ha-panel-developer-tools.ts
@@ -41,7 +41,7 @@ class PanelDeveloperTools extends LitElement {
               .hass=${this.hass}
               .narrow=${this.narrow}
             ></ha-menu-button>
-            <div main-title>Developer Tools</div>
+            <div main-title>${this.hass.localize("panel.developer_tools")}</div>
           </app-toolbar>
           <paper-tabs
             scrollable
@@ -50,26 +50,36 @@ class PanelDeveloperTools extends LitElement {
             @iron-activate=${this.handlePageSelected}
           >
             <paper-tab page-name="info">
-              ${this.hass.localize("panel.dev-info")}
+              ${this.hass.localize("ui.panel.developer-tools.tabs.info.title")}
             </paper-tab>
             <paper-tab page-name="event">
-              ${this.hass.localize("panel.dev-events")}
+              ${this.hass.localize(
+                "ui.panel.developer-tools.tabs.events.title"
+              )}
             </paper-tab>
             ${isComponentLoaded(this.hass, "mqtt")
               ? html`
                   <paper-tab page-name="mqtt">
-                    ${this.hass.localize("panel.dev-mqtt")}
+                    ${this.hass.localize(
+                      "ui.panel.developer-tools.tabs.mqtt.title"
+                    )}
                   </paper-tab>
                 `
               : ""}
             <paper-tab page-name="service">
-              ${this.hass.localize("panel.dev-services")}
+              ${this.hass.localize(
+                "ui.panel.developer-tools.tabs.services.title"
+              )}
             </paper-tab>
             <paper-tab page-name="state">
-              ${this.hass.localize("panel.dev-states")}
+              ${this.hass.localize(
+                "ui.panel.developer-tools.tabs.states.title"
+              )}
             </paper-tab>
             <paper-tab page-name="template">
-              ${this.hass.localize("panel.dev-templates")}
+              ${this.hass.localize(
+                "ui.panel.developer-tools.tabs.templates.title"
+              )}
             </paper-tab>
           </paper-tabs>
         </app-header>
diff --git a/src/translations/en.json b/src/translations/en.json
index 9d537ab07f..76a38048e3 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1247,6 +1247,28 @@
           }
         }
       },
+      "developer-tools": {
+        "tabs": {
+          "info": {
+            "title": "Info"
+          },
+          "events": {
+            "title": "Events"
+          },
+          "mqtt": {
+            "title": "MQTT"
+          },
+          "services": {
+            "title": "Services"
+          },
+          "states": {
+            "title": "States"
+          },
+          "templates": {
+            "title": "Template"
+          }
+        }
+      },
       "page-onboarding": {
         "intro": "Are you ready to awaken your home, reclaim your privacy and join a worldwide community of tinkerers?",
         "user": {
diff --git a/translations/af.json b/translations/af.json
index acdb9cfc10..79372685fa 100644
--- a/translations/af.json
+++ b/translations/af.json
@@ -7,11 +7,6 @@
         "history": "Geskiedenis",
         "mailbox": "Posbus",
         "shopping_list": "Inkopielys",
-        "dev-services": "Dienste",
-        "dev-states": "State",
-        "dev-events": "Gebeure",
-        "dev-templates": "Template",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Ontwikkelaar gereedskap",
         "calendar": "Kalender",
@@ -312,6 +307,25 @@
                 "add_item": "Voeg item",
                 "microphone_tip": "Druk die mikrofoon regs bo en sê \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Dienste"
+                    },
+                    "states": {
+                        "title": "State"
+                    },
+                    "events": {
+                        "title": "Gebeure"
+                    },
+                    "templates": {
+                        "title": "Template"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Wys inskrywings vir",
                 "period": "Tydperk"
diff --git a/translations/ar.json b/translations/ar.json
index bff8d2eabd..f9ad1621f0 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -7,11 +7,6 @@
         "history": "التاريخ",
         "mailbox": "البريد",
         "shopping_list": "قائمة التسوق",
-        "dev-services": "الخدمات",
-        "dev-states": "الحالات",
-        "dev-events": "أحداث",
-        "dev-templates": "نماذج",
-        "dev-mqtt": "MQTT",
         "dev-info": "معلومات",
         "developer_tools": "ادوات المطورين",
         "calendar": "التقويم",
@@ -295,6 +290,25 @@
                 "add_item": "أضف عنصر",
                 "microphone_tip": "اضغط على الميكروفون في أعلى اليمين وقل \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "الخدمات"
+                    },
+                    "states": {
+                        "title": "الحالات"
+                    },
+                    "events": {
+                        "title": "أحداث"
+                    },
+                    "templates": {
+                        "title": "نماذج"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "عرض الأحداث لـ",
                 "period": "المدة"
diff --git a/translations/bg.json b/translations/bg.json
index 7852458272..0d51fe6536 100644
--- a/translations/bg.json
+++ b/translations/bg.json
@@ -7,11 +7,6 @@
         "history": "История",
         "mailbox": "Пощенска кутия",
         "shopping_list": "Списък за пазаруване",
-        "dev-services": "Услуги",
-        "dev-states": "Състояния",
-        "dev-events": "Събития",
-        "dev-templates": "Шаблони",
-        "dev-mqtt": "MQTT",
         "dev-info": "Информация",
         "developer_tools": "Инструменти за разработчици",
         "calendar": "Календар",
@@ -312,6 +307,25 @@
                 "add_item": "Добави артикул",
                 "microphone_tip": "Докоснете микрофона горе вдясно и кажете \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Услуги"
+                    },
+                    "states": {
+                        "title": "Състояния"
+                    },
+                    "events": {
+                        "title": "Събития"
+                    },
+                    "templates": {
+                        "title": "Шаблони"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Показване на записите за",
                 "period": "Период"
diff --git a/translations/bs.json b/translations/bs.json
index 24e353834e..3e35cd6da1 100644
--- a/translations/bs.json
+++ b/translations/bs.json
@@ -7,11 +7,6 @@
         "history": "Istorija",
         "mailbox": "Poštansko sanduče",
         "shopping_list": "Spisak za kupovinu",
-        "dev-services": "Usluge",
-        "dev-states": "Statusi",
-        "dev-events": "Događanja",
-        "dev-templates": "Predlošci",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Alatke za razvoj"
     },
@@ -244,6 +239,25 @@
                 "add_item": "Dodajte objekat",
                 "microphone_tip": "Dodirnite mikrofon u gornjem desnom uglu i recite “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Usluge"
+                    },
+                    "states": {
+                        "title": "Statusi"
+                    },
+                    "events": {
+                        "title": "Događanja"
+                    },
+                    "templates": {
+                        "title": "Predlošci"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Prikaži rezutate za",
                 "period": "Period"
diff --git a/translations/ca.json b/translations/ca.json
index 551d5a0445..d47ff67ab5 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -7,11 +7,6 @@
         "history": "Historial",
         "mailbox": "Bústia",
         "shopping_list": "Llista de la compra",
-        "dev-services": "Serveis",
-        "dev-states": "Estats",
-        "dev-events": "Esdeveniments",
-        "dev-templates": "Plantilles",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informació",
         "developer_tools": "Eines per a desenvolupadors",
         "calendar": "Calendari",
@@ -313,6 +308,25 @@
                 "add_item": "Afegir article",
                 "microphone_tip": "Clica el micròfon a la part superior dreta i digues \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Serveis"
+                    },
+                    "states": {
+                        "title": "Estats"
+                    },
+                    "events": {
+                        "title": "Esdeveniments"
+                    },
+                    "templates": {
+                        "title": "Plantilles"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Mostrant entrades de",
                 "period": "Període"
diff --git a/translations/cs.json b/translations/cs.json
index 3daf029efd..e8643cd65b 100644
--- a/translations/cs.json
+++ b/translations/cs.json
@@ -7,11 +7,6 @@
         "history": "Historie",
         "mailbox": "Schránka",
         "shopping_list": "Nákupní seznam",
-        "dev-services": "Služby",
-        "dev-states": "Stavy",
-        "dev-events": "Události",
-        "dev-templates": "Šablony",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informace",
         "developer_tools": "Vývojářské nástroje",
         "calendar": "Kalendář",
@@ -312,6 +307,25 @@
                 "add_item": "Přidat položku",
                 "microphone_tip": "Klepněte na mikrofon vpravo nahoře a řekněte \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Služby"
+                    },
+                    "states": {
+                        "title": "Stavy"
+                    },
+                    "events": {
+                        "title": "Události"
+                    },
+                    "templates": {
+                        "title": "Šablony"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Zobrazeny údaje pro",
                 "period": "Období"
diff --git a/translations/cy.json b/translations/cy.json
index 15d682e36c..a54c610ee9 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -7,11 +7,6 @@
         "history": "Hanes",
         "mailbox": "Blwch post",
         "shopping_list": "Rhestr siopa",
-        "dev-services": "Gwasanaethau",
-        "dev-states": "Cyflerau",
-        "dev-events": "Digwyddiadau",
-        "dev-templates": "Templedi",
-        "dev-mqtt": "MQTT",
         "dev-info": "Gwybodaeth",
         "developer_tools": "Offer datblygwr"
     },
@@ -301,6 +296,25 @@
                 "add_item": "Ychwanegu eitem",
                 "microphone_tip": "Tarwch y meicroffon ar dde uchaf a dweud \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Gwasanaethau"
+                    },
+                    "states": {
+                        "title": "Cyflerau"
+                    },
+                    "events": {
+                        "title": "Digwyddiadau"
+                    },
+                    "templates": {
+                        "title": "Templedi"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Dangos cofnodion ar gyfer",
                 "period": "Cyfnod"
diff --git a/translations/da.json b/translations/da.json
index fb8dc316f4..9b01ca308d 100644
--- a/translations/da.json
+++ b/translations/da.json
@@ -7,11 +7,6 @@
         "history": "Historik",
         "mailbox": "Postkasse",
         "shopping_list": "Indkøbsliste",
-        "dev-services": "Services",
-        "dev-states": "Tilstand",
-        "dev-events": "Begivenheder",
-        "dev-templates": "Skabeloner",
-        "dev-mqtt": "MQTT",
         "dev-info": "Udvikler Information",
         "developer_tools": "Udviklerværktøjer",
         "calendar": "Kalender",
@@ -312,6 +307,25 @@
                 "add_item": "Tilføj element",
                 "microphone_tip": "Tryk på mikrofonen øverst til højre og sig “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Services"
+                    },
+                    "states": {
+                        "title": "Tilstand"
+                    },
+                    "events": {
+                        "title": "Begivenheder"
+                    },
+                    "templates": {
+                        "title": "Skabeloner"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Viser emner for",
                 "period": "Periode"
diff --git a/translations/de.json b/translations/de.json
index 6c270db21d..1b2bfa0767 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -7,11 +7,6 @@
         "history": "Verlauf",
         "mailbox": "Posteingang",
         "shopping_list": "Einkaufsliste",
-        "dev-services": "Dienste",
-        "dev-states": "Zustände",
-        "dev-events": "Ereignisse",
-        "dev-templates": "Templates",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Entwicklerwerkzeuge",
         "calendar": "Kalender",
@@ -313,6 +308,25 @@
                 "add_item": "Artikel hinzufügen",
                 "microphone_tip": "Tippe oben rechts auf das Mikrofon und sage “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Dienste"
+                    },
+                    "states": {
+                        "title": "Zustände"
+                    },
+                    "events": {
+                        "title": "Ereignisse"
+                    },
+                    "templates": {
+                        "title": "Templates"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Zeige Einträge für",
                 "period": "Zeitraum"
diff --git a/translations/el.json b/translations/el.json
index 62455cf532..a2b7b98c94 100644
--- a/translations/el.json
+++ b/translations/el.json
@@ -7,11 +7,6 @@
         "history": "Ιστορικό",
         "mailbox": "Γραμματοκιβώτιο",
         "shopping_list": "Λίστα αγορών",
-        "dev-services": "Υπηρεσίες",
-        "dev-states": "Καταστάσεις",
-        "dev-events": "Γεγονότα",
-        "dev-templates": "Πρότυπα",
-        "dev-mqtt": "MQTT",
         "dev-info": "Πληροφορίες",
         "developer_tools": "Εργαλεία προγραμματιστή",
         "calendar": "Ημερολόγιο",
@@ -312,6 +307,25 @@
                 "add_item": "Προσθήκη στοιχείου",
                 "microphone_tip": "Πατήστε το μικρόφωνο στην επάνω δεξιά γωνία και πείτε \"Προσθήκη καραμελών στη λίστα αγορών μου\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Υπηρεσίες"
+                    },
+                    "states": {
+                        "title": "Καταστάσεις"
+                    },
+                    "events": {
+                        "title": "Γεγονότα"
+                    },
+                    "templates": {
+                        "title": "Πρότυπα"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Εμφανίζονται καταχωρήσεις για",
                 "period": "Περίοδος"
diff --git a/translations/en.json b/translations/en.json
index ee0ffd6cc7..e566fbee18 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -7,13 +7,8 @@
         "history": "History",
         "mailbox": "Mailbox",
         "shopping_list": "Shopping list",
-        "dev-services": "Services",
-        "dev-states": "States",
-        "dev-events": "Events",
-        "dev-templates": "Templates",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
-        "developer_tools": "Developer tools",
+        "developer_tools": "Developer Tools",
         "calendar": "Calendar",
         "profile": "Profile"
     },
@@ -313,6 +308,25 @@
                 "add_item": "Add item",
                 "microphone_tip": "Tap the microphone on the top right and say “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Services"
+                    },
+                    "states": {
+                        "title": "States"
+                    },
+                    "events": {
+                        "title": "Events"
+                    },
+                    "templates": {
+                        "title": "Templates"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Showing entries for",
                 "period": "Period"
diff --git a/translations/es-419.json b/translations/es-419.json
index 207648c725..e947d0e886 100644
--- a/translations/es-419.json
+++ b/translations/es-419.json
@@ -7,11 +7,6 @@
         "history": "",
         "mailbox": "",
         "shopping_list": "Lista de compras",
-        "dev-services": "Servicios",
-        "dev-states": "Estados",
-        "dev-events": "Eventos",
-        "dev-templates": "Plantillas",
-        "dev-mqtt": "",
         "dev-info": "Información",
         "developer_tools": "Herramientas para desarrolladores",
         "calendar": "Calendario",
@@ -313,6 +308,25 @@
                 "add_item": "Agregar elemento",
                 "microphone_tip": "Toque el micrófono en la esquina superior derecha y diga \"Agregar dulces a mi lista de compras\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Servicios"
+                    },
+                    "states": {
+                        "title": "Estados"
+                    },
+                    "events": {
+                        "title": "Eventos"
+                    },
+                    "templates": {
+                        "title": "Plantillas"
+                    },
+                    "mqtt": {
+                        "title": ""
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Mostrando registros del",
                 "period": "Período"
diff --git a/translations/es.json b/translations/es.json
index 927f562bbe..04a4ae8497 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -7,11 +7,6 @@
         "history": "Historial",
         "mailbox": "Buzón",
         "shopping_list": "Lista de la compra",
-        "dev-services": "Servicios",
-        "dev-states": "Estados",
-        "dev-events": "Eventos",
-        "dev-templates": "Plantillas",
-        "dev-mqtt": "MQTT",
         "dev-info": "Información",
         "developer_tools": "Herramientas para desarrolladores",
         "calendar": "Calendario",
@@ -312,6 +307,25 @@
                 "add_item": "Añadir artículo",
                 "microphone_tip": "Pulsa el micrófono en la parte superior derecha y di \"Añadir caramelos a mi lista de la compra\"."
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Servicios"
+                    },
+                    "states": {
+                        "title": "Estados"
+                    },
+                    "events": {
+                        "title": "Eventos"
+                    },
+                    "templates": {
+                        "title": "Plantillas"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Mostrando entradas del",
                 "period": "Periodo"
diff --git a/translations/et.json b/translations/et.json
index 2c32904445..5b286aaebb 100644
--- a/translations/et.json
+++ b/translations/et.json
@@ -7,11 +7,6 @@
         "history": "Ajalugu",
         "mailbox": "Postkast",
         "shopping_list": "Ostunimekiri",
-        "dev-services": "Teenused",
-        "dev-states": "Olekud",
-        "dev-events": "Sündmused",
-        "dev-templates": "Mallid",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Arendaja tööriistad",
         "calendar": "Kalender",
@@ -311,6 +306,25 @@
                 "add_item": "Lisa toode",
                 "microphone_tip": "Puudutage paremas ülanurgas asuvat mikrofoni ikooni ja öelge: \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Teenused"
+                    },
+                    "states": {
+                        "title": "Olekud"
+                    },
+                    "events": {
+                        "title": "Sündmused"
+                    },
+                    "templates": {
+                        "title": "Mallid"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Näitan kuupäeva",
                 "period": "Periood"
diff --git a/translations/eu.json b/translations/eu.json
index 48bddcd407..834398a8a5 100644
--- a/translations/eu.json
+++ b/translations/eu.json
@@ -7,11 +7,6 @@
         "history": "Historia",
         "mailbox": "Postontzia",
         "shopping_list": "Erosketa zerrenda",
-        "dev-services": "Zerbitzuak",
-        "dev-states": "Egoerak",
-        "dev-events": "Gertaerak",
-        "dev-templates": "Txantiloiak",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informazioa",
         "developer_tools": "Garatzaileentzako tresnak",
         "calendar": "Egutegia",
@@ -240,6 +235,25 @@
                 "clear_completed": "Osatutakoak ezabatu",
                 "add_item": "Artikulua gehitu"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Zerbitzuak"
+                    },
+                    "states": {
+                        "title": "Egoerak"
+                    },
+                    "events": {
+                        "title": "Gertaerak"
+                    },
+                    "templates": {
+                        "title": "Txantiloiak"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "mailbox": {
                 "empty": "Ez duzu mezurik",
                 "delete_prompt": "Mezu hau ezabatu?",
diff --git a/translations/fa.json b/translations/fa.json
index 76ca649b56..378a2b2384 100644
--- a/translations/fa.json
+++ b/translations/fa.json
@@ -7,11 +7,6 @@
         "history": "تاریخچه",
         "mailbox": "صندوق پستی",
         "shopping_list": "لیست خرید",
-        "dev-services": "خدمات",
-        "dev-states": "ایالت ها",
-        "dev-events": "رویدادها",
-        "dev-templates": "قالب ها",
-        "dev-mqtt": "MQTT",
         "dev-info": "اطلاعات",
         "calendar": "تقویم"
     },
@@ -298,6 +293,25 @@
             "shopping-list": {
                 "add_item": "اضافه کردن آیتم"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "خدمات"
+                    },
+                    "states": {
+                        "title": "ایالت ها"
+                    },
+                    "events": {
+                        "title": "رویدادها"
+                    },
+                    "templates": {
+                        "title": "قالب ها"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "نمایش نوشته ها برای"
             },
diff --git a/translations/fi.json b/translations/fi.json
index 9ce7e8f76e..1c5964f5f9 100644
--- a/translations/fi.json
+++ b/translations/fi.json
@@ -7,11 +7,6 @@
         "history": "Historia",
         "mailbox": "Postilaatikko",
         "shopping_list": "Ostoslista",
-        "dev-services": "Palvelut",
-        "dev-states": "Tilat",
-        "dev-events": "Tapahtumat",
-        "dev-templates": "Mallit",
-        "dev-mqtt": "MQTT",
         "dev-info": "Tiedot",
         "developer_tools": "Kehittäjän työkalut",
         "calendar": "Kalenteri",
@@ -312,6 +307,25 @@
                 "add_item": "Lisää tavara",
                 "microphone_tip": "Paina mikrofonia oikeassa yläkulmassa ja sano \"Lisää karkkipussi ostoslistalleni\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Palvelut"
+                    },
+                    "states": {
+                        "title": "Tilat"
+                    },
+                    "events": {
+                        "title": "Tapahtumat"
+                    },
+                    "templates": {
+                        "title": "Mallit"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Näytetään tapahtumat alkaen",
                 "period": "aikajakso"
diff --git a/translations/fr.json b/translations/fr.json
index ab54cf2764..8628c2f489 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -7,11 +7,6 @@
         "history": "Historique",
         "mailbox": "Boîtes aux lettres",
         "shopping_list": "Liste de courses",
-        "dev-services": "Services",
-        "dev-states": "États",
-        "dev-events": "Événements",
-        "dev-templates": "Templates",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Outils de développement",
         "calendar": "Calendrier",
@@ -313,6 +308,25 @@
                 "add_item": "Ajouter un élément",
                 "microphone_tip": "Cliquez sur le microphone en haut à droite et dites “Ajouter des bonbons à ma liste d'achat”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Services"
+                    },
+                    "states": {
+                        "title": "États"
+                    },
+                    "events": {
+                        "title": "Événements"
+                    },
+                    "templates": {
+                        "title": "Templates"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Afficher les entrées pour",
                 "period": "Période"
diff --git a/translations/gsw.json b/translations/gsw.json
index bb44bd5fb2..59074d5669 100644
--- a/translations/gsw.json
+++ b/translations/gsw.json
@@ -7,7 +7,6 @@
         "history": "Vrlouf",
         "mailbox": "Postigang",
         "shopping_list": "Ichoufsliste",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "calendar": "Kaländer",
         "profile": "Profiu"
@@ -258,10 +257,14 @@
         "sidebar": {
             "log_out": "Uslogge"
         },
-        "common": {
-            "loading": "Lade"
-        },
         "panel": {
+            "developer-tools": {
+                "tabs": {
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "period": "Periode"
             },
@@ -419,6 +422,9 @@
                 }
             }
         },
+        "common": {
+            "loading": "Lade"
+        },
         "login-form": {
             "password": "Passwort"
         },
diff --git a/translations/he.json b/translations/he.json
index 4e016f5ac5..5c3448361e 100644
--- a/translations/he.json
+++ b/translations/he.json
@@ -7,11 +7,6 @@
         "history": "היסטוריה",
         "mailbox": "תיבת דואר",
         "shopping_list": "רשימת קניות",
-        "dev-services": "שירותים",
-        "dev-states": "מצבים",
-        "dev-events": "אירועים",
-        "dev-templates": "תבניות",
-        "dev-mqtt": "MQTT",
         "dev-info": "מידע",
         "developer_tools": "כלים למפתחים",
         "calendar": "לוח שנה",
@@ -312,6 +307,25 @@
                 "add_item": "הוסף פריט",
                 "microphone_tip": "לחץ על המיקרופון למעלה מצד ימין ותאמר \"הוסף סוכריה לרשימת הקניות שלי\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "שירותים"
+                    },
+                    "states": {
+                        "title": "מצבים"
+                    },
+                    "events": {
+                        "title": "אירועים"
+                    },
+                    "templates": {
+                        "title": "תבניות"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "מציג רשומות עבור",
                 "period": "תקופה"
diff --git a/translations/hi.json b/translations/hi.json
index b5ed116b23..35182fea34 100644
--- a/translations/hi.json
+++ b/translations/hi.json
@@ -7,10 +7,6 @@
         "history": "इतिहास",
         "mailbox": "मेलबॉक्स",
         "shopping_list": "खरीदारी की सूची",
-        "dev-services": "सेवाएं",
-        "dev-events": "घटनाओं",
-        "dev-templates": "टेम्पलेट्स",
-        "dev-mqtt": "MQTT",
         "dev-info": "जानकारी",
         "developer_tools": "डेवलपर उपकरण"
     },
@@ -118,6 +114,22 @@
                 "add_item": "आइटम जोड़ें",
                 "microphone_tip": "ऊपर दाईं ओर माइक्रोफ़ोन टैप करें और \"मेरी खरीदारी सूची में कैंडी जोड़ें\" कहें"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "सेवाएं"
+                    },
+                    "events": {
+                        "title": "घटनाओं"
+                    },
+                    "templates": {
+                        "title": "टेम्पलेट्स"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "config": {
                 "zwave": {
                     "caption": "Z-Wave"
diff --git a/translations/hr.json b/translations/hr.json
index e4e7d63d99..d683367254 100644
--- a/translations/hr.json
+++ b/translations/hr.json
@@ -7,11 +7,6 @@
         "history": "Povijest",
         "mailbox": "Pošta",
         "shopping_list": "Popis za kupovinu",
-        "dev-services": "Usluge",
-        "dev-states": "Status",
-        "dev-events": "Događaji",
-        "dev-templates": "Predlošci",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informacije",
         "developer_tools": "Razvojni alati",
         "calendar": "Kalendar",
@@ -290,6 +285,25 @@
                 "add_item": "Dodaj stavku",
                 "microphone_tip": "Dodirnite mikrofon u gornjem desnom kutu i recite “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Usluge"
+                    },
+                    "states": {
+                        "title": "Status"
+                    },
+                    "events": {
+                        "title": "Događaji"
+                    },
+                    "templates": {
+                        "title": "Predlošci"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Prikazivanje stavki za",
                 "period": "Razdoblje"
diff --git a/translations/hu.json b/translations/hu.json
index f4d0d9fc7f..c74f2bacc7 100644
--- a/translations/hu.json
+++ b/translations/hu.json
@@ -7,11 +7,6 @@
         "history": "Előzmények",
         "mailbox": "Postafiók",
         "shopping_list": "Bevásárló lista",
-        "dev-services": "Szolgáltatások",
-        "dev-states": "Állapotok",
-        "dev-events": "Események",
-        "dev-templates": "Sablonok",
-        "dev-mqtt": "MQTT",
         "dev-info": "Infó",
         "developer_tools": "Fejlesztői eszközök",
         "calendar": "Naptár",
@@ -313,6 +308,25 @@
                 "add_item": "Tétel hozzáadása",
                 "microphone_tip": "Koppints a jobb felső sarokban található mikrofonra, és mondd ki: \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Szolgáltatások"
+                    },
+                    "states": {
+                        "title": "Állapotok"
+                    },
+                    "events": {
+                        "title": "Események"
+                    },
+                    "templates": {
+                        "title": "Sablonok"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Bejegyzések megjelenítése",
                 "period": "Időtartam"
diff --git a/translations/id.json b/translations/id.json
index e4156af4e9..3428462df3 100644
--- a/translations/id.json
+++ b/translations/id.json
@@ -7,11 +7,6 @@
         "history": "Riwayat",
         "mailbox": "Kotak pesan",
         "shopping_list": "Daftar belanja",
-        "dev-services": "Layanan",
-        "dev-states": "Status",
-        "dev-events": "Event",
-        "dev-templates": "Template",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Alat pengembang",
         "calendar": "Kalender"
@@ -304,6 +299,25 @@
                 "add_item": "Tambah item",
                 "microphone_tip": "Sentuh mikrofon di kanan atas dan ucapkan \"Tambahkan permen ke daftar belanjaku\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Layanan"
+                    },
+                    "states": {
+                        "title": "Status"
+                    },
+                    "events": {
+                        "title": "Event"
+                    },
+                    "templates": {
+                        "title": "Template"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Menampilkan daftar dari",
                 "period": "Periode"
diff --git a/translations/is.json b/translations/is.json
index 7dff987057..044c54dd73 100644
--- a/translations/is.json
+++ b/translations/is.json
@@ -7,11 +7,6 @@
         "history": "Saga",
         "mailbox": "Pósthólf",
         "shopping_list": "Innkaupalisti",
-        "dev-services": "Þjónustur",
-        "dev-states": "Stöður",
-        "dev-events": "Viðburðir",
-        "dev-templates": "Skapalón",
-        "dev-mqtt": "MQTT",
         "dev-info": "Upplýsingar",
         "developer_tools": "Þróunarverkfæri",
         "calendar": "Dagatal",
@@ -266,6 +261,25 @@
                 "add_item": "Bæta við hlut",
                 "microphone_tip": "Ýttu á hljóðnemann efst til hægri og segðu \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Þjónustur"
+                    },
+                    "states": {
+                        "title": "Stöður"
+                    },
+                    "events": {
+                        "title": "Viðburðir"
+                    },
+                    "templates": {
+                        "title": "Skapalón"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Sýni færslur fyrir",
                 "period": "Tímabil"
diff --git a/translations/it.json b/translations/it.json
index fff35ed5a1..4e4a3f6cd0 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -7,11 +7,6 @@
         "history": "Storico",
         "mailbox": "Posta",
         "shopping_list": "Lista della spesa",
-        "dev-services": "Servizi",
-        "dev-states": "Stati",
-        "dev-events": "Eventi",
-        "dev-templates": "Modelli",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informazioni",
         "developer_tools": "Strumenti per gli sviluppatori",
         "calendar": "Calendario",
@@ -313,6 +308,25 @@
                 "add_item": "Aggiungi articolo",
                 "microphone_tip": "Tocca il microfono in alto a destra e dì \"Aggiungi caramelle alla mia lista della spesa\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Servizi"
+                    },
+                    "states": {
+                        "title": "Stati"
+                    },
+                    "events": {
+                        "title": "Eventi"
+                    },
+                    "templates": {
+                        "title": "Modelli"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Mostra registrazioni per",
                 "period": "Periodo"
diff --git a/translations/ja.json b/translations/ja.json
index 847c6ccbfe..adb041387f 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -7,10 +7,6 @@
         "history": "履歴",
         "mailbox": "メールボックス",
         "shopping_list": "買い物リスト",
-        "dev-services": "サービス",
-        "dev-events": "イベント",
-        "dev-templates": "テンプレート",
-        "dev-mqtt": "MQTT",
         "developer_tools": "開発者ツール",
         "calendar": "カレンダー"
     },
@@ -176,6 +172,22 @@
                 "clear_completed": "削除完了",
                 "add_item": "アイテムを追加"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "サービス"
+                    },
+                    "events": {
+                        "title": "イベント"
+                    },
+                    "templates": {
+                        "title": "テンプレート"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "period": "期間"
             },
diff --git a/translations/ko.json b/translations/ko.json
index 0e0c2cac62..6f5bfdbcf1 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -7,11 +7,6 @@
         "history": "히스토리",
         "mailbox": "메일함",
         "shopping_list": "장보기목록",
-        "dev-services": "서비스",
-        "dev-states": "상태",
-        "dev-events": "이벤트",
-        "dev-templates": "템플릿",
-        "dev-mqtt": "MQTT",
         "dev-info": "정보",
         "developer_tools": "개발자도구",
         "calendar": "캘린더",
@@ -313,6 +308,25 @@
                 "add_item": "항목추가",
                 "microphone_tip": "우상단 마이크를 탭하고 \"Add candy to my shopping list\"라고 말해보세요"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "서비스"
+                    },
+                    "states": {
+                        "title": "상태"
+                    },
+                    "events": {
+                        "title": "이벤트"
+                    },
+                    "templates": {
+                        "title": "템플릿"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "다음 날짜의 항목을 표시",
                 "period": "기간"
diff --git a/translations/lb.json b/translations/lb.json
index 0d727e0122..9908471056 100644
--- a/translations/lb.json
+++ b/translations/lb.json
@@ -7,11 +7,6 @@
         "history": "Verlaf",
         "mailbox": "Bréifkëscht",
         "shopping_list": "Akafslëscht",
-        "dev-services": "Servicen",
-        "dev-states": "Zoustänn",
-        "dev-events": "Evenementer",
-        "dev-templates": "Modeller",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Entwécklungsgeschir",
         "calendar": "Kalenner",
@@ -312,6 +307,25 @@
                 "add_item": "Objet dobäisetze",
                 "microphone_tip": "Tipp uewe riets op de Mikro a so “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Servicen"
+                    },
+                    "states": {
+                        "title": "Zoustänn"
+                    },
+                    "events": {
+                        "title": "Evenementer"
+                    },
+                    "templates": {
+                        "title": "Modeller"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Weist Beiträg fir",
                 "period": "Zäitraum"
diff --git a/translations/lt.json b/translations/lt.json
index 17933db622..5c31f66676 100644
--- a/translations/lt.json
+++ b/translations/lt.json
@@ -7,7 +7,6 @@
         "history": "Istorija",
         "mailbox": "Pašto dėžutė",
         "shopping_list": "Pirkinių sąrašas",
-        "dev-mqtt": "MQTT",
         "profile": "Vartotojo profilis"
     },
     "state": {
@@ -159,12 +158,14 @@
         "sidebar": {
             "log_out": "Atsijungti"
         },
-        "duration": {
-            "day": "{count} {count, plural,\n  one {diena}\n  other {dienos}\n}",
-            "week": "count} {count, plural,\n  one {savaitė}\n  other {savaitės}\n}",
-            "second": "{count} {count, plural,\n  one {sekundė}\n  other {sekundės}\n}"
-        },
         "panel": {
+            "developer-tools": {
+                "tabs": {
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "config": {
                 "zwave": {
                     "caption": "Z-Wave"
@@ -445,6 +446,11 @@
                 }
             }
         },
+        "duration": {
+            "day": "{count} {count, plural,\n  one {diena}\n  other {dienos}\n}",
+            "week": "count} {count, plural,\n  one {savaitė}\n  other {savaitės}\n}",
+            "second": "{count} {count, plural,\n  one {sekundė}\n  other {sekundės}\n}"
+        },
         "common": {
             "save": "Išsaugoti"
         },
diff --git a/translations/lv.json b/translations/lv.json
index 8974de86ce..485feae605 100644
--- a/translations/lv.json
+++ b/translations/lv.json
@@ -7,11 +7,6 @@
         "history": "Vēsture",
         "mailbox": "Pastkaste",
         "shopping_list": "Iepirkumu saraksts",
-        "dev-services": "Pakalpojumi",
-        "dev-states": "Stāvokļi",
-        "dev-events": "Notikumi",
-        "dev-templates": "Veidnes",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Izstrādātāju rīki",
         "calendar": "Kalendārs",
@@ -297,6 +292,25 @@
                 "add_item": "Pievienot vienumu",
                 "microphone_tip": "Pieskarieties mikrofonam augšējā labajā stūrī un sakiet \"Pievienojiet konfektes manam iepirkumu sarakstam\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Pakalpojumi"
+                    },
+                    "states": {
+                        "title": "Stāvokļi"
+                    },
+                    "events": {
+                        "title": "Notikumi"
+                    },
+                    "templates": {
+                        "title": "Veidnes"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Rāda ierakstus par",
                 "period": "Periods"
diff --git a/translations/nb.json b/translations/nb.json
index 5f3d33ba65..feaf474cae 100644
--- a/translations/nb.json
+++ b/translations/nb.json
@@ -7,11 +7,6 @@
         "history": "Historie",
         "mailbox": "Postkasse",
         "shopping_list": "Handleliste",
-        "dev-services": "Tjenester",
-        "dev-states": "Statuser",
-        "dev-events": "Hendelser",
-        "dev-templates": "Maler",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informasjon",
         "developer_tools": "Utviklerverktøy",
         "calendar": "Kalender",
@@ -313,6 +308,25 @@
                 "add_item": "Legg til",
                 "microphone_tip": "Aktiver mikrofonen øverst til høyre og si “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Tjenester"
+                    },
+                    "states": {
+                        "title": "Statuser"
+                    },
+                    "events": {
+                        "title": "Hendelser"
+                    },
+                    "templates": {
+                        "title": "Maler"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Viser oppføringer for",
                 "period": "Periode"
diff --git a/translations/nl.json b/translations/nl.json
index ea1190939b..aadabecaf4 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -7,11 +7,6 @@
         "history": "Geschiedenis",
         "mailbox": "Postvak",
         "shopping_list": "Boodschappenlijst",
-        "dev-services": "Services",
-        "dev-states": "Toestanden",
-        "dev-events": "Gebeurtenissen",
-        "dev-templates": "Sjablonen",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Ontwikkelaarstools",
         "calendar": "Kalender",
@@ -313,6 +308,25 @@
                 "add_item": "Item toevoegen",
                 "microphone_tip": "Tik op de microfoon rechtsboven en zeg \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Services"
+                    },
+                    "states": {
+                        "title": "Toestanden"
+                    },
+                    "events": {
+                        "title": "Gebeurtenissen"
+                    },
+                    "templates": {
+                        "title": "Sjablonen"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Toon items voor",
                 "period": "Periode"
diff --git a/translations/nn.json b/translations/nn.json
index 17b3aeaa4c..dcee8f2c1d 100644
--- a/translations/nn.json
+++ b/translations/nn.json
@@ -7,11 +7,6 @@
         "history": "Historie",
         "mailbox": "Postkasse",
         "shopping_list": "Handleliste",
-        "dev-services": "Tenester",
-        "dev-states": "Statusar",
-        "dev-events": "Hendingar",
-        "dev-templates": "Malar",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Utviklarverkty",
         "calendar": "Kalendrar",
@@ -312,6 +307,25 @@
                 "add_item": "Legg til",
                 "microphone_tip": "Trykk på mikorfonen øvst til høgre og sei \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Tenester"
+                    },
+                    "states": {
+                        "title": "Statusar"
+                    },
+                    "events": {
+                        "title": "Hendingar"
+                    },
+                    "templates": {
+                        "title": "Malar"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Viser oppføringer for",
                 "period": "Periode"
diff --git a/translations/pl.json b/translations/pl.json
index 6001b6a8dc..323618fe8a 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -7,11 +7,6 @@
         "history": "Historia",
         "mailbox": "Poczta",
         "shopping_list": "Lista zakupów",
-        "dev-services": "Usługi",
-        "dev-states": "Stany",
-        "dev-events": "Zdarzenia",
-        "dev-templates": "Szablony",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informacje",
         "developer_tools": "Narzędzia deweloperskie",
         "calendar": "Kalendarz",
@@ -313,6 +308,25 @@
                 "add_item": "Dodaj element",
                 "microphone_tip": "Kliknij ikonę mikrofonu w prawym górnym rogu i powiedz “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Usługi"
+                    },
+                    "states": {
+                        "title": "Stany"
+                    },
+                    "events": {
+                        "title": "Zdarzenia"
+                    },
+                    "templates": {
+                        "title": "Szablony"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Wyświetlanie rekordów dla",
                 "period": "Okres"
diff --git a/translations/pt-BR.json b/translations/pt-BR.json
index c88be5b110..680715460c 100644
--- a/translations/pt-BR.json
+++ b/translations/pt-BR.json
@@ -7,11 +7,6 @@
         "history": "Histórico",
         "mailbox": "Caixa de correio",
         "shopping_list": "Lista de compras",
-        "dev-services": "Serviços",
-        "dev-states": "Estado",
-        "dev-events": "Eventos",
-        "dev-templates": "Modelos",
-        "dev-mqtt": "",
         "dev-info": "Informações",
         "developer_tools": "Ferramentas do desenvolvedor",
         "calendar": "Calendário",
@@ -312,6 +307,25 @@
                 "add_item": "Adicionar item",
                 "microphone_tip": "Clique no microfone no canto superior direito e diga \"Adicionar doces à minha lista de compras\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Serviços"
+                    },
+                    "states": {
+                        "title": "Estado"
+                    },
+                    "events": {
+                        "title": "Eventos"
+                    },
+                    "templates": {
+                        "title": "Modelos"
+                    },
+                    "mqtt": {
+                        "title": ""
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Exibindo entradas para",
                 "period": "Período"
diff --git a/translations/pt.json b/translations/pt.json
index c9e196dcf9..96ad42681f 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -7,11 +7,6 @@
         "history": "Histórico",
         "mailbox": "Caixa de correio",
         "shopping_list": "Lista de compras",
-        "dev-services": "Serviços",
-        "dev-states": "Estados",
-        "dev-events": "Eventos",
-        "dev-templates": "Modelos",
-        "dev-mqtt": "MQTT",
         "dev-info": "Informações",
         "developer_tools": "Ferramentas de programação",
         "calendar": "Calendário",
@@ -312,6 +307,25 @@
                 "add_item": "Adicionar item",
                 "microphone_tip": "Clique no microfone do canto superior direito e diga “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Serviços"
+                    },
+                    "states": {
+                        "title": "Estados"
+                    },
+                    "events": {
+                        "title": "Eventos"
+                    },
+                    "templates": {
+                        "title": "Modelos"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Mostrar valores para",
                 "period": "Período"
diff --git a/translations/ro.json b/translations/ro.json
index 372d1e342c..ca889f7b97 100644
--- a/translations/ro.json
+++ b/translations/ro.json
@@ -7,11 +7,6 @@
         "history": "Istoric",
         "mailbox": "Cutie poștală",
         "shopping_list": "Listă de cumpărături",
-        "dev-services": "Servicii",
-        "dev-states": "Status",
-        "dev-events": "Evenimente",
-        "dev-templates": "Sabloane",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Instrumente de dezvoltare",
         "calendar": "Calendar",
@@ -311,6 +306,25 @@
                 "add_item": "Adaugare element",
                 "microphone_tip": "Atingeți microfonul din partea dreaptă sus și spuneți \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Servicii"
+                    },
+                    "states": {
+                        "title": "Status"
+                    },
+                    "events": {
+                        "title": "Evenimente"
+                    },
+                    "templates": {
+                        "title": "Sabloane"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Se afișează intrările pentru",
                 "period": "Perioadă"
diff --git a/translations/ru.json b/translations/ru.json
index 2515a80f54..062eb41bff 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -7,11 +7,6 @@
         "history": "История",
         "mailbox": "Почта",
         "shopping_list": "Список покупок",
-        "dev-services": "Службы",
-        "dev-states": "Состояния",
-        "dev-events": "События",
-        "dev-templates": "Шаблоны",
-        "dev-mqtt": "MQTT",
         "dev-info": "Информация",
         "developer_tools": "Инструменты разработчика",
         "calendar": "Календарь",
@@ -313,6 +308,25 @@
                 "add_item": "Добавить элемент",
                 "microphone_tip": "Нажмите на микрофон в правом верхнем углу и скажите “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Службы"
+                    },
+                    "states": {
+                        "title": "Состояния"
+                    },
+                    "events": {
+                        "title": "События"
+                    },
+                    "templates": {
+                        "title": "Шаблоны"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Отображение записей за",
                 "period": "Период"
diff --git a/translations/sk.json b/translations/sk.json
index bd3496997b..ed21bb4421 100644
--- a/translations/sk.json
+++ b/translations/sk.json
@@ -7,11 +7,6 @@
         "history": "História",
         "mailbox": "Poštová schránka",
         "shopping_list": "Nákupný zoznam",
-        "dev-services": "Služby",
-        "dev-states": "Stavy",
-        "dev-events": "Udalosti",
-        "dev-templates": "Šablóny",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Vývojárske nástroje",
         "calendar": "Kalendár",
@@ -313,6 +308,25 @@
                 "add_item": "Pridať položku",
                 "microphone_tip": "Kliknite na ikonu mikrofónu vpravo hore a povedzte “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Služby"
+                    },
+                    "states": {
+                        "title": "Stavy"
+                    },
+                    "events": {
+                        "title": "Udalosti"
+                    },
+                    "templates": {
+                        "title": "Šablóny"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Zobrazujú sa záznamy pre",
                 "period": "Obdobie"
diff --git a/translations/sl.json b/translations/sl.json
index afd4806eea..61ed8df576 100644
--- a/translations/sl.json
+++ b/translations/sl.json
@@ -7,11 +7,6 @@
         "history": "Zgodovina",
         "mailbox": "Nabiralnik",
         "shopping_list": "Nakupovalni seznam",
-        "dev-services": "Storitve",
-        "dev-states": "Stanja",
-        "dev-events": "Dogodki",
-        "dev-templates": "Predloge",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Orodja za razvijalce",
         "calendar": "Koledar",
@@ -313,6 +308,25 @@
                 "add_item": "Dodaj potrebščino",
                 "microphone_tip": "Tapnite mikrofon zgoraj desno in recite (Le ANG) \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Storitve"
+                    },
+                    "states": {
+                        "title": "Stanja"
+                    },
+                    "events": {
+                        "title": "Dogodki"
+                    },
+                    "templates": {
+                        "title": "Predloge"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Prikaz vnosov za",
                 "period": "Obdobje"
diff --git a/translations/sr-Latn.json b/translations/sr-Latn.json
index a17d3282d7..752344ee96 100644
--- a/translations/sr-Latn.json
+++ b/translations/sr-Latn.json
@@ -6,14 +6,20 @@
         "logbook": "Dnevnik",
         "history": "Istorija",
         "mailbox": "Poštansko sanduče",
-        "shopping_list": "Lista za kupovinu",
-        "dev-mqtt": "MQTT"
+        "shopping_list": "Lista za kupovinu"
     },
     "ui": {
         "sidebar": {
             "log_out": "Odjaviti se"
         },
         "panel": {
+            "developer-tools": {
+                "tabs": {
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "config": {
                 "zwave": {
                     "caption": "Z-Wave"
diff --git a/translations/sr.json b/translations/sr.json
index 08263d5752..d56598be8a 100644
--- a/translations/sr.json
+++ b/translations/sr.json
@@ -7,7 +7,6 @@
         "history": "Историја",
         "mailbox": "Поштанско сандуче",
         "shopping_list": "Листа за куповину",
-        "dev-mqtt": "MQTT",
         "calendar": "Kalendar"
     },
     "state": {
@@ -55,6 +54,13 @@
             "log_out": "Одјавити се"
         },
         "panel": {
+            "developer-tools": {
+                "tabs": {
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "config": {
                 "zwave": {
                     "caption": "Z-Wave"
diff --git a/translations/sv.json b/translations/sv.json
index 2d9b0986e0..21ac2f24fb 100644
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -7,11 +7,6 @@
         "history": "Historik",
         "mailbox": "Brevlåda",
         "shopping_list": "Inköpslista",
-        "dev-services": "Tjänster",
-        "dev-states": "Tillstånd",
-        "dev-events": "Händelser",
-        "dev-templates": "Mallar",
-        "dev-mqtt": "MQTT",
         "dev-info": "Info",
         "developer_tools": "Utvecklarverktyg",
         "calendar": "Kalender",
@@ -312,6 +307,25 @@
                 "add_item": "Lägg till objekt",
                 "microphone_tip": "Tryck på mikrofonen längst upp till höger och säg \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Tjänster"
+                    },
+                    "states": {
+                        "title": "Tillstånd"
+                    },
+                    "events": {
+                        "title": "Händelser"
+                    },
+                    "templates": {
+                        "title": "Mallar"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Visar poster för",
                 "period": "Period"
diff --git a/translations/ta.json b/translations/ta.json
index faada65fd4..bcc4c774b3 100644
--- a/translations/ta.json
+++ b/translations/ta.json
@@ -6,8 +6,7 @@
         "logbook": "பதிவேடுகள்",
         "history": "வரலாறு",
         "mailbox": "அஞ்சல் பெட்டி",
-        "shopping_list": "பொருட்கள் பட்டியல்",
-        "dev-mqtt": "MQTT"
+        "shopping_list": "பொருட்கள் பட்டியல்"
     },
     "state": {
         "default": {
@@ -236,17 +235,24 @@
         "sidebar": {
             "log_out": "வெளியேறு"
         },
-        "login-form": {
-            "password": "கடவுச்சொல்",
-            "remember": "நினைவில் கொள்",
-            "log_in": "உள் நுழை"
-        },
         "panel": {
+            "developer-tools": {
+                "tabs": {
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "config": {
                 "zwave": {
                     "caption": "Z-Wave"
                 }
             }
+        },
+        "login-form": {
+            "password": "கடவுச்சொல்",
+            "remember": "நினைவில் கொள்",
+            "log_in": "உள் நுழை"
         }
     },
     "domain": {
diff --git a/translations/te.json b/translations/te.json
index a9c750d869..1a6fe5a872 100644
--- a/translations/te.json
+++ b/translations/te.json
@@ -7,11 +7,6 @@
         "history": "చరిత్ర",
         "mailbox": "మెయిల్ బాక్స్",
         "shopping_list": "షాపింగ్ జాబితా",
-        "dev-services": "సేవలు",
-        "dev-states": "స్టేట్స్",
-        "dev-events": "సంఘటనలు",
-        "dev-templates": "టెంప్లేట్లు",
-        "dev-mqtt": "MQTT",
         "dev-info": "సమాచారం",
         "developer_tools": "డెవలపర్ టూల్స్",
         "calendar": "క్యాలెండర్"
@@ -287,6 +282,25 @@
                 "add_item": "క్రొత్తది జోడించు",
                 "microphone_tip": "కుడి వైపున మైక్రోఫోన్ను నొక్కి, “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "సేవలు"
+                    },
+                    "states": {
+                        "title": "స్టేట్స్"
+                    },
+                    "events": {
+                        "title": "సంఘటనలు"
+                    },
+                    "templates": {
+                        "title": "టెంప్లేట్లు"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "period": "కాలం"
             },
diff --git a/translations/th.json b/translations/th.json
index 50d72192c7..c23e3e6fef 100644
--- a/translations/th.json
+++ b/translations/th.json
@@ -7,11 +7,6 @@
         "history": "ประวัติการทำงาน",
         "mailbox": "กล่องจดหมาย",
         "shopping_list": "รายการซื้อของ",
-        "dev-services": "บริการ",
-        "dev-states": "สถานะ",
-        "dev-events": "เหตุการณ์",
-        "dev-templates": "แม่แบบ",
-        "dev-mqtt": "MQTT",
         "dev-info": "ข้อมูล",
         "developer_tools": "เครื่องมือสำหรับนักพัฒนา",
         "calendar": "ปฏิทิน",
@@ -312,6 +307,25 @@
                 "add_item": "เพิ่มรายการใหม่",
                 "microphone_tip": "ลองแตะไมโครโฟนที่ด้านบนขวาและพูดว่า \"เพิ่มลูกอมลงในรายการช้อปปิ้งของฉัน\" ดูสิ!"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "บริการ"
+                    },
+                    "states": {
+                        "title": "สถานะ"
+                    },
+                    "events": {
+                        "title": "เหตุการณ์"
+                    },
+                    "templates": {
+                        "title": "แม่แบบ"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "วันที่ต้องการแสดง",
                 "period": "ช่วงเวลา"
diff --git a/translations/tr.json b/translations/tr.json
index 6d10e633b0..aa649a80dc 100644
--- a/translations/tr.json
+++ b/translations/tr.json
@@ -7,11 +7,6 @@
         "history": "Geçmiş",
         "mailbox": "Posta kutusu",
         "shopping_list": "Alışveriş listesi",
-        "dev-services": "Servisler",
-        "dev-states": "Durumlar",
-        "dev-events": "Olaylar",
-        "dev-templates": "Taslaklar",
-        "dev-mqtt": "MQTT",
         "dev-info": "Bilgi",
         "developer_tools": "Geliştirici araçları",
         "calendar": "Takvim",
@@ -291,6 +286,25 @@
                 "add_item": "Öge Ekle",
                 "microphone_tip": "Sağ üstteki mikrofona dokunun ve \"alışveriş listeme şeker ekle\" deyin"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Servisler"
+                    },
+                    "states": {
+                        "title": "Durumlar"
+                    },
+                    "events": {
+                        "title": "Olaylar"
+                    },
+                    "templates": {
+                        "title": "Taslaklar"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Gösterilen girişler",
                 "period": "Dönem"
diff --git a/translations/uk.json b/translations/uk.json
index f4528c3b2d..48f2134b90 100644
--- a/translations/uk.json
+++ b/translations/uk.json
@@ -7,11 +7,6 @@
         "history": "Історія",
         "mailbox": "Поштова скринька",
         "shopping_list": "Список покупок",
-        "dev-services": "Послуги",
-        "dev-states": "Стан",
-        "dev-events": "Події",
-        "dev-templates": "Шаблони",
-        "dev-mqtt": "MQTT",
         "dev-info": "Інформація",
         "developer_tools": "Інструменти для розробників",
         "calendar": "Календар",
@@ -311,6 +306,25 @@
                 "add_item": "Додати елемент",
                 "microphone_tip": "Торкніться мікрофона у верхньому правому куті та скажіть \"Add candy to my shopping list\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Послуги"
+                    },
+                    "states": {
+                        "title": "Стан"
+                    },
+                    "events": {
+                        "title": "Події"
+                    },
+                    "templates": {
+                        "title": "Шаблони"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Показані записи для",
                 "period": "Період"
diff --git a/translations/vi.json b/translations/vi.json
index 3fa677041b..698050b0ec 100644
--- a/translations/vi.json
+++ b/translations/vi.json
@@ -7,11 +7,6 @@
         "history": "Lịch sử",
         "mailbox": "Hộp thư",
         "shopping_list": "Danh sách mua sắm",
-        "dev-services": "Dịch vụ",
-        "dev-states": "Trạng thái",
-        "dev-events": "Sự kiện",
-        "dev-templates": "Mẫu sẵn",
-        "dev-mqtt": "MQTT",
         "dev-info": "Thông tin",
         "developer_tools": "Công cụ Nhà phát triển",
         "calendar": "Lịch",
@@ -310,6 +305,25 @@
                 "add_item": "Thêm mục",
                 "microphone_tip": "Chạm vào micrô ở trên cùng bên phải và nói \"Thêm kẹo vào danh sách mua sắm của tôi\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "Dịch vụ"
+                    },
+                    "states": {
+                        "title": "Trạng thái"
+                    },
+                    "events": {
+                        "title": "Sự kiện"
+                    },
+                    "templates": {
+                        "title": "Mẫu sẵn"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "Hiển thị mục cho",
                 "period": "Giai đoạn"
diff --git a/translations/zh-Hans.json b/translations/zh-Hans.json
index 4935d67f16..e8048ab303 100644
--- a/translations/zh-Hans.json
+++ b/translations/zh-Hans.json
@@ -7,11 +7,6 @@
         "history": "历史",
         "mailbox": "邮箱",
         "shopping_list": "购物清单",
-        "dev-services": "服务",
-        "dev-states": "状态",
-        "dev-events": "事件",
-        "dev-templates": "模板",
-        "dev-mqtt": "MQTT",
         "dev-info": "信息",
         "developer_tools": "开发者工具",
         "calendar": "日历",
@@ -313,6 +308,25 @@
                 "add_item": "添加项目",
                 "microphone_tip": "点击右上角麦克风图标并说 “Add candy to my shopping list”"
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "服务"
+                    },
+                    "states": {
+                        "title": "状态"
+                    },
+                    "events": {
+                        "title": "事件"
+                    },
+                    "templates": {
+                        "title": "模板"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "显示自以下日期的图表",
                 "period": "日期范围"
diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json
index 509ba6f560..67ac6b5ca7 100644
--- a/translations/zh-Hant.json
+++ b/translations/zh-Hant.json
@@ -7,11 +7,6 @@
         "history": "歷史",
         "mailbox": "郵箱",
         "shopping_list": "購物清單",
-        "dev-services": "服務",
-        "dev-states": "狀態",
-        "dev-events": "事件",
-        "dev-templates": "模板",
-        "dev-mqtt": "MQTT",
         "dev-info": "資訊",
         "developer_tools": "開發工具",
         "calendar": "行事曆",
@@ -313,6 +308,25 @@
                 "add_item": "新加入清單",
                 "microphone_tip": "點擊右上角的麥克風圖示，並說\"加入糖果到我的購物清單內\""
             },
+            "developer-tools": {
+                "tabs": {
+                    "services": {
+                        "title": "服務"
+                    },
+                    "states": {
+                        "title": "狀態"
+                    },
+                    "events": {
+                        "title": "事件"
+                    },
+                    "templates": {
+                        "title": "模板"
+                    },
+                    "mqtt": {
+                        "title": "MQTT"
+                    }
+                }
+            },
             "history": {
                 "showing_entries": "選擇要查看的時間",
                 "period": "期間長"