diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8d592e3267..67c22f11a3 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -73,8 +73,8 @@ jobs:
       matrix:
         arch: ["aarch64", "armhf", "armv7", "amd64", "i386"]
         tag:
-          - "3.8-alpine3.12"
           - "3.9-alpine3.13"
+          - "3.9-alpine3.14"
     steps:
       - name: Download requirements.txt
         uses: actions/download-artifact@v2
diff --git a/build-scripts/gulp/clean.js b/build-scripts/gulp/clean.js
index caad547641..2b184d5e63 100644
--- a/build-scripts/gulp/clean.js
+++ b/build-scripts/gulp/clean.js
@@ -5,32 +5,32 @@ require("./translations");
 
 gulp.task(
   "clean",
-  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([paths.app_output_root, paths.build_dir]);
-  })
+  gulp.parallel("clean-translations", () =>
+    del([paths.app_output_root, paths.build_dir])
+  )
 );
 
 gulp.task(
   "clean-demo",
-  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([paths.demo_output_root, paths.build_dir]);
-  })
+  gulp.parallel("clean-translations", () =>
+    del([paths.demo_output_root, paths.build_dir])
+  )
 );
 
 gulp.task(
   "clean-cast",
-  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([paths.cast_output_root, paths.build_dir]);
-  })
+  gulp.parallel("clean-translations", () =>
+    del([paths.cast_output_root, paths.build_dir])
+  )
 );
 
-gulp.task("clean-hassio", function cleanOutputAndBuildDir() {
-  return del([paths.hassio_output_root, paths.build_dir]);
-});
+gulp.task("clean-hassio", () =>
+  del([paths.hassio_output_root, paths.build_dir])
+);
 
 gulp.task(
   "clean-gallery",
-  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([paths.gallery_output_root, paths.build_dir]);
-  })
+  gulp.parallel("clean-translations", () =>
+    del([paths.gallery_output_root, paths.build_dir])
+  )
 );
diff --git a/build-scripts/gulp/gather-static.js b/build-scripts/gulp/gather-static.js
index 3361cf798d..e156c84825 100644
--- a/build-scripts/gulp/gather-static.js
+++ b/build-scripts/gulp/gather-static.js
@@ -12,8 +12,10 @@ const polyPath = (...parts) => path.resolve(paths.polymer_dir, ...parts);
 const copyFileDir = (fromFile, toDir) =>
   fs.copySync(fromFile, path.join(toDir, path.basename(fromFile)));
 
-const genStaticPath = (staticDir) => (...parts) =>
-  path.resolve(staticDir, ...parts);
+const genStaticPath =
+  (staticDir) =>
+  (...parts) =>
+    path.resolve(staticDir, ...parts);
 
 function copyTranslations(staticDir) {
   const staticPath = genStaticPath(staticDir);
diff --git a/build-scripts/gulp/translations.js b/build-scripts/gulp/translations.js
index e948a674db..327a04df80 100755
--- a/build-scripts/gulp/translations.js
+++ b/build-scripts/gulp/translations.js
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
 const crypto = require("crypto");
 const del = require("del");
 const path = require("path");
@@ -26,13 +28,6 @@ gulp.task("translations-enable-merge-backend", (done) => {
   done();
 });
 
-String.prototype.rsplit = function (sep, maxsplit) {
-  var split = this.split(sep);
-  return maxsplit
-    ? [split.slice(0, -maxsplit).join(sep)].concat(split.slice(-maxsplit))
-    : split;
-};
-
 // Panel translations which should be split from the core translations.
 const TRANSLATION_FRAGMENTS = Object.keys(
   require("../../src/translations/en.json").ui.panel
@@ -40,7 +35,7 @@ const TRANSLATION_FRAGMENTS = Object.keys(
 
 function recursiveFlatten(prefix, data) {
   let output = {};
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach((key) => {
     if (typeof data[key] === "object") {
       output = {
         ...output,
@@ -101,15 +96,19 @@ function lokaliseTransform(data, original, file) {
     if (value instanceof Object) {
       output[key] = lokaliseTransform(value, original, file);
     } else {
-      output[key] = value.replace(re_key_reference, (match, key) => {
-        const replace = key.split("::").reduce((tr, k) => {
+      output[key] = value.replace(re_key_reference, (_match, lokalise_key) => {
+        const replace = lokalise_key.split("::").reduce((tr, k) => {
           if (!tr) {
-            throw Error(`Invalid key placeholder ${key} in ${file.path}`);
+            throw Error(
+              `Invalid key placeholder ${lokalise_key} in ${file.path}`
+            );
           }
           return tr[k];
         }, original);
         if (typeof replace !== "string") {
-          throw Error(`Invalid key placeholder ${key} in ${file.path}`);
+          throw Error(
+            `Invalid key placeholder ${lokalise_key} in ${file.path}`
+          );
         }
         return replace;
       });
@@ -118,9 +117,7 @@ function lokaliseTransform(data, original, file) {
   return output;
 }
 
-gulp.task("clean-translations", function () {
-  return del([workDir]);
-});
+gulp.task("clean-translations", () => del([workDir]));
 
 gulp.task("ensure-translations-build-dir", (done) => {
   if (!fs.existsSync(workDir)) {
@@ -129,7 +126,7 @@ gulp.task("ensure-translations-build-dir", (done) => {
   done();
 });
 
-gulp.task("create-test-metadata", function (cb) {
+gulp.task("create-test-metadata", (cb) => {
   fs.writeFile(
     workDir + "/testMetadata.json",
     JSON.stringify({
@@ -143,17 +140,13 @@ gulp.task("create-test-metadata", function (cb) {
 
 gulp.task(
   "create-test-translation",
-  gulp.series("create-test-metadata", function createTestTranslation() {
-    return gulp
+  gulp.series("create-test-metadata", () =>
+    gulp
       .src(path.join(paths.translations_src, "en.json"))
-      .pipe(
-        transform(function (data, file) {
-          return recursiveEmpty(data);
-        })
-      )
+      .pipe(transform((data, _file) => recursiveEmpty(data)))
       .pipe(rename("test.json"))
-      .pipe(gulp.dest(workDir));
-  })
+      .pipe(gulp.dest(workDir))
+  )
 );
 
 /**
@@ -165,7 +158,7 @@ gulp.task(
  * project is buildable immediately after merging new translation keys, since
  * the Lokalise update to translations/en.json will not happen immediately.
  */
-gulp.task("build-master-translation", function () {
+gulp.task("build-master-translation", () => {
   const src = [path.join(paths.translations_src, "en.json")];
 
   if (mergeBackend) {
@@ -174,11 +167,7 @@ gulp.task("build-master-translation", function () {
 
   return gulp
     .src(src)
-    .pipe(
-      transform(function (data, file) {
-        return lokaliseTransform(data, data, file);
-      })
-    )
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
     .pipe(
       merge({
         fileName: "translationMaster.json",
@@ -187,18 +176,14 @@ gulp.task("build-master-translation", function () {
     .pipe(gulp.dest(workDir));
 });
 
-gulp.task("build-merged-translations", function () {
-  return gulp
+gulp.task("build-merged-translations", () =>
+  gulp
     .src([inFrontendDir + "/*.json", workDir + "/test.json"], {
       allowEmpty: true,
     })
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
     .pipe(
-      transform(function (data, file) {
-        return lokaliseTransform(data, data, file);
-      })
-    )
-    .pipe(
-      foreach(function (stream, file) {
+      foreach((stream, file) => {
         // For each language generate a merged json file. It begins with the master
         // translation as a failsafe for untranslated strings, and merges all parent
         // tags into one file for each specific subtag
@@ -230,17 +215,17 @@ gulp.task("build-merged-translations", function () {
           )
           .pipe(gulp.dest(fullDir));
       })
-    );
-});
+    )
+);
 
-var taskName;
+let taskName;
 
 const splitTasks = [];
 TRANSLATION_FRAGMENTS.forEach((fragment) => {
   taskName = "build-translation-fragment-" + fragment;
-  gulp.task(taskName, function () {
+  gulp.task(taskName, () =>
     // Return only the translations for this fragment.
-    return gulp
+    gulp
       .src(fullDir + "/*.json")
       .pipe(
         transform((data) => ({
@@ -251,18 +236,18 @@ TRANSLATION_FRAGMENTS.forEach((fragment) => {
           },
         }))
       )
-      .pipe(gulp.dest(workDir + "/" + fragment));
-  });
+      .pipe(gulp.dest(workDir + "/" + fragment))
+  );
   splitTasks.push(taskName);
 });
 
 taskName = "build-translation-core";
-gulp.task(taskName, function () {
+gulp.task(taskName, () =>
   // Remove the fragment translations from the core translation.
-  return gulp
+  gulp
     .src(fullDir + "/*.json")
     .pipe(
-      transform((data, file) => {
+      transform((data, _file) => {
         TRANSLATION_FRAGMENTS.forEach((fragment) => {
           delete data.ui.panel[fragment];
         });
@@ -270,14 +255,14 @@ gulp.task(taskName, function () {
         return data;
       })
     )
-    .pipe(gulp.dest(coreDir));
-});
+    .pipe(gulp.dest(coreDir))
+);
 
 splitTasks.push(taskName);
 
-gulp.task("build-flattened-translations", function () {
+gulp.task("build-flattened-translations", () =>
   // Flatten the split versions of our translations, and move them into outDir
-  return gulp
+  gulp
     .src(
       TRANSLATION_FRAGMENTS.map(
         (fragment) => workDir + "/" + fragment + "/*.json"
@@ -285,41 +270,45 @@ gulp.task("build-flattened-translations", function () {
       { base: workDir }
     )
     .pipe(
-      transform(function (data) {
+      transform((data) =>
         // Polymer.AppLocalizeBehavior requires flattened json
-        return flatten(data);
-      })
+        flatten(data)
+      )
     )
     .pipe(
       rename((filePath) => {
         if (filePath.dirname === "core") {
           filePath.dirname = "";
         }
+        // In dev we create the file with the fake hash in the filename
+        if (!env.isProdBuild()) {
+          filePath.basename += "-dev";
+        }
       })
     )
-    .pipe(gulp.dest(outDir));
-});
+    .pipe(gulp.dest(outDir))
+);
 
 const fingerprints = {};
 
-gulp.task(
-  "build-translation-fingerprints",
-  function fingerprintTranslationFiles() {
-    // Fingerprint full file of each language
-    const files = fs.readdirSync(fullDir);
+gulp.task("build-translation-fingerprints", () => {
+  // Fingerprint full file of each language
+  const files = fs.readdirSync(fullDir);
 
-    for (let i = 0; i < files.length; i++) {
-      fingerprints[files[i].split(".")[0]] = {
-        // In dev we create fake hashes
-        hash: env.isProdBuild()
-          ? crypto
-              .createHash("md5")
-              .update(fs.readFileSync(path.join(fullDir, files[i]), "utf-8"))
-              .digest("hex")
-          : "dev",
-      };
-    }
+  for (let i = 0; i < files.length; i++) {
+    fingerprints[files[i].split(".")[0]] = {
+      // In dev we create fake hashes
+      hash: env.isProdBuild()
+        ? crypto
+            .createHash("md5")
+            .update(fs.readFileSync(path.join(fullDir, files[i]), "utf-8"))
+            .digest("hex")
+        : "dev",
+    };
+  }
 
+  // In dev we create the file with the fake hash in the filename
+  if (env.isProdBuild()) {
     mapFiles(outDir, ".json", (filename) => {
       const parsed = path.parse(filename);
 
@@ -335,35 +324,35 @@ gulp.task(
         }`
       );
     });
-
-    const stream = source("translationFingerprints.json");
-    stream.write(JSON.stringify(fingerprints));
-    process.nextTick(() => stream.end());
-    return stream.pipe(vinylBuffer()).pipe(gulp.dest(workDir));
   }
-);
 
-gulp.task("build-translation-fragment-supervisor", function () {
-  return gulp
+  const stream = source("translationFingerprints.json");
+  stream.write(JSON.stringify(fingerprints));
+  process.nextTick(() => stream.end());
+  return stream.pipe(vinylBuffer()).pipe(gulp.dest(workDir));
+});
+
+gulp.task("build-translation-fragment-supervisor", () =>
+  gulp
     .src(fullDir + "/*.json")
     .pipe(transform((data) => data.supervisor))
-    .pipe(gulp.dest(workDir + "/supervisor"));
-});
+    .pipe(gulp.dest(workDir + "/supervisor"))
+);
 
-gulp.task("build-translation-flatten-supervisor", function () {
-  return gulp
+gulp.task("build-translation-flatten-supervisor", () =>
+  gulp
     .src(workDir + "/supervisor/*.json")
     .pipe(
-      transform(function (data) {
+      transform((data) =>
         // Polymer.AppLocalizeBehavior requires flattened json
-        return flatten(data);
-      })
+        flatten(data)
+      )
     )
-    .pipe(gulp.dest(outDir));
-});
+    .pipe(gulp.dest(outDir))
+);
 
-gulp.task("build-translation-write-metadata", function writeMetadata() {
-  return gulp
+gulp.task("build-translation-write-metadata", () =>
+  gulp
     .src(
       [
         path.join(paths.translations_src, "translationMetadata.json"),
@@ -374,13 +363,14 @@ gulp.task("build-translation-write-metadata", function writeMetadata() {
     )
     .pipe(merge({}))
     .pipe(
-      transform(function (data) {
+      transform((data) => {
         const newData = {};
         Object.entries(data).forEach(([key, value]) => {
           // Filter out translations without native name.
           if (value.nativeName) {
             newData[key] = value;
           } else {
+            // eslint-disable-next-line no-console
             console.warn(
               `Skipping language ${key}. Native name was not translated.`
             );
@@ -396,19 +386,26 @@ gulp.task("build-translation-write-metadata", function writeMetadata() {
       }))
     )
     .pipe(rename("translationMetadata.json"))
-    .pipe(gulp.dest(workDir));
-});
+    .pipe(gulp.dest(workDir))
+);
+
+gulp.task(
+  "create-translations",
+  gulp.series(
+    env.isProdBuild() ? (done) => done() : "create-test-translation",
+    "build-master-translation",
+    "build-merged-translations",
+    gulp.parallel(...splitTasks),
+    "build-flattened-translations"
+  )
+);
 
 gulp.task(
   "build-translations",
   gulp.series(
     "clean-translations",
     "ensure-translations-build-dir",
-    env.isProdBuild() ? (done) => done() : "create-test-translation",
-    "build-master-translation",
-    "build-merged-translations",
-    gulp.parallel(...splitTasks),
-    "build-flattened-translations",
+    "create-translations",
     "build-translation-fingerprints",
     "build-translation-write-metadata"
   )
diff --git a/build-scripts/gulp/webpack.js b/build-scripts/gulp/webpack.js
index 00886772a1..a9ba25da8c 100644
--- a/build-scripts/gulp/webpack.js
+++ b/build-scripts/gulp/webpack.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 // Tasks to run webpack.
 const fs = require("fs");
 const gulp = require("gulp");
@@ -44,7 +45,7 @@ const runDevServer = ({
     open: true,
     watchContentBase: true,
     contentBase,
-  }).listen(port, listenHost, function (err) {
+  }).listen(port, listenHost, (err) => {
     if (err) {
       throw err;
     }
@@ -65,6 +66,7 @@ const doneHandler = (done) => (err, stats) => {
   }
 
   if (stats.hasErrors() || stats.hasWarnings()) {
+    // eslint-disable-next-line no-console
     console.log(stats.toString("minimal"));
   }
 
@@ -90,16 +92,10 @@ gulp.task("webpack-watch-app", () => {
     process.env.ES5
       ? bothBuilds(createAppConfig, { isProdBuild: false })
       : createAppConfig({ isProdBuild: false, latestBuild: true })
-  ).watch(
-    {
-      ignored: /build-translations/,
-      poll: isWsl,
-    },
-    doneHandler()
-  );
+  ).watch({ poll: isWsl }, doneHandler());
   gulp.watch(
     path.join(paths.translations_src, "en.json"),
-    gulp.series("build-translations", "copy-translations-app")
+    gulp.series("create-translations", "copy-translations-app")
   );
 });
 
diff --git a/demo/src/ha-demo.ts b/demo/src/ha-demo.ts
index 38d348be22..958e14e0e3 100644
--- a/demo/src/ha-demo.ts
+++ b/demo/src/ha-demo.ts
@@ -23,7 +23,6 @@ import { mockTranslations } from "./stubs/translations";
 import { mockEnergy } from "./stubs/energy";
 import { mockConfig } from "./stubs/config";
 import { energyEntities } from "./stubs/entities";
-import { mockForecastSolar } from "./stubs/forecast_solar";
 
 class HaDemo extends HomeAssistantAppEl {
   protected async _initializeHass() {
@@ -52,7 +51,6 @@ class HaDemo extends HomeAssistantAppEl {
     mockMediaPlayer(hass);
     mockFrontend(hass);
     mockEnergy(hass);
-    mockForecastSolar(hass);
     mockConfig(hass);
     mockPersistentNotification(hass);
 
diff --git a/demo/src/stubs/energy.ts b/demo/src/stubs/energy.ts
index 58b7768b61..42e3fd5a20 100644
--- a/demo/src/stubs/energy.ts
+++ b/demo/src/stubs/energy.ts
@@ -1,3 +1,5 @@
+import { format, startOfToday, startOfTomorrow } from "date-fns";
+import { EnergySolarForecasts } from "../../../src/data/energy";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockEnergy = (hass: MockHomeAssistant) => {
@@ -44,6 +46,19 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
         stat_energy_from: "sensor.solar_production",
         config_entry_solar_forecast: ["solar_forecast"],
       },
+      /* {
+        type: "battery",
+        stat_energy_from: "sensor.battery_output",
+        stat_energy_to: "sensor.battery_input",
+      }, */
+      {
+        type: "gas",
+        stat_energy_from: "sensor.energy_gas",
+        stat_cost: "sensor.energy_gas_cost",
+        entity_energy_from: "sensor.energy_gas",
+        entity_energy_price: null,
+        number_energy_price: null,
+      },
     ],
     device_consumption: [
       {
@@ -67,4 +82,53 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
     ],
   }));
   hass.mockWS("energy/info", () => ({ cost_sensors: [] }));
+  const todayString = format(startOfToday(), "yyyy-MM-dd");
+  const tomorrowString = format(startOfTomorrow(), "yyyy-MM-dd");
+  hass.mockWS(
+    "energy/solar_forecast",
+    (): EnergySolarForecasts => ({
+      solar_forecast: {
+        wh_hours: {
+          [`${todayString}T06:00:00`]: 0,
+          [`${todayString}T06:23:00`]: 6,
+          [`${todayString}T06:45:00`]: 39,
+          [`${todayString}T07:00:00`]: 28,
+          [`${todayString}T08:00:00`]: 208,
+          [`${todayString}T09:00:00`]: 352,
+          [`${todayString}T10:00:00`]: 544,
+          [`${todayString}T11:00:00`]: 748,
+          [`${todayString}T12:00:00`]: 1259,
+          [`${todayString}T13:00:00`]: 1361,
+          [`${todayString}T14:00:00`]: 1373,
+          [`${todayString}T15:00:00`]: 1370,
+          [`${todayString}T16:00:00`]: 1186,
+          [`${todayString}T17:00:00`]: 937,
+          [`${todayString}T18:00:00`]: 652,
+          [`${todayString}T19:00:00`]: 370,
+          [`${todayString}T20:00:00`]: 155,
+          [`${todayString}T21:48:00`]: 24,
+          [`${todayString}T22:36:00`]: 0,
+          [`${tomorrowString}T06:01:00`]: 0,
+          [`${tomorrowString}T06:23:00`]: 9,
+          [`${tomorrowString}T06:45:00`]: 47,
+          [`${tomorrowString}T07:00:00`]: 48,
+          [`${tomorrowString}T08:00:00`]: 473,
+          [`${tomorrowString}T09:00:00`]: 827,
+          [`${tomorrowString}T10:00:00`]: 1153,
+          [`${tomorrowString}T11:00:00`]: 1413,
+          [`${tomorrowString}T12:00:00`]: 1590,
+          [`${tomorrowString}T13:00:00`]: 1652,
+          [`${tomorrowString}T14:00:00`]: 1612,
+          [`${tomorrowString}T15:00:00`]: 1438,
+          [`${tomorrowString}T16:00:00`]: 1149,
+          [`${tomorrowString}T17:00:00`]: 830,
+          [`${tomorrowString}T18:00:00`]: 542,
+          [`${tomorrowString}T19:00:00`]: 311,
+          [`${tomorrowString}T20:00:00`]: 140,
+          [`${tomorrowString}T21:47:00`]: 22,
+          [`${tomorrowString}T22:34:00`]: 0,
+        },
+      },
+    })
+  );
 };
diff --git a/demo/src/stubs/entities.ts b/demo/src/stubs/entities.ts
index 6ebfae96dc..132515a014 100644
--- a/demo/src/stubs/entities.ts
+++ b/demo/src/stubs/entities.ts
@@ -18,6 +18,24 @@ export const energyEntities = () =>
         unit_of_measurement: "kWh",
       },
     },
+    "sensor.battery_input": {
+      entity_id: "sensor.battery_input",
+      state: "4",
+      attributes: {
+        last_reset: "1970-01-01T00:00:00:00+00",
+        friendly_name: "Battery Input",
+        unit_of_measurement: "kWh",
+      },
+    },
+    "sensor.battery_output": {
+      entity_id: "sensor.battery_output",
+      state: "3",
+      attributes: {
+        last_reset: "1970-01-01T00:00:00:00+00",
+        friendly_name: "Battery Output",
+        unit_of_measurement: "kWh",
+      },
+    },
     "sensor.energy_consumption_tarif_1": {
       entity_id: "sensor.energy_consumption_tarif_1	",
       state: "88.6",
@@ -86,6 +104,23 @@ export const energyEntities = () =>
         unit_of_measurement: "EUR",
       },
     },
+    "sensor.energy_gas_cost": {
+      entity_id: "sensor.energy_gas_cost",
+      state: "2",
+      attributes: {
+        last_reset: "1970-01-01T00:00:00:00+00",
+        unit_of_measurement: "EUR",
+      },
+    },
+    "sensor.energy_gas": {
+      entity_id: "sensor.energy_gas",
+      state: "4",
+      attributes: {
+        last_reset: "1970-01-01T00:00:00:00+00",
+        friendly_name: "Gas",
+        unit_of_measurement: "m³",
+      },
+    },
     "sensor.energy_car": {
       entity_id: "sensor.energy_car",
       state: "4",
diff --git a/demo/src/stubs/forecast_solar.ts b/demo/src/stubs/forecast_solar.ts
deleted file mode 100644
index 19bb61083a..0000000000
--- a/demo/src/stubs/forecast_solar.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { format, startOfToday, startOfTomorrow } from "date-fns";
-import { ForecastSolarForecast } from "../../../src/data/forecast_solar";
-import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockForecastSolar = (hass: MockHomeAssistant) => {
-  const todayString = format(startOfToday(), "yyyy-MM-dd");
-  const tomorrowString = format(startOfTomorrow(), "yyyy-MM-dd");
-  hass.mockWS(
-    "forecast_solar/forecasts",
-    (): Record<string, ForecastSolarForecast> => ({
-      solar_forecast: {
-        wh_hours: {
-          [`${todayString}T06:00:00`]: 0,
-          [`${todayString}T06:23:00`]: 6,
-          [`${todayString}T06:45:00`]: 39,
-          [`${todayString}T07:00:00`]: 28,
-          [`${todayString}T08:00:00`]: 208,
-          [`${todayString}T09:00:00`]: 352,
-          [`${todayString}T10:00:00`]: 544,
-          [`${todayString}T11:00:00`]: 748,
-          [`${todayString}T12:00:00`]: 1259,
-          [`${todayString}T13:00:00`]: 1361,
-          [`${todayString}T14:00:00`]: 1373,
-          [`${todayString}T15:00:00`]: 1370,
-          [`${todayString}T16:00:00`]: 1186,
-          [`${todayString}T17:00:00`]: 937,
-          [`${todayString}T18:00:00`]: 652,
-          [`${todayString}T19:00:00`]: 370,
-          [`${todayString}T20:00:00`]: 155,
-          [`${todayString}T21:48:00`]: 24,
-          [`${todayString}T22:36:00`]: 0,
-          [`${tomorrowString}T06:01:00`]: 0,
-          [`${tomorrowString}T06:23:00`]: 9,
-          [`${tomorrowString}T06:45:00`]: 47,
-          [`${tomorrowString}T07:00:00`]: 48,
-          [`${tomorrowString}T08:00:00`]: 473,
-          [`${tomorrowString}T09:00:00`]: 827,
-          [`${tomorrowString}T10:00:00`]: 1153,
-          [`${tomorrowString}T11:00:00`]: 1413,
-          [`${tomorrowString}T12:00:00`]: 1590,
-          [`${tomorrowString}T13:00:00`]: 1652,
-          [`${tomorrowString}T14:00:00`]: 1612,
-          [`${tomorrowString}T15:00:00`]: 1438,
-          [`${tomorrowString}T16:00:00`]: 1149,
-          [`${tomorrowString}T17:00:00`]: 830,
-          [`${tomorrowString}T18:00:00`]: 542,
-          [`${tomorrowString}T19:00:00`]: 311,
-          [`${tomorrowString}T20:00:00`]: 140,
-          [`${tomorrowString}T21:47:00`]: 22,
-          [`${tomorrowString}T22:34:00`]: 0,
-        },
-      },
-    })
-  );
-};
diff --git a/demo/src/stubs/history.ts b/demo/src/stubs/history.ts
index 342b6cc4f0..adb456a584 100644
--- a/demo/src/stubs/history.ts
+++ b/demo/src/stubs/history.ts
@@ -1,4 +1,4 @@
-import { addHours, differenceInHours } from "date-fns";
+import { addHours, differenceInHours, endOfDay } from "date-fns";
 import { HassEntity } from "home-assistant-js-websocket";
 import { StatisticValue } from "../../../src/data/history";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
@@ -222,6 +222,7 @@ const statisticsFunctions: Record<
   "sensor.energy_production_tarif_2": (id, start, end) => {
     const productionStart = new Date(start.getTime() + 9 * 60 * 60 * 1000);
     const productionEnd = new Date(start.getTime() + 21 * 60 * 60 * 1000);
+    const dayEnd = new Date(endOfDay(productionEnd));
     const production = generateCurvedStatistics(
       id,
       productionStart,
@@ -237,15 +238,17 @@ const statisticsFunctions: Record<
     const evening = generateSumStatistics(
       id,
       productionEnd,
-      end,
+      dayEnd,
       productionFinalVal,
       0
     );
-    return [...morning, ...production, ...evening];
+    const rest = generateSumStatistics(id, dayEnd, end, productionFinalVal, 1);
+    return [...morning, ...production, ...evening, ...rest];
   },
   "sensor.solar_production": (id, start, end) => {
     const productionStart = new Date(start.getTime() + 7 * 60 * 60 * 1000);
     const productionEnd = new Date(start.getTime() + 23 * 60 * 60 * 1000);
+    const dayEnd = new Date(endOfDay(productionEnd));
     const production = generateCurvedStatistics(
       id,
       productionStart,
@@ -261,11 +264,12 @@ const statisticsFunctions: Record<
     const evening = generateSumStatistics(
       id,
       productionEnd,
-      end,
+      dayEnd,
       productionFinalVal,
       0
     );
-    return [...morning, ...production, ...evening];
+    const rest = generateSumStatistics(id, dayEnd, end, productionFinalVal, 2);
+    return [...morning, ...production, ...evening, ...rest];
   },
   "sensor.grid_fossil_fuel_percentage": (id, start, end) =>
     generateMeanStatistics(id, start, end, 35, 1.3),
diff --git a/gallery/src/demos/demo-ha-alert.ts b/gallery/src/demos/demo-ha-alert.ts
new file mode 100644
index 0000000000..e42c00f20e
--- /dev/null
+++ b/gallery/src/demos/demo-ha-alert.ts
@@ -0,0 +1,150 @@
+import { html, css, LitElement, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
+import "../../../src/components/ha-alert";
+import "../../../src/components/ha-card";
+
+const alerts: {
+  title?: string;
+  description: string | TemplateResult;
+  type: "info" | "warning" | "error" | "success";
+  dismissable?: boolean;
+  action?: string;
+  rtl?: boolean;
+}[] = [
+  {
+    title: "Test info alert",
+    description: "This is a test info alert with a title and description",
+    type: "info",
+  },
+  {
+    title: "Test warning alert",
+    description: "This is a test warning alert with a title and description",
+    type: "warning",
+  },
+  {
+    title: "Test error alert",
+    description: "This is a test error alert with a title and description",
+    type: "error",
+  },
+  {
+    title: "Test warning with long string",
+    description:
+      "sensor.lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum_lorem_ipsum",
+    type: "warning",
+  },
+  {
+    title: "Test success alert",
+    description: "This is a test success alert with a title and description",
+    type: "success",
+  },
+  {
+    description: "This is a test info alert with description only",
+    type: "info",
+  },
+  {
+    description:
+      "This is a test warning alert with a rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really rally really really long description only",
+    type: "warning",
+  },
+  {
+    title: "Error with description and list",
+    description: html`<p>
+        This is a test error alert with a title, description and a list
+      </p>
+      <ul>
+        <li>List item #1</li>
+        <li>List item #2</li>
+        <li>List item #3</li>
+      </ul>`,
+    type: "error",
+  },
+  {
+    title: "Test dismissable alert",
+    description: "This is a test success alert that can be dismissable",
+    type: "success",
+    dismissable: true,
+  },
+  {
+    description: "Dismissable information",
+    type: "info",
+    dismissable: true,
+  },
+  {
+    title: "Error with action",
+    description: "This is a test error alert with action",
+    type: "error",
+    action: "restart",
+  },
+  {
+    title: "Unsaved data",
+    description: "You have unsaved data",
+    type: "warning",
+    action: "save",
+  },
+  {
+    description: "Dismissable information (RTL)",
+    type: "info",
+    dismissable: true,
+    rtl: true,
+  },
+  {
+    title: "Error with action",
+    description: "This is a test error alert with action (RTL)",
+    type: "error",
+    action: "restart",
+    rtl: true,
+  },
+  {
+    title: "Test success alert (RTL)",
+    description: "This is a test success alert with a title and description",
+    type: "success",
+    rtl: true,
+  },
+];
+
+@customElement("demo-ha-alert")
+export class DemoHaAlert extends LitElement {
+  protected render(): TemplateResult {
+    return html`
+      <ha-card header="ha-alert demo">
+        ${alerts.map(
+          (alert) => html`
+            <ha-alert
+              .title=${alert.title || ""}
+              .alertType=${alert.type}
+              .dismissable=${alert.dismissable || false}
+              .actionText=${alert.action || ""}
+              .rtl=${alert.rtl || false}
+            >
+              ${alert.description}
+            </ha-alert>
+          `
+        )}
+      </ha-card>
+    `;
+  }
+
+  static get styles() {
+    return css`
+      ha-card {
+        max-width: 600px;
+        margin: 24px auto;
+      }
+      .condition {
+        padding: 16px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+      span {
+        margin-right: 16px;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-ha-alert": DemoHaAlert;
+  }
+}
diff --git a/gallery/src/ha-gallery.js b/gallery/src/ha-gallery.js
index f94fd0ab53..9d09da0119 100644
--- a/gallery/src/ha-gallery.js
+++ b/gallery/src/ha-gallery.js
@@ -172,6 +172,14 @@ class HaGallery extends PolymerElement {
       this.$.notifications.showDialog({ message: ev.detail.message })
     );
 
+    this.addEventListener("alert-dismissed-clicked", () =>
+      this.$.notifications.showDialog({ message: "Alert dismissed clicked" })
+    );
+
+    this.addEventListener("alert-action-clicked", () =>
+      this.$.notifications.showDialog({ message: "Alert action clicked" })
+    );
+
     this.addEventListener("hass-more-info", (ev) => {
       if (ev.detail.entityId) {
         this.$.notifications.showDialog({
diff --git a/hassio/src/addon-view/config/hassio-addon-audio.ts b/hassio/src/addon-view/config/hassio-addon-audio.ts
index ad6238c429..0851a1269b 100644
--- a/hassio/src/addon-view/config/hassio-addon-audio.ts
+++ b/hassio/src/addon-view/config/hassio-addon-audio.ts
@@ -13,6 +13,7 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import "web-animations-js/web-animations-next-lite.min";
 import "../../../../src/components/buttons/ha-progress-button";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
 import {
   HassioAddonDetails,
@@ -53,7 +54,9 @@ class HassioAddonAudio extends LitElement {
         .header=${this.supervisor.localize("addon.configuration.audio.header")}
       >
         <div class="card-content">
-          ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
+          ${this._error
+            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+            : ""}
 
           <paper-dropdown-menu
             .label=${this.supervisor.localize(
@@ -117,10 +120,6 @@ class HassioAddonAudio extends LitElement {
         paper-dropdown-menu {
           display: block;
         }
-        .errors {
-          color: var(--error-color);
-          margin-bottom: 16px;
-        }
         paper-item {
           width: 450px;
         }
diff --git a/hassio/src/addon-view/config/hassio-addon-config.ts b/hassio/src/addon-view/config/hassio-addon-config.ts
index 2a5758609e..a04820bb03 100644
--- a/hassio/src/addon-view/config/hassio-addon-config.ts
+++ b/hassio/src/addon-view/config/hassio-addon-config.ts
@@ -17,6 +17,7 @@ import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-button-menu";
 import "../../../../src/components/ha-card";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-form/ha-form";
 import type { HaFormSchema } from "../../../../src/components/ha-form/ha-form";
 import "../../../../src/components/ha-formfield";
@@ -135,17 +136,19 @@ class HassioAddonConfig extends LitElement {
                 @value-changed=${this._configChanged}
                 .yamlSchema=${ADDON_YAML_SCHEMA}
               ></ha-yaml-editor>`}
-          ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
+          ${this._error
+            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+            : ""}
           ${!this._yamlMode ||
           (this._canShowSchema && this.addon.schema) ||
           this._valid
             ? ""
             : html`
-                <div class="errors">
+                <ha-alert alert-type="error">
                   ${this.supervisor.localize(
                     "addon.configuration.options.invalid_yaml"
                   )}
-                </div>
+                </ha-alert>
               `}
         </div>
         ${hasHiddenOptions
@@ -324,13 +327,7 @@ class HassioAddonConfig extends LitElement {
           display: flex;
           justify-content: space-between;
         }
-        .errors {
-          color: var(--error-color);
-          margin-top: 16px;
-        }
-        .syntaxerror {
-          color: var(--error-color);
-        }
+
         .card-menu {
           float: right;
           z-index: 3;
diff --git a/hassio/src/addon-view/config/hassio-addon-network.ts b/hassio/src/addon-view/config/hassio-addon-network.ts
index 9eb8541bdd..5fe8371014 100644
--- a/hassio/src/addon-view/config/hassio-addon-network.ts
+++ b/hassio/src/addon-view/config/hassio-addon-network.ts
@@ -10,6 +10,7 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/buttons/ha-progress-button";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
 import {
   HassioAddonDetails,
@@ -62,7 +63,9 @@ class HassioAddonNetwork extends LitElement {
         )}
       >
         <div class="card-content">
-          ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
+          ${this._error
+            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+            : ""}
 
           <table>
             <tbody>
@@ -225,10 +228,6 @@ class HassioAddonNetwork extends LitElement {
         ha-card {
           display: block;
         }
-        .errors {
-          color: var(--error-color);
-          margin-bottom: 16px;
-        }
         .card-actions {
           display: flex;
           justify-content: space-between;
diff --git a/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts b/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts
index ba12198a97..c5b15cc819 100644
--- a/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts
+++ b/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts
@@ -1,5 +1,6 @@
 import "../../../../src/components/ha-card";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-circular-progress";
 import "../../../../src/components/ha-markdown";
 import { customElement, property, state } from "lit/decorators";
@@ -38,7 +39,9 @@ class HassioAddonDocumentationDashboard extends LitElement {
     return html`
       <div class="content">
         <ha-card>
-          ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
+          ${this._error
+            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+            : ""}
           <div class="card-content">
             ${this._content
               ? html`<ha-markdown .content=${this._content}></ha-markdown>`
diff --git a/hassio/src/addon-view/info/hassio-addon-info.ts b/hassio/src/addon-view/info/hassio-addon-info.ts
index 42b6969dbc..b415330194 100644
--- a/hassio/src/addon-view/info/hassio-addon-info.ts
+++ b/hassio/src/addon-view/info/hassio-addon-info.ts
@@ -23,6 +23,7 @@ import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { navigate } from "../../../../src/common/navigate";
 import "../../../../src/components/buttons/ha-call-api-button";
 import "../../../../src/components/buttons/ha-progress-button";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-label-badge";
 import "../../../../src/components/ha-markdown";
@@ -143,14 +144,14 @@ class HassioAddonInfo extends LitElement {
                       this.addon.arch
                     )
                     ? html`
-                        <p class="warning">
+                        <ha-alert alert-type="warning">
                           ${this.supervisor.localize(
                             "addon.dashboard.not_available_arch"
                           )}
-                        </p>
+                        </ha-alert>
                       `
                     : html`
-                        <p class="warning">
+                        <ha-alert alert-type="warning">
                           ${this.supervisor.localize(
                             "addon.dashboard.not_available_arch",
                             "core_version_installed",
@@ -158,7 +159,7 @@ class HassioAddonInfo extends LitElement {
                             "core_version_needed",
                             addonStoreInfo.homeassistant
                           )}
-                        </p>
+                        </ha-alert>
                       `
                   : ""}
               </div>
@@ -569,21 +570,23 @@ class HassioAddonInfo extends LitElement {
                 : ""}
             </div>
           </div>
-          ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
+          ${this._error
+            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+            : ""}
           ${!this.addon.version && addonStoreInfo && !this.addon.available
             ? !addonArchIsSupported(
                 this.supervisor.info.supported_arch,
                 this.addon.arch
               )
               ? html`
-                  <p class="warning">
+                  <ha-alert alert-type="warning">
                     ${this.supervisor.localize(
                       "addon.dashboard.not_available_arch"
                     )}
-                  </p>
+                  </ha-alert>
                 `
               : html`
-                  <p class="warning">
+                  <ha-alert alert-type="warning">
                     ${this.supervisor.localize(
                       "addon.dashboard.not_available_version",
                       "core_version_installed",
@@ -591,7 +594,7 @@ class HassioAddonInfo extends LitElement {
                       "core_version_needed",
                       addonStoreInfo!.homeassistant
                     )}
-                  </p>
+                  </ha-alert>
                 `
             : ""}
         </div>
@@ -987,7 +990,7 @@ class HassioAddonInfo extends LitElement {
       supervisor: this.supervisor,
       name: this.addon.name,
       version: this.addon.version_latest,
-      snapshotParams: {
+      backupParams: {
         name: `addon_${this.addon.slug}_${this.addon.version}`,
         addons: [this.addon.slug],
         homeassistant: false,
@@ -1149,6 +1152,7 @@ class HassioAddonInfo extends LitElement {
           margin-bottom: 16px;
         }
         img.logo {
+          max-width: 100%;
           max-height: 60px;
           margin: 16px 0;
           display: block;
@@ -1158,10 +1162,10 @@ class HassioAddonInfo extends LitElement {
           display: flex;
         }
         ha-svg-icon.running {
-          color: var(--paper-green-400);
+          color: var(--success-color);
         }
         ha-svg-icon.stopped {
-          color: var(--google-red-300);
+          color: var(--error-color);
         }
         ha-call-api-button {
           font-weight: 500;
diff --git a/hassio/src/addon-view/log/hassio-addon-logs.ts b/hassio/src/addon-view/log/hassio-addon-logs.ts
index a8ed8f3529..fc1cdab675 100644
--- a/hassio/src/addon-view/log/hassio-addon-logs.ts
+++ b/hassio/src/addon-view/log/hassio-addon-logs.ts
@@ -1,6 +1,7 @@
 import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
 import {
   fetchHassioAddonLogs,
@@ -34,7 +35,9 @@ class HassioAddonLogs extends LitElement {
     return html`
       <h1>${this.addon.name}</h1>
       <ha-card>
-        ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
+        ${this._error
+          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+          : ""}
         <div class="card-content">
           ${this._content
             ? html`<hassio-ansi-to-html
@@ -60,10 +63,6 @@ class HassioAddonLogs extends LitElement {
         ha-card {
           display: block;
         }
-        .errors {
-          color: var(--error-color);
-          margin-bottom: 16px;
-        }
       `,
     ];
   }
diff --git a/hassio/src/snapshots/hassio-snapshots.ts b/hassio/src/backups/hassio-backups.ts
similarity index 69%
rename from hassio/src/snapshots/hassio-snapshots.ts
rename to hassio/src/backups/hassio-backups.ts
index 56c527b667..e5e98c7c35 100644
--- a/hassio/src/snapshots/hassio-snapshots.ts
+++ b/hassio/src/backups/hassio-backups.ts
@@ -25,12 +25,12 @@ import "../../../src/components/ha-button-menu";
 import "../../../src/components/ha-fab";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
 import {
-  fetchHassioSnapshots,
+  fetchHassioBackups,
   friendlyFolderName,
-  HassioSnapshot,
-  reloadHassioSnapshots,
-  removeSnapshot,
-} from "../../../src/data/hassio/snapshot";
+  HassioBackup,
+  reloadHassioBackups,
+  removeBackup,
+} from "../../../src/data/hassio/backup";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import {
   showAlertDialog,
@@ -40,14 +40,14 @@ import "../../../src/layouts/hass-tabs-subpage-data-table";
 import type { HaTabsSubpageDataTable } from "../../../src/layouts/hass-tabs-subpage-data-table";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant, Route } from "../../../src/types";
-import { showHassioCreateSnapshotDialog } from "../dialogs/snapshot/show-dialog-hassio-create-snapshot";
-import { showHassioSnapshotDialog } from "../dialogs/snapshot/show-dialog-hassio-snapshot";
-import { showSnapshotUploadDialog } from "../dialogs/snapshot/show-dialog-snapshot-upload";
+import { showHassioCreateBackupDialog } from "../dialogs/backup/show-dialog-hassio-create-backup";
+import { showHassioBackupDialog } from "../dialogs/backup/show-dialog-hassio-backup";
+import { showBackupUploadDialog } from "../dialogs/backup/show-dialog-backup-upload";
 import { supervisorTabs } from "../hassio-tabs";
 import { hassioStyle } from "../resources/hassio-style";
 
-@customElement("hassio-snapshots")
-export class HassioSnapshots extends LitElement {
+@customElement("hassio-backups")
+export class HassioBackups extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false }) public supervisor!: Supervisor;
@@ -58,9 +58,9 @@ export class HassioSnapshots extends LitElement {
 
   @property({ type: Boolean }) public isWide!: boolean;
 
-  @state() private _selectedSnapshots: string[] = [];
+  @state() private _selectedBackups: string[] = [];
 
-  @state() private _snapshots?: HassioSnapshot[] = [];
+  @state() private _backups?: HassioBackup[] = [];
 
   @query("hass-tabs-subpage-data-table", true)
   private _dataTable!: HaTabsSubpageDataTable;
@@ -75,26 +75,26 @@ export class HassioSnapshots extends LitElement {
   }
 
   public async refreshData() {
-    await reloadHassioSnapshots(this.hass);
-    await this.fetchSnapshots();
+    await reloadHassioBackups(this.hass);
+    await this.fetchBackups();
   }
 
-  private _computeSnapshotContent = (snapshot: HassioSnapshot): string => {
-    if (snapshot.type === "full") {
-      return this.supervisor.localize("snapshot.full_snapshot");
+  private _computeBackupContent = (backup: HassioBackup): string => {
+    if (backup.type === "full") {
+      return this.supervisor.localize("backup.full_backup");
     }
     const content: string[] = [];
-    if (snapshot.content.homeassistant) {
+    if (backup.content.homeassistant) {
       content.push("Home Assistant");
     }
-    if (snapshot.content.folders.length !== 0) {
-      for (const folder of snapshot.content.folders) {
+    if (backup.content.folders.length !== 0) {
+      for (const folder of backup.content.folders) {
         content.push(friendlyFolderName[folder] || folder);
       }
     }
 
-    if (snapshot.content.addons.length !== 0) {
-      for (const addon of snapshot.content.addons) {
+    if (backup.content.addons.length !== 0) {
+      for (const addon of backup.content.addons) {
         content.push(
           this.supervisor.supervisor.addons.find(
             (entry) => entry.slug === addon
@@ -117,16 +117,16 @@ export class HassioSnapshots extends LitElement {
   private _columns = memoizeOne(
     (narrow: boolean): DataTableColumnContainer => ({
       name: {
-        title: this.supervisor?.localize("snapshot.name") || "",
+        title: this.supervisor?.localize("backup.name") || "",
         sortable: true,
         filterable: true,
         grows: true,
-        template: (entry: string, snapshot: any) =>
-          html`${entry || snapshot.slug}
-            <div class="secondary">${snapshot.secondary}</div>`,
+        template: (entry: string, backup: any) =>
+          html`${entry || backup.slug}
+            <div class="secondary">${backup.secondary}</div>`,
       },
       date: {
-        title: this.supervisor?.localize("snapshot.created") || "",
+        title: this.supervisor?.localize("backup.created") || "",
         width: "15%",
         direction: "desc",
         hidden: narrow,
@@ -143,10 +143,10 @@ export class HassioSnapshots extends LitElement {
     })
   );
 
-  private _snapshotData = memoizeOne((snapshots: HassioSnapshot[]) =>
-    snapshots.map((snapshot) => ({
-      ...snapshot,
-      secondary: this._computeSnapshotContent(snapshot),
+  private _backupData = memoizeOne((backups: HassioBackup[]) =>
+    backups.map((backup) => ({
+      ...backup,
+      secondary: this._computeBackupContent(backup),
     }))
   );
 
@@ -160,11 +160,11 @@ export class HassioSnapshots extends LitElement {
         .hass=${this.hass}
         .localizeFunc=${this.supervisor.localize}
         .searchLabel=${this.supervisor.localize("search")}
-        .noDataText=${this.supervisor.localize("snapshot.no_snapshots")}
+        .noDataText=${this.supervisor.localize("backup.no_backups")}
         .narrow=${this.narrow}
         .route=${this.route}
         .columns=${this._columns(this.narrow)}
-        .data=${this._snapshotData(this._snapshots || [])}
+        .data=${this._backupData(this._backups || [])}
         id="slug"
         @row-click=${this._handleRowClicked}
         @selection-changed=${this._handleSelectionChanged}
@@ -187,12 +187,12 @@ export class HassioSnapshots extends LitElement {
           </mwc-list-item>
           ${atLeastVersion(this.hass.config.version, 0, 116)
             ? html`<mwc-list-item>
-                ${this.supervisor?.localize("snapshot.upload_snapshot")}
+                ${this.supervisor?.localize("backup.upload_backup")}
               </mwc-list-item>`
             : ""}
         </ha-button-menu>
 
-        ${this._selectedSnapshots.length
+        ${this._selectedBackups.length
           ? html`<div
               class=${classMap({
                 "header-toolbar": this.narrow,
@@ -201,8 +201,8 @@ export class HassioSnapshots extends LitElement {
               slot="header"
             >
               <p class="selected-txt">
-                ${this.supervisor.localize("snapshot.selected", {
-                  number: this._selectedSnapshots.length,
+                ${this.supervisor.localize("backup.selected", {
+                  number: this._selectedBackups.length,
                 })}
               </p>
               <div class="header-btns">
@@ -212,7 +212,7 @@ export class HassioSnapshots extends LitElement {
                         @click=${this._deleteSelected}
                         class="warning"
                       >
-                        ${this.supervisor.localize("snapshot.delete_selected")}
+                        ${this.supervisor.localize("backup.delete_selected")}
                       </mwc-button>
                     `
                   : html`
@@ -224,7 +224,7 @@ export class HassioSnapshots extends LitElement {
                         <ha-svg-icon .path=${mdiDelete}></ha-svg-icon>
                       </mwc-icon-button>
                       <paper-tooltip animation-delay="0" for="delete-btn">
-                        ${this.supervisor.localize("snapshot.delete_selected")}
+                        ${this.supervisor.localize("backup.delete_selected")}
                       </paper-tooltip>
                     `}
               </div>
@@ -233,8 +233,8 @@ export class HassioSnapshots extends LitElement {
 
         <ha-fab
           slot="fab"
-          @click=${this._createSnapshot}
-          .label=${this.supervisor.localize("snapshot.create_snapshot")}
+          @click=${this._createBackup}
+          .label=${this.supervisor.localize("backup.create_backup")}
           extended
         >
           <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
@@ -249,7 +249,7 @@ export class HassioSnapshots extends LitElement {
         this.refreshData();
         break;
       case 1:
-        this._showUploadSnapshotDialog();
+        this._showUploadBackupDialog();
         break;
     }
   }
@@ -257,33 +257,33 @@ export class HassioSnapshots extends LitElement {
   private _handleSelectionChanged(
     ev: HASSDomEvent<SelectionChangedEvent>
   ): void {
-    this._selectedSnapshots = ev.detail.value;
+    this._selectedBackups = ev.detail.value;
   }
 
-  private _showUploadSnapshotDialog() {
-    showSnapshotUploadDialog(this, {
-      showSnapshot: (slug: string) =>
-        showHassioSnapshotDialog(this, {
+  private _showUploadBackupDialog() {
+    showBackupUploadDialog(this, {
+      showBackup: (slug: string) =>
+        showHassioBackupDialog(this, {
           slug,
           supervisor: this.supervisor,
-          onDelete: () => this.fetchSnapshots(),
+          onDelete: () => this.fetchBackups(),
         }),
-      reloadSnapshot: () => this.refreshData(),
+      reloadBackup: () => this.refreshData(),
     });
   }
 
-  private async fetchSnapshots() {
-    await reloadHassioSnapshots(this.hass);
-    this._snapshots = await fetchHassioSnapshots(this.hass);
+  private async fetchBackups() {
+    await reloadHassioBackups(this.hass);
+    this._backups = await fetchHassioBackups(this.hass);
   }
 
   private async _deleteSelected() {
     const confirm = await showConfirmationDialog(this, {
-      title: this.supervisor.localize("snapshot.delete_snapshot_title"),
-      text: this.supervisor.localize("snapshot.delete_snapshot_text", {
-        number: this._selectedSnapshots.length,
+      title: this.supervisor.localize("backup.delete_backup_title"),
+      text: this.supervisor.localize("backup.delete_backup_text", {
+        number: this._selectedBackups.length,
       }),
-      confirmText: this.supervisor.localize("snapshot.delete_snapshot_confirm"),
+      confirmText: this.supervisor.localize("backup.delete_backup_confirm"),
     });
 
     if (!confirm) {
@@ -292,44 +292,44 @@ export class HassioSnapshots extends LitElement {
 
     try {
       await Promise.all(
-        this._selectedSnapshots.map((slug) => removeSnapshot(this.hass, slug))
+        this._selectedBackups.map((slug) => removeBackup(this.hass, slug))
       );
     } catch (err) {
       showAlertDialog(this, {
-        title: this.supervisor.localize("snapshot.failed_to_delete"),
+        title: this.supervisor.localize("backup.failed_to_delete"),
         text: extractApiErrorMessage(err),
       });
       return;
     }
-    await reloadHassioSnapshots(this.hass);
-    this._snapshots = await fetchHassioSnapshots(this.hass);
+    await reloadHassioBackups(this.hass);
+    this._backups = await fetchHassioBackups(this.hass);
     this._dataTable.clearSelection();
   }
 
   private _handleRowClicked(ev: HASSDomEvent<RowClickedEvent>) {
     const slug = ev.detail.id;
-    showHassioSnapshotDialog(this, {
+    showHassioBackupDialog(this, {
       slug,
       supervisor: this.supervisor,
-      onDelete: () => this.fetchSnapshots(),
+      onDelete: () => this.fetchBackups(),
     });
   }
 
-  private _createSnapshot() {
+  private _createBackup() {
     if (this.supervisor!.info.state !== "running") {
       showAlertDialog(this, {
-        title: this.supervisor!.localize("snapshot.could_not_create"),
+        title: this.supervisor!.localize("backup.could_not_create"),
         text: this.supervisor!.localize(
-          "snapshot.create_blocked_not_running",
+          "backup.create_blocked_not_running",
           "state",
           this.supervisor!.info.state
         ),
       });
       return;
     }
-    showHassioCreateSnapshotDialog(this, {
+    showHassioCreateBackupDialog(this, {
       supervisor: this.supervisor!,
-      onCreate: () => this.fetchSnapshots(),
+      onCreate: () => this.fetchBackups(),
     });
   }
 
@@ -378,6 +378,6 @@ export class HassioSnapshots extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "hassio-snapshots": HassioSnapshots;
+    "hassio-backups": HassioBackups;
   }
 }
diff --git a/hassio/src/components/hassio-ansi-to-html.ts b/hassio/src/components/hassio-ansi-to-html.ts
index 416be07388..60c8f51532 100644
--- a/hassio/src/components/hassio-ansi-to-html.ts
+++ b/hassio/src/components/hassio-ansi-to-html.ts
@@ -41,16 +41,16 @@ class HassioAnsiToHtml extends LitElement {
         text-decoration: underline line-through;
       }
       .fg-red {
-        color: rgb(222, 56, 43);
+        color: var(--error-color);
       }
       .fg-green {
-        color: rgb(57, 181, 74);
+        color: var(--success-color);
       }
       .fg-yellow {
-        color: rgb(255, 199, 6);
+        color: var(--warning-color);
       }
       .fg-blue {
-        color: rgb(0, 111, 184);
+        color: var(--info-color);
       }
       .fg-magenta {
         color: rgb(118, 38, 113);
@@ -65,16 +65,16 @@ class HassioAnsiToHtml extends LitElement {
         background-color: rgb(0, 0, 0);
       }
       .bg-red {
-        background-color: rgb(222, 56, 43);
+        background-color: var(--error-color);
       }
       .bg-green {
-        background-color: rgb(57, 181, 74);
+        background-color: var(--success-color);
       }
       .bg-yellow {
-        background-color: rgb(255, 199, 6);
+        background-color: var(--warning-color);
       }
       .bg-blue {
-        background-color: rgb(0, 111, 184);
+        background-color: var(--info-color);
       }
       .bg-magenta {
         background-color: rgb(118, 38, 113);
diff --git a/hassio/src/components/hassio-card-content.ts b/hassio/src/components/hassio-card-content.ts
index d4b9508009..b1c381f357 100644
--- a/hassio/src/components/hassio-card-content.ts
+++ b/hassio/src/components/hassio-card-content.ts
@@ -80,14 +80,14 @@ class HassioCardContent extends LitElement {
         color: var(--secondary-text-color);
       }
       ha-svg-icon.update {
-        color: var(--paper-orange-400);
+        color: var(--warning-color);
       }
       ha-svg-icon.running,
       ha-svg-icon.installed {
-        color: var(--paper-green-400);
+        color: var(--success-color);
       }
       ha-svg-icon.hassupdate,
-      ha-svg-icon.snapshot {
+      ha-svg-icon.backup {
         color: var(--paper-item-icon-color);
       }
       ha-svg-icon.not_available {
@@ -122,7 +122,7 @@ class HassioCardContent extends LitElement {
       }
       .dot {
         position: absolute;
-        background-color: var(--paper-orange-400);
+        background-color: var(--warning-color);
         width: 12px;
         height: 12px;
         top: 8px;
diff --git a/hassio/src/components/hassio-upload-snapshot.ts b/hassio/src/components/hassio-upload-backup.ts
similarity index 77%
rename from hassio/src/components/hassio-upload-snapshot.ts
rename to hassio/src/components/hassio-upload-backup.ts
index 4677231c85..619e35d4e2 100644
--- a/hassio/src/components/hassio-upload-snapshot.ts
+++ b/hassio/src/components/hassio-upload-backup.ts
@@ -8,23 +8,20 @@ import "../../../src/components/ha-circular-progress";
 import "../../../src/components/ha-file-upload";
 import "../../../src/components/ha-svg-icon";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
-import {
-  HassioSnapshot,
-  uploadSnapshot,
-} from "../../../src/data/hassio/snapshot";
+import { HassioBackup, uploadBackup } from "../../../src/data/hassio/backup";
 import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
 import { HomeAssistant } from "../../../src/types";
 
 declare global {
   interface HASSDomEvents {
-    "snapshot-uploaded": { snapshot: HassioSnapshot };
+    "backup-uploaded": { backup: HassioBackup };
   }
 }
 
 const MAX_FILE_SIZE = 1 * 1024 * 1024 * 1024; // 1GB
 
-@customElement("hassio-upload-snapshot")
-export class HassioUploadSnapshot extends LitElement {
+@customElement("hassio-upload-backup")
+export class HassioUploadBackup extends LitElement {
   public hass!: HomeAssistant;
 
   @state() public value: string | null = null;
@@ -37,7 +34,7 @@ export class HassioUploadSnapshot extends LitElement {
         .uploading=${this._uploading}
         .icon=${mdiFolderUpload}
         accept="application/x-tar"
-        label="Upload snapshot"
+        label="Upload backup"
         @file-picked=${this._uploadFile}
         auto-open-file-dialog
       ></ha-file-upload>
@@ -49,10 +46,10 @@ export class HassioUploadSnapshot extends LitElement {
 
     if (file.size > MAX_FILE_SIZE) {
       showAlertDialog(this, {
-        title: "Snapshot file is too big",
+        title: "Backup file is too big",
         text: html`The maximum allowed filesize is 1GB.<br />
           <a
-            href="https://www.home-assistant.io/hassio/haos_common_tasks/#restoring-a-snapshot-on-a-new-install"
+            href="https://www.home-assistant.io/hassio/haos_common_tasks/#restoring-a-backup-on-a-new-install"
             target="_blank"
             >Have a look here on how to restore it.</a
           >`,
@@ -64,15 +61,15 @@ export class HassioUploadSnapshot extends LitElement {
     if (!["application/x-tar"].includes(file.type)) {
       showAlertDialog(this, {
         title: "Unsupported file format",
-        text: "Please choose a Home Assistant snapshot file (.tar)",
+        text: "Please choose a Home Assistant backup file (.tar)",
         confirmText: "ok",
       });
       return;
     }
     this._uploading = true;
     try {
-      const snapshot = await uploadSnapshot(this.hass, file);
-      fireEvent(this, "snapshot-uploaded", { snapshot: snapshot.data });
+      const backup = await uploadBackup(this.hass, file);
+      fireEvent(this, "backup-uploaded", { backup: backup.data });
     } catch (err) {
       showAlertDialog(this, {
         title: "Upload failed",
@@ -87,6 +84,6 @@ export class HassioUploadSnapshot extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "hassio-upload-snapshot": HassioUploadSnapshot;
+    "hassio-upload-backup": HassioUploadBackup;
   }
 }
diff --git a/hassio/src/components/supervisor-snapshot-content.ts b/hassio/src/components/supervisor-backup-content.ts
similarity index 76%
rename from hassio/src/components/supervisor-snapshot-content.ts
rename to hassio/src/components/supervisor-backup-content.ts
index b420f00959..ac55733ace 100644
--- a/hassio/src/components/supervisor-snapshot-content.ts
+++ b/hassio/src/components/supervisor-backup-content.ts
@@ -11,10 +11,10 @@ import "../../../src/components/ha-formfield";
 import "../../../src/components/ha-radio";
 import type { HaRadio } from "../../../src/components/ha-radio";
 import {
-  HassioFullSnapshotCreateParams,
-  HassioPartialSnapshotCreateParams,
-  HassioSnapshotDetail,
-} from "../../../src/data/hassio/snapshot";
+  HassioFullBackupCreateParams,
+  HassioPartialBackupCreateParams,
+  HassioBackupDetail,
+} from "../../../src/data/hassio/backup";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import { PolymerChangedEvent } from "../../../src/polymer-types";
 import { HomeAssistant } from "../../../src/types";
@@ -64,17 +64,17 @@ const _computeAddons = (addons): AddonCheckboxItem[] =>
     }))
     .sort((a, b) => (a.name > b.name ? 1 : -1));
 
-@customElement("supervisor-snapshot-content")
-export class SupervisorSnapshotContent extends LitElement {
+@customElement("supervisor-backup-content")
+export class SupervisorBackupContent extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public localize?: LocalizeFunc;
 
   @property({ attribute: false }) public supervisor?: Supervisor;
 
-  @property({ attribute: false }) public snapshot?: HassioSnapshotDetail;
+  @property({ attribute: false }) public backup?: HassioBackupDetail;
 
-  @property() public snapshotType: HassioSnapshotDetail["type"] = "full";
+  @property() public backupType: HassioBackupDetail["type"] = "full";
 
   @property({ attribute: false }) public folders?: CheckboxItem[];
 
@@ -82,37 +82,35 @@ export class SupervisorSnapshotContent extends LitElement {
 
   @property({ type: Boolean }) public homeAssistant = false;
 
-  @property({ type: Boolean }) public snapshotHasPassword = false;
+  @property({ type: Boolean }) public backupHasPassword = false;
 
   @property({ type: Boolean }) public onboarding = false;
 
-  @property() public snapshotName = "";
+  @property() public backupName = "";
 
-  @property() public snapshotPassword = "";
+  @property() public backupPassword = "";
 
-  @property() public confirmSnapshotPassword = "";
+  @property() public confirmBackupPassword = "";
 
   public willUpdate(changedProps) {
     super.willUpdate(changedProps);
     if (!this.hasUpdated) {
       this.folders = _computeFolders(
-        this.snapshot
-          ? this.snapshot.folders
+        this.backup
+          ? this.backup.folders
           : ["homeassistant", "ssl", "share", "media", "addons/local"]
       );
       this.addons = _computeAddons(
-        this.snapshot
-          ? this.snapshot.addons
-          : this.supervisor?.supervisor.addons
+        this.backup ? this.backup.addons : this.supervisor?.supervisor.addons
       );
-      this.snapshotType = this.snapshot?.type || "full";
-      this.snapshotName = this.snapshot?.name || "";
-      this.snapshotHasPassword = this.snapshot?.protected || false;
+      this.backupType = this.backup?.type || "full";
+      this.backupName = this.backup?.name || "";
+      this.backupHasPassword = this.backup?.protected || false;
     }
   }
 
   private _localize = (string: string) =>
-    this.supervisor?.localize(`snapshot.${string}`) ||
+    this.supervisor?.localize(`backup.${string}`) ||
     this.localize!(`ui.panel.page-onboarding.restore.${string}`);
 
   protected render(): TemplateResult {
@@ -120,64 +118,64 @@ export class SupervisorSnapshotContent extends LitElement {
       return html``;
     }
     const foldersSection =
-      this.snapshotType === "partial" ? this._getSection("folders") : undefined;
+      this.backupType === "partial" ? this._getSection("folders") : undefined;
     const addonsSection =
-      this.snapshotType === "partial" ? this._getSection("addons") : undefined;
+      this.backupType === "partial" ? this._getSection("addons") : undefined;
 
     return html`
-      ${this.snapshot
+      ${this.backup
         ? html`<div class="details">
-            ${this.snapshot.type === "full"
-              ? this._localize("full_snapshot")
-              : this._localize("partial_snapshot")}
-            (${Math.ceil(this.snapshot.size * 10) / 10 + " MB"})<br />
+            ${this.backup.type === "full"
+              ? this._localize("full_backup")
+              : this._localize("partial_backup")}
+            (${Math.ceil(this.backup.size * 10) / 10 + " MB"})<br />
             ${this.hass
-              ? formatDateTime(new Date(this.snapshot.date), this.hass.locale)
-              : this.snapshot.date}
+              ? formatDateTime(new Date(this.backup.date), this.hass.locale)
+              : this.backup.date}
           </div>`
         : html`<paper-input
-            name="snapshotName"
-            .label=${this.supervisor?.localize("snapshot.name") || "Name"}
-            .value=${this.snapshotName}
+            name="backupName"
+            .label=${this._localize("name")}
+            .value=${this.backupName}
             @value-changed=${this._handleTextValueChanged}
           >
           </paper-input>`}
-      ${!this.snapshot || this.snapshot.type === "full"
+      ${!this.backup || this.backup.type === "full"
         ? html`<div class="sub-header">
-              ${!this.snapshot
+              ${!this.backup
                 ? this._localize("type")
                 : this._localize("select_type")}
             </div>
-            <div class="snapshot-types">
-              <ha-formfield .label=${this._localize("full_snapshot")}>
+            <div class="backup-types">
+              <ha-formfield .label=${this._localize("full_backup")}>
                 <ha-radio
                   @change=${this._handleRadioValueChanged}
                   value="full"
-                  name="snapshotType"
-                  .checked=${this.snapshotType === "full"}
+                  name="backupType"
+                  .checked=${this.backupType === "full"}
                 >
                 </ha-radio>
               </ha-formfield>
-              <ha-formfield .label=${this._localize("partial_snapshot")}>
+              <ha-formfield .label=${this._localize("partial_backup")}>
                 <ha-radio
                   @change=${this._handleRadioValueChanged}
                   value="partial"
-                  name="snapshotType"
-                  .checked=${this.snapshotType === "partial"}
+                  name="backupType"
+                  .checked=${this.backupType === "partial"}
                 >
                 </ha-radio>
               </ha-formfield>
             </div>`
         : ""}
-      ${this.snapshotType === "partial"
+      ${this.backupType === "partial"
         ? html`<div class="partial-picker">
-            ${this.snapshot && this.snapshot.homeassistant
+            ${this.backup && this.backup.homeassistant
               ? html`
                   <ha-formfield
                     .label=${html`<supervisor-formfield-label
                       label="Home Assistant"
                       .iconPath=${mdiHomeAssistant}
-                      .version=${this.snapshot.homeassistant}
+                      .version=${this.backup.homeassistant}
                     >
                     </supervisor-formfield-label>`}
                   >
@@ -233,38 +231,38 @@ export class SupervisorSnapshotContent extends LitElement {
               : ""}
           </div> `
         : ""}
-      ${this.snapshotType === "partial" &&
-      (!this.snapshot || this.snapshotHasPassword)
+      ${this.backupType === "partial" &&
+      (!this.backup || this.backupHasPassword)
         ? html`<hr />`
         : ""}
-      ${!this.snapshot
+      ${!this.backup
         ? html`<ha-formfield
             class="password"
             .label=${this._localize("password_protection")}
           >
             <ha-checkbox
-              .checked=${this.snapshotHasPassword}
+              .checked=${this.backupHasPassword}
               @change=${this._toggleHasPassword}
             >
             </ha-checkbox>
           </ha-formfield>`
         : ""}
-      ${this.snapshotHasPassword
+      ${this.backupHasPassword
         ? html`
             <paper-input
               .label=${this._localize("password")}
               type="password"
-              name="snapshotPassword"
-              .value=${this.snapshotPassword}
+              name="backupPassword"
+              .value=${this.backupPassword}
               @value-changed=${this._handleTextValueChanged}
             >
             </paper-input>
-            ${!this.snapshot
+            ${!this.backup
               ? html` <paper-input
-                  .label=${this.supervisor?.localize("confirm_password")}
+                  .label=${this._localize("confirm_password")}
                   type="password"
-                  name="confirmSnapshotPassword"
-                  .value=${this.confirmSnapshotPassword}
+                  name="confirmBackupPassword"
+                  .value=${this.confirmBackupPassword}
                   @value-changed=${this._handleTextValueChanged}
                 >
                 </paper-input>`
@@ -307,7 +305,7 @@ export class SupervisorSnapshotContent extends LitElement {
         display: block;
         margin: 0 -14px -16px;
       }
-      .snapshot-types {
+      .backup-types {
         display: flex;
         margin-left: -13px;
       }
@@ -317,23 +315,23 @@ export class SupervisorSnapshotContent extends LitElement {
     `;
   }
 
-  public snapshotDetails():
-    | HassioPartialSnapshotCreateParams
-    | HassioFullSnapshotCreateParams {
+  public backupDetails():
+    | HassioPartialBackupCreateParams
+    | HassioFullBackupCreateParams {
     const data: any = {};
 
-    if (!this.snapshot) {
-      data.name = this.snapshotName || formatDate(new Date(), this.hass.locale);
+    if (!this.backup) {
+      data.name = this.backupName || formatDate(new Date(), this.hass.locale);
     }
 
-    if (this.snapshotHasPassword) {
-      data.password = this.snapshotPassword;
-      if (!this.snapshot) {
-        data.confirm_password = this.confirmSnapshotPassword;
+    if (this.backupHasPassword) {
+      data.password = this.backupPassword;
+      if (!this.backup) {
+        data.confirm_password = this.confirmBackupPassword;
       }
     }
 
-    if (this.snapshotType === "full") {
+    if (this.backupType === "full") {
       return data;
     }
 
@@ -415,7 +413,7 @@ export class SupervisorSnapshotContent extends LitElement {
   }
 
   private _toggleHasPassword(): void {
-    this.snapshotHasPassword = !this.snapshotHasPassword;
+    this.backupHasPassword = !this.backupHasPassword;
   }
 
   private _toggleSection(ev): void {
@@ -445,6 +443,6 @@ export class SupervisorSnapshotContent extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "supervisor-snapshot-content": SupervisorSnapshotContent;
+    "supervisor-backup-content": SupervisorBackupContent;
   }
 }
diff --git a/hassio/src/dashboard/hassio-update.ts b/hassio/src/dashboard/hassio-update.ts
index 7947a5372c..3b854b1f4e 100644
--- a/hassio/src/dashboard/hassio-update.ts
+++ b/hassio/src/dashboard/hassio-update.ts
@@ -162,7 +162,7 @@ export class HassioUpdate extends LitElement {
         supervisor: this.supervisor,
         name: "Home Assistant Core",
         version: this.supervisor.core.version_latest,
-        snapshotParams: {
+        backupParams: {
           name: `core_${this.supervisor.core.version}`,
           folders: ["homeassistant"],
           homeassistant: true,
diff --git a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot-upload.ts b/hassio/src/dialogs/backup/dialog-hassio-backup-upload.ts
similarity index 72%
rename from hassio/src/dialogs/snapshot/dialog-hassio-snapshot-upload.ts
rename to hassio/src/dialogs/backup/dialog-hassio-backup-upload.ts
index 1c23944951..93f79446e0 100644
--- a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot-upload.ts
+++ b/hassio/src/dialogs/backup/dialog-hassio-backup-upload.ts
@@ -6,20 +6,20 @@ import "../../../../src/components/ha-header-bar";
 import { HassDialog } from "../../../../src/dialogs/make-dialog-manager";
 import { haStyleDialog } from "../../../../src/resources/styles";
 import type { HomeAssistant } from "../../../../src/types";
-import "../../components/hassio-upload-snapshot";
-import { HassioSnapshotUploadDialogParams } from "./show-dialog-snapshot-upload";
+import "../../components/hassio-upload-backup";
+import { HassioBackupUploadDialogParams } from "./show-dialog-backup-upload";
 
-@customElement("dialog-hassio-snapshot-upload")
-export class DialogHassioSnapshotUpload
+@customElement("dialog-hassio-backup-upload")
+export class DialogHassioBackupUpload
   extends LitElement
-  implements HassDialog<HassioSnapshotUploadDialogParams>
+  implements HassDialog<HassioBackupUploadDialogParams>
 {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @state() private _params?: HassioSnapshotUploadDialogParams;
+  @state() private _params?: HassioBackupUploadDialogParams;
 
   public async showDialog(
-    params: HassioSnapshotUploadDialogParams
+    params: HassioBackupUploadDialogParams
   ): Promise<void> {
     this._params = params;
     await this.updateComplete;
@@ -27,8 +27,8 @@ export class DialogHassioSnapshotUpload
 
   public closeDialog(): void {
     if (this._params && !this._params.onboarding) {
-      if (this._params.reloadSnapshot) {
-        this._params.reloadSnapshot();
+      if (this._params.reloadBackup) {
+        this._params.reloadBackup();
       }
     }
     this._params = undefined;
@@ -51,23 +51,23 @@ export class DialogHassioSnapshotUpload
       >
         <div slot="heading">
           <ha-header-bar>
-            <span slot="title"> Upload snapshot </span>
+            <span slot="title"> Upload backup </span>
             <mwc-icon-button slot="actionItems" dialogAction="cancel">
               <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
             </mwc-icon-button>
           </ha-header-bar>
         </div>
-        <hassio-upload-snapshot
-          @snapshot-uploaded=${this._snapshotUploaded}
+        <hassio-upload-backup
+          @backup-uploaded=${this._backupUploaded}
           .hass=${this.hass}
-        ></hassio-upload-snapshot>
+        ></hassio-upload-backup>
       </ha-dialog>
     `;
   }
 
-  private _snapshotUploaded(ev) {
-    const snapshot = ev.detail.snapshot;
-    this._params?.showSnapshot(snapshot.slug);
+  private _backupUploaded(ev) {
+    const backup = ev.detail.backup;
+    this._params?.showBackup(backup.slug);
     this.closeDialog();
   }
 
@@ -94,6 +94,6 @@ export class DialogHassioSnapshotUpload
 
 declare global {
   interface HTMLElementTagNameMap {
-    "dialog-hassio-snapshot-upload": DialogHassioSnapshotUpload;
+    "dialog-hassio-backup-upload": DialogHassioBackupUpload;
   }
 }
diff --git a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts b/hassio/src/dialogs/backup/dialog-hassio-backup.ts
old mode 100755
new mode 100644
similarity index 62%
rename from hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts
rename to hassio/src/dialogs/backup/dialog-hassio-backup.ts
index 5228488fb0..0fc71cafa9
--- a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts
+++ b/hassio/src/dialogs/backup/dialog-hassio-backup.ts
@@ -6,15 +6,16 @@ import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { slugify } from "../../../../src/common/string/slugify";
 import "../../../../src/components/buttons/ha-progress-button";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-button-menu";
 import "../../../../src/components/ha-header-bar";
 import "../../../../src/components/ha-svg-icon";
 import { getSignedPath } from "../../../../src/data/auth";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
-  fetchHassioSnapshotInfo,
-  HassioSnapshotDetail,
-} from "../../../../src/data/hassio/snapshot";
+  fetchHassioBackupInfo,
+  HassioBackupDetail,
+} from "../../../../src/data/hassio/backup";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -23,44 +24,45 @@ import { HassDialog } from "../../../../src/dialogs/make-dialog-manager";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { fileDownload } from "../../../../src/util/file_download";
-import "../../components/supervisor-snapshot-content";
-import type { SupervisorSnapshotContent } from "../../components/supervisor-snapshot-content";
-import { HassioSnapshotDialogParams } from "./show-dialog-hassio-snapshot";
+import "../../components/supervisor-backup-content";
+import type { SupervisorBackupContent } from "../../components/supervisor-backup-content";
+import { HassioBackupDialogParams } from "./show-dialog-hassio-backup";
+import { atLeastVersion } from "../../../../src/common/config/version";
 
-@customElement("dialog-hassio-snapshot")
-class HassioSnapshotDialog
+@customElement("dialog-hassio-backup")
+class HassioBackupDialog
   extends LitElement
-  implements HassDialog<HassioSnapshotDialogParams>
+  implements HassDialog<HassioBackupDialogParams>
 {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @state() private _error?: string;
 
-  @state() private _snapshot?: HassioSnapshotDetail;
+  @state() private _backup?: HassioBackupDetail;
 
-  @state() private _dialogParams?: HassioSnapshotDialogParams;
+  @state() private _dialogParams?: HassioBackupDialogParams;
 
-  @state() private _restoringSnapshot = false;
+  @state() private _restoringBackup = false;
 
-  @query("supervisor-snapshot-content")
-  private _snapshotContent!: SupervisorSnapshotContent;
+  @query("supervisor-backup-content")
+  private _backupContent!: SupervisorBackupContent;
 
-  public async showDialog(params: HassioSnapshotDialogParams) {
-    this._snapshot = await fetchHassioSnapshotInfo(this.hass, params.slug);
+  public async showDialog(params: HassioBackupDialogParams) {
+    this._backup = await fetchHassioBackupInfo(this.hass, params.slug);
     this._dialogParams = params;
-    this._restoringSnapshot = false;
+    this._restoringBackup = false;
   }
 
   public closeDialog() {
-    this._snapshot = undefined;
+    this._backup = undefined;
     this._dialogParams = undefined;
-    this._restoringSnapshot = false;
+    this._restoringBackup = false;
     this._error = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
   protected render(): TemplateResult {
-    if (!this._dialogParams || !this._snapshot) {
+    if (!this._dialogParams || !this._backup) {
       return html``;
     }
     return html`
@@ -72,26 +74,28 @@ class HassioSnapshotDialog
       >
         <div slot="heading">
           <ha-header-bar>
-            <span slot="title">${this._snapshot.name}</span>
+            <span slot="title">${this._backup.name}</span>
             <mwc-icon-button slot="actionItems" dialogAction="cancel">
               <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
             </mwc-icon-button>
           </ha-header-bar>
         </div>
-        ${this._restoringSnapshot
+        ${this._restoringBackup
           ? html` <ha-circular-progress active></ha-circular-progress>`
-          : html`<supervisor-snapshot-content
+          : html`<supervisor-backup-content
               .hass=${this.hass}
               .supervisor=${this._dialogParams.supervisor}
-              .snapshot=${this._snapshot}
+              .backup=${this._backup}
               .onboarding=${this._dialogParams.onboarding || false}
               .localize=${this._dialogParams.localize}
             >
-            </supervisor-snapshot-content>`}
-        ${this._error ? html`<p class="error">Error: ${this._error}</p>` : ""}
+            </supervisor-backup-content>`}
+        ${this._error
+          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+          : ""}
 
         <mwc-button
-          .disabled=${this._restoringSnapshot}
+          .disabled=${this._restoringBackup}
           slot="secondaryAction"
           @click=${this._restoreClicked}
         >
@@ -108,8 +112,8 @@ class HassioSnapshotDialog
               <mwc-icon-button slot="trigger" alt="menu">
                 <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
               </mwc-icon-button>
-              <mwc-list-item>Download Snapshot</mwc-list-item>
-              <mwc-list-item class="error">Delete Snapshot</mwc-list-item>
+              <mwc-list-item>Download Backup</mwc-list-item>
+              <mwc-list-item class="error">Delete Backup</mwc-list-item>
             </ha-button-menu>`
           : ""}
       </ha-dialog>
@@ -150,30 +154,30 @@ class HassioSnapshotDialog
   }
 
   private async _restoreClicked() {
-    const snapshotDetails = this._snapshotContent.snapshotDetails();
-    this._restoringSnapshot = true;
-    if (this._snapshotContent.snapshotType === "full") {
-      await this._fullRestoreClicked(snapshotDetails);
+    const backupDetails = this._backupContent.backupDetails();
+    this._restoringBackup = true;
+    if (this._backupContent.backupType === "full") {
+      await this._fullRestoreClicked(backupDetails);
     } else {
-      await this._partialRestoreClicked(snapshotDetails);
+      await this._partialRestoreClicked(backupDetails);
     }
-    this._restoringSnapshot = false;
+    this._restoringBackup = false;
   }
 
-  private async _partialRestoreClicked(snapshotDetails) {
+  private async _partialRestoreClicked(backupDetails) {
     if (
       this._dialogParams?.supervisor !== undefined &&
       this._dialogParams?.supervisor.info.state !== "running"
     ) {
       await showAlertDialog(this, {
-        title: "Could not restore snapshot",
-        text: `Restoring a snapshot is not possible right now because the system is in ${this._dialogParams?.supervisor.info.state} state.`,
+        title: "Could not restore backup",
+        text: `Restoring a backup is not possible right now because the system is in ${this._dialogParams?.supervisor.info.state} state.`,
       });
       return;
     }
     if (
       !(await showConfirmationDialog(this, {
-        title: "Are you sure you want partially to restore this snapshot?",
+        title: "Are you sure you want partially to restore this backup?",
         confirmText: "restore",
         dismissText: "cancel",
       }))
@@ -186,8 +190,12 @@ class HassioSnapshotDialog
         .callApi(
           "POST",
 
-          `hassio/snapshots/${this._snapshot!.slug}/restore/partial`,
-          snapshotDetails
+          `hassio/${
+            atLeastVersion(this.hass.config.version, 2021, 9)
+              ? "backups"
+              : "snapshots"
+          }/${this._backup!.slug}/restore/partial`,
+          backupDetails
         )
         .then(
           () => {
@@ -199,29 +207,29 @@ class HassioSnapshotDialog
         );
     } else {
       fireEvent(this, "restoring");
-      fetch(`/api/hassio/snapshots/${this._snapshot!.slug}/restore/partial`, {
+      fetch(`/api/hassio/backups/${this._backup!.slug}/restore/partial`, {
         method: "POST",
-        body: JSON.stringify(snapshotDetails),
+        body: JSON.stringify(backupDetails),
       });
       this.closeDialog();
     }
   }
 
-  private async _fullRestoreClicked(snapshotDetails) {
+  private async _fullRestoreClicked(backupDetails) {
     if (
       this._dialogParams?.supervisor !== undefined &&
       this._dialogParams?.supervisor.info.state !== "running"
     ) {
       await showAlertDialog(this, {
-        title: "Could not restore snapshot",
-        text: `Restoring a snapshot is not possible right now because the system is in ${this._dialogParams?.supervisor.info.state} state.`,
+        title: "Could not restore backup",
+        text: `Restoring a backup is not possible right now because the system is in ${this._dialogParams?.supervisor.info.state} state.`,
       });
       return;
     }
     if (
       !(await showConfirmationDialog(this, {
         title:
-          "Are you sure you want to wipe your system and restore this snapshot?",
+          "Are you sure you want to wipe your system and restore this backup?",
         confirmText: "restore",
         dismissText: "cancel",
       }))
@@ -233,8 +241,12 @@ class HassioSnapshotDialog
       this.hass
         .callApi(
           "POST",
-          `hassio/snapshots/${this._snapshot!.slug}/restore/full`,
-          snapshotDetails
+          `hassio/${
+            atLeastVersion(this.hass.config.version, 2021, 9)
+              ? "backups"
+              : "snapshots"
+          }/${this._backup!.slug}/restore/full`,
+          backupDetails
         )
         .then(
           () => {
@@ -246,9 +258,9 @@ class HassioSnapshotDialog
         );
     } else {
       fireEvent(this, "restoring");
-      fetch(`/api/hassio/snapshots/${this._snapshot!.slug}/restore/full`, {
+      fetch(`/api/hassio/backups/${this._backup!.slug}/restore/full`, {
         method: "POST",
-        body: JSON.stringify(snapshotDetails),
+        body: JSON.stringify(backupDetails),
       });
       this.closeDialog();
     }
@@ -257,7 +269,7 @@ class HassioSnapshotDialog
   private async _deleteClicked() {
     if (
       !(await showConfirmationDialog(this, {
-        title: "Are you sure you want to delete this snapshot?",
+        title: "Are you sure you want to delete this backup?",
         confirmText: "delete",
         dismissText: "cancel",
       }))
@@ -267,7 +279,14 @@ class HassioSnapshotDialog
 
     this.hass
 
-      .callApi("POST", `hassio/snapshots/${this._snapshot!.slug}/remove`)
+      .callApi(
+        atLeastVersion(this.hass.config.version, 2021, 9) ? "DELETE" : "POST",
+        `hassio/${
+          atLeastVersion(this.hass.config.version, 2021, 9)
+            ? `backups/${this._backup!.slug}`
+            : `snapshots/${this._backup!.slug}/remove`
+        }`
+      )
       .then(
         () => {
           if (this._dialogParams!.onDelete) {
@@ -286,7 +305,11 @@ class HassioSnapshotDialog
     try {
       signedPath = await getSignedPath(
         this.hass,
-        `/api/hassio/snapshots/${this._snapshot!.slug}/download`
+        `/api/hassio/${
+          atLeastVersion(this.hass.config.version, 2021, 9)
+            ? "backups"
+            : "snapshots"
+        }/${this._backup!.slug}/download`
       );
     } catch (err) {
       await showAlertDialog(this, {
@@ -298,7 +321,7 @@ class HassioSnapshotDialog
     if (window.location.href.includes("ui.nabu.casa")) {
       const confirm = await showConfirmationDialog(this, {
         title: "Potential slow download",
-        text: "Downloading snapshots over the Nabu Casa URL will take some time, it is recomended to use your local URL instead, do you want to continue?",
+        text: "Downloading backups over the Nabu Casa URL will take some time, it is recomended to use your local URL instead, do you want to continue?",
         confirmText: "continue",
         dismissText: "cancel",
       });
@@ -310,19 +333,19 @@ class HassioSnapshotDialog
     fileDownload(
       this,
       signedPath.path,
-      `home_assistant_snapshot_${slugify(this._computeName)}.tar`
+      `home_assistant_backup_${slugify(this._computeName)}.tar`
     );
   }
 
   private get _computeName() {
-    return this._snapshot
-      ? this._snapshot.name || this._snapshot.slug
-      : "Unnamed snapshot";
+    return this._backup
+      ? this._backup.name || this._backup.slug
+      : "Unnamed backup";
   }
 }
 
 declare global {
   interface HTMLElementTagNameMap {
-    "dialog-hassio-snapshot": HassioSnapshotDialog;
+    "dialog-hassio-backup": HassioBackupDialog;
   }
 }
diff --git a/hassio/src/dialogs/snapshot/dialog-hassio-create-snapshot.ts b/hassio/src/dialogs/backup/dialog-hassio-create-backup.ts
old mode 100755
new mode 100644
similarity index 56%
rename from hassio/src/dialogs/snapshot/dialog-hassio-create-snapshot.ts
rename to hassio/src/dialogs/backup/dialog-hassio-create-backup.ts
index dbb7c503c7..d4604d221b
--- a/hassio/src/dialogs/snapshot/dialog-hassio-create-snapshot.ts
+++ b/hassio/src/dialogs/backup/dialog-hassio-create-backup.ts
@@ -2,41 +2,42 @@ import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/buttons/ha-progress-button";
 import { createCloseHeading } from "../../../../src/components/ha-dialog";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
-  createHassioFullSnapshot,
-  createHassioPartialSnapshot,
-} from "../../../../src/data/hassio/snapshot";
+  createHassioFullBackup,
+  createHassioPartialBackup,
+} from "../../../../src/data/hassio/backup";
 import { showAlertDialog } from "../../../../src/dialogs/generic/show-dialog-box";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
-import "../../components/supervisor-snapshot-content";
-import type { SupervisorSnapshotContent } from "../../components/supervisor-snapshot-content";
-import { HassioCreateSnapshotDialogParams } from "./show-dialog-hassio-create-snapshot";
+import "../../components/supervisor-backup-content";
+import type { SupervisorBackupContent } from "../../components/supervisor-backup-content";
+import { HassioCreateBackupDialogParams } from "./show-dialog-hassio-create-backup";
 
-@customElement("dialog-hassio-create-snapshot")
-class HassioCreateSnapshotDialog extends LitElement {
+@customElement("dialog-hassio-create-backup")
+class HassioCreateBackupDialog extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @state() private _dialogParams?: HassioCreateSnapshotDialogParams;
+  @state() private _dialogParams?: HassioCreateBackupDialogParams;
 
   @state() private _error?: string;
 
-  @state() private _creatingSnapshot = false;
+  @state() private _creatingBackup = false;
 
-  @query("supervisor-snapshot-content")
-  private _snapshotContent!: SupervisorSnapshotContent;
+  @query("supervisor-backup-content")
+  private _backupContent!: SupervisorBackupContent;
 
-  public showDialog(params: HassioCreateSnapshotDialogParams) {
+  public showDialog(params: HassioCreateBackupDialogParams) {
     this._dialogParams = params;
-    this._creatingSnapshot = false;
+    this._creatingBackup = false;
   }
 
   public closeDialog() {
     this._dialogParams = undefined;
-    this._creatingSnapshot = false;
+    this._creatingBackup = false;
     this._error = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
@@ -52,74 +53,76 @@ class HassioCreateSnapshotDialog extends LitElement {
         @closed=${this.closeDialog}
         .heading=${createCloseHeading(
           this.hass,
-          this._dialogParams.supervisor.localize("snapshot.create_snapshot")
+          this._dialogParams.supervisor.localize("backup.create_backup")
         )}
       >
-        ${this._creatingSnapshot
+        ${this._creatingBackup
           ? html` <ha-circular-progress active></ha-circular-progress>`
-          : html`<supervisor-snapshot-content
+          : html`<supervisor-backup-content
               .hass=${this.hass}
               .supervisor=${this._dialogParams.supervisor}
             >
-            </supervisor-snapshot-content>`}
-        ${this._error ? html`<p class="error">Error: ${this._error}</p>` : ""}
+            </supervisor-backup-content>`}
+        ${this._error
+          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+          : ""}
         <mwc-button slot="secondaryAction" @click=${this.closeDialog}>
           ${this._dialogParams.supervisor.localize("common.close")}
         </mwc-button>
         <mwc-button
-          .disabled=${this._creatingSnapshot}
+          .disabled=${this._creatingBackup}
           slot="primaryAction"
-          @click=${this._createSnapshot}
+          @click=${this._createBackup}
         >
-          ${this._dialogParams.supervisor.localize("snapshot.create")}
+          ${this._dialogParams.supervisor.localize("backup.create")}
         </mwc-button>
       </ha-dialog>
     `;
   }
 
-  private async _createSnapshot(): Promise<void> {
+  private async _createBackup(): Promise<void> {
     if (this._dialogParams!.supervisor.info.state !== "running") {
       showAlertDialog(this, {
         title: this._dialogParams!.supervisor.localize(
-          "snapshot.could_not_create"
+          "backup.could_not_create"
         ),
         text: this._dialogParams!.supervisor.localize(
-          "snapshot.create_blocked_not_running",
+          "backup.create_blocked_not_running",
           "state",
           this._dialogParams!.supervisor.info.state
         ),
       });
       return;
     }
-    const snapshotDetails = this._snapshotContent.snapshotDetails();
-    this._creatingSnapshot = true;
+    const backupDetails = this._backupContent.backupDetails();
+    this._creatingBackup = true;
 
     this._error = "";
-    if (snapshotDetails.password && !snapshotDetails.password.length) {
+    if (backupDetails.password && !backupDetails.password.length) {
       this._error = this._dialogParams!.supervisor.localize(
-        "snapshot.enter_password"
+        "backup.enter_password"
       );
-      this._creatingSnapshot = false;
+      this._creatingBackup = false;
       return;
     }
     if (
-      snapshotDetails.password &&
-      snapshotDetails.password !== snapshotDetails.confirm_password
+      backupDetails.password &&
+      backupDetails.password !== backupDetails.confirm_password
     ) {
       this._error = this._dialogParams!.supervisor.localize(
-        "snapshot.passwords_not_matching"
+        "backup.passwords_not_matching"
       );
-      this._creatingSnapshot = false;
+      this._creatingBackup = false;
       return;
     }
 
-    delete snapshotDetails.confirm_password;
+    delete backupDetails.confirm_password;
 
     try {
-      if (this._snapshotContent.snapshotType === "full") {
-        await createHassioFullSnapshot(this.hass, snapshotDetails);
+      if (this._backupContent.backupType === "full") {
+        await createHassioFullBackup(this.hass, backupDetails);
       } else {
-        await createHassioPartialSnapshot(this.hass, snapshotDetails);
+        await createHassioPartialBackup(this.hass, backupDetails);
       }
 
       this._dialogParams!.onCreate();
@@ -127,7 +130,7 @@ class HassioCreateSnapshotDialog extends LitElement {
     } catch (err) {
       this._error = extractApiErrorMessage(err);
     }
-    this._creatingSnapshot = false;
+    this._creatingBackup = false;
   }
 
   static get styles(): CSSResultGroup {
@@ -146,6 +149,6 @@ class HassioCreateSnapshotDialog extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "dialog-hassio-create-snapshot": HassioCreateSnapshotDialog;
+    "dialog-hassio-create-backup": HassioCreateBackupDialog;
   }
 }
diff --git a/hassio/src/dialogs/backup/show-dialog-backup-upload.ts b/hassio/src/dialogs/backup/show-dialog-backup-upload.ts
new file mode 100644
index 0000000000..861f192595
--- /dev/null
+++ b/hassio/src/dialogs/backup/show-dialog-backup-upload.ts
@@ -0,0 +1,19 @@
+import { fireEvent } from "../../../../src/common/dom/fire_event";
+import "./dialog-hassio-backup-upload";
+
+export interface HassioBackupUploadDialogParams {
+  showBackup: (slug: string) => void;
+  reloadBackup?: () => Promise<void>;
+  onboarding?: boolean;
+}
+
+export const showBackupUploadDialog = (
+  element: HTMLElement,
+  dialogParams: HassioBackupUploadDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "dialog-hassio-backup-upload",
+    dialogImport: () => import("./dialog-hassio-backup-upload"),
+    dialogParams,
+  });
+};
diff --git a/hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts b/hassio/src/dialogs/backup/show-dialog-hassio-backup.ts
similarity index 65%
rename from hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts
rename to hassio/src/dialogs/backup/show-dialog-hassio-backup.ts
index fd74e90ea7..39c438e217 100644
--- a/hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts
+++ b/hassio/src/dialogs/backup/show-dialog-hassio-backup.ts
@@ -2,7 +2,7 @@ import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { LocalizeFunc } from "../../../../src/common/translations/localize";
 import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 
-export interface HassioSnapshotDialogParams {
+export interface HassioBackupDialogParams {
   slug: string;
   onDelete?: () => void;
   onboarding?: boolean;
@@ -10,13 +10,13 @@ export interface HassioSnapshotDialogParams {
   localize?: LocalizeFunc;
 }
 
-export const showHassioSnapshotDialog = (
+export const showHassioBackupDialog = (
   element: HTMLElement,
-  dialogParams: HassioSnapshotDialogParams
+  dialogParams: HassioBackupDialogParams
 ): void => {
   fireEvent(element, "show-dialog", {
-    dialogTag: "dialog-hassio-snapshot",
-    dialogImport: () => import("./dialog-hassio-snapshot"),
+    dialogTag: "dialog-hassio-backup",
+    dialogImport: () => import("./dialog-hassio-backup"),
     dialogParams,
   });
 };
diff --git a/hassio/src/dialogs/snapshot/show-dialog-hassio-create-snapshot.ts b/hassio/src/dialogs/backup/show-dialog-hassio-create-backup.ts
similarity index 52%
rename from hassio/src/dialogs/snapshot/show-dialog-hassio-create-snapshot.ts
rename to hassio/src/dialogs/backup/show-dialog-hassio-create-backup.ts
index 353caf31a2..4fbcf0435c 100644
--- a/hassio/src/dialogs/snapshot/show-dialog-hassio-create-snapshot.ts
+++ b/hassio/src/dialogs/backup/show-dialog-hassio-create-backup.ts
@@ -1,18 +1,18 @@
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { Supervisor } from "../../../../src/data/supervisor/supervisor";
 
-export interface HassioCreateSnapshotDialogParams {
+export interface HassioCreateBackupDialogParams {
   supervisor: Supervisor;
   onCreate: () => void;
 }
 
-export const showHassioCreateSnapshotDialog = (
+export const showHassioCreateBackupDialog = (
   element: HTMLElement,
-  dialogParams: HassioCreateSnapshotDialogParams
+  dialogParams: HassioCreateBackupDialogParams
 ): void => {
   fireEvent(element, "show-dialog", {
-    dialogTag: "dialog-hassio-create-snapshot",
-    dialogImport: () => import("./dialog-hassio-create-snapshot"),
+    dialogTag: "dialog-hassio-create-backup",
+    dialogImport: () => import("./dialog-hassio-create-backup"),
     dialogParams,
   });
 };
diff --git a/hassio/src/dialogs/network/dialog-hassio-network.ts b/hassio/src/dialogs/network/dialog-hassio-network.ts
index 28aa6666c8..858a3eaf7e 100644
--- a/hassio/src/dialogs/network/dialog-hassio-network.ts
+++ b/hassio/src/dialogs/network/dialog-hassio-network.ts
@@ -10,6 +10,7 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { cache } from "lit/directives/cache";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-circular-progress";
 import "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-expansion-panel";
@@ -251,9 +252,9 @@ export class DialogHassioNetwork
             `
           : ""}
         ${this._dirty
-          ? html`<div class="warning">
+          ? html`<ha-alert alert-type="warning">
               ${this.supervisor.localize("dialog.network.warning")}
-            </div>`
+            </ha-alert>`
           : ""}
       </div>
       <div class="buttons">
diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts
index 7ff50b7e98..9a50043475 100644
--- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts
+++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts
@@ -9,6 +9,7 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-circular-progress";
 import { createCloseHeading } from "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-svg-icon";
@@ -75,7 +76,9 @@ class HassioRepositoriesDialog extends LitElement {
           this._dialogParams!.supervisor.localize("dialog.repositories.title")
         )}
       >
-        ${this._error ? html`<div class="error">${this._error}</div>` : ""}
+        ${this._error
+          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+          : ""}
         <div class="form">
           ${repositories.length
             ? repositories.map(
diff --git a/hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts b/hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts
deleted file mode 100644
index f6fa98b01d..0000000000
--- a/hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { fireEvent } from "../../../../src/common/dom/fire_event";
-import "./dialog-hassio-snapshot-upload";
-
-export interface HassioSnapshotUploadDialogParams {
-  showSnapshot: (slug: string) => void;
-  reloadSnapshot?: () => Promise<void>;
-  onboarding?: boolean;
-}
-
-export const showSnapshotUploadDialog = (
-  element: HTMLElement,
-  dialogParams: HassioSnapshotUploadDialogParams
-): void => {
-  fireEvent(element, "show-dialog", {
-    dialogTag: "dialog-hassio-snapshot-upload",
-    dialogImport: () => import("./dialog-hassio-snapshot-upload"),
-    dialogParams,
-  });
-};
diff --git a/hassio/src/dialogs/update/dialog-supervisor-update.ts b/hassio/src/dialogs/update/dialog-supervisor-update.ts
index f6757c1481..62c48d2031 100644
--- a/hassio/src/dialogs/update/dialog-supervisor-update.ts
+++ b/hassio/src/dialogs/update/dialog-supervisor-update.ts
@@ -2,6 +2,7 @@ import "@material/mwc-button/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
+import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-circular-progress";
 import "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-settings-row";
@@ -11,7 +12,7 @@ import {
   extractApiErrorMessage,
   ignoreSupervisorError,
 } from "../../../../src/data/hassio/common";
-import { createHassioPartialSnapshot } from "../../../../src/data/hassio/snapshot";
+import { createHassioPartialBackup } from "../../../../src/data/hassio/backup";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import type { HomeAssistant } from "../../../../src/types";
 import { SupervisorDialogSupervisorUpdateParams } from "./show-dialog-update";
@@ -22,9 +23,9 @@ class DialogSupervisorUpdate extends LitElement {
 
   @state() private _opened = false;
 
-  @state() private _createSnapshot = true;
+  @state() private _createBackup = true;
 
-  @state() private _action: "snapshot" | "update" | null = null;
+  @state() private _action: "backup" | "update" | null = null;
 
   @state() private _error?: string;
 
@@ -41,7 +42,7 @@ class DialogSupervisorUpdate extends LitElement {
 
   public closeDialog(): void {
     this._action = null;
-    this._createSnapshot = true;
+    this._createBackup = true;
     this._error = undefined;
     this._dialogParams = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -84,20 +85,20 @@ class DialogSupervisorUpdate extends LitElement {
               <ha-settings-row>
                 <span slot="heading">
                   ${this._dialogParams.supervisor.localize(
-                    "dialog.update.snapshot"
+                    "dialog.update.backup"
                   )}
                 </span>
                 <span slot="description">
                   ${this._dialogParams.supervisor.localize(
-                    "dialog.update.create_snapshot",
+                    "dialog.update.create_backup",
                     "name",
                     this._dialogParams.name
                   )}
                 </span>
                 <ha-switch
-                  .checked=${this._createSnapshot}
+                  .checked=${this._createBackup}
                   haptic
-                  @click=${this._toggleSnapshot}
+                  @click=${this._toggleBackup}
                 >
                 </ha-switch>
               </ha-settings-row>
@@ -123,27 +124,29 @@ class DialogSupervisorUpdate extends LitElement {
                       this._dialogParams.version
                     )
                   : this._dialogParams.supervisor.localize(
-                      "dialog.update.snapshotting",
+                      "dialog.update.creating_backup",
                       "name",
                       this._dialogParams.name
                     )}
               </p>`}
-        ${this._error ? html`<p class="error">${this._error}</p>` : ""}
+        ${this._error
+          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+          : ""}
       </ha-dialog>
     `;
   }
 
-  private _toggleSnapshot() {
-    this._createSnapshot = !this._createSnapshot;
+  private _toggleBackup() {
+    this._createBackup = !this._createBackup;
   }
 
   private async _update() {
-    if (this._createSnapshot) {
-      this._action = "snapshot";
+    if (this._createBackup) {
+      this._action = "backup";
       try {
-        await createHassioPartialSnapshot(
+        await createHassioPartialBackup(
           this.hass,
-          this._dialogParams!.snapshotParams
+          this._dialogParams!.backupParams
         );
       } catch (err) {
         this._error = extractApiErrorMessage(err);
diff --git a/hassio/src/dialogs/update/show-dialog-update.ts b/hassio/src/dialogs/update/show-dialog-update.ts
index 209243968c..6c3d15cc05 100644
--- a/hassio/src/dialogs/update/show-dialog-update.ts
+++ b/hassio/src/dialogs/update/show-dialog-update.ts
@@ -5,7 +5,7 @@ export interface SupervisorDialogSupervisorUpdateParams {
   supervisor: Supervisor;
   name: string;
   version: string;
-  snapshotParams: any;
+  backupParams: any;
   updateHandler: () => Promise<void>;
 }
 
diff --git a/hassio/src/hassio-my-redirect.ts b/hassio/src/hassio-my-redirect.ts
index cd38d85d57..6cfb728f1b 100644
--- a/hassio/src/hassio-my-redirect.ts
+++ b/hassio/src/hassio-my-redirect.ts
@@ -26,7 +26,10 @@ const REDIRECTS: Redirects = {
     redirect: "/hassio/system",
   },
   supervisor_snapshots: {
-    redirect: "/hassio/snapshots",
+    redirect: "/hassio/backups",
+  },
+  supervisor_backups: {
+    redirect: "/hassio/backups",
   },
   supervisor_store: {
     redirect: "/hassio/store",
diff --git a/hassio/src/hassio-panel-router.ts b/hassio/src/hassio-panel-router.ts
index 28d9f24519..bceab08108 100644
--- a/hassio/src/hassio-panel-router.ts
+++ b/hassio/src/hassio-panel-router.ts
@@ -9,7 +9,7 @@ import "./addon-store/hassio-addon-store";
 // Don't codesplit it, that way the dashboard always loads fast.
 import "./dashboard/hassio-dashboard";
 // Don't codesplit the others, because it breaks the UI when pushed to a Pi
-import "./snapshots/hassio-snapshots";
+import "./backups/hassio-backups";
 import "./system/hassio-system";
 
 @customElement("hassio-panel-router")
@@ -23,6 +23,8 @@ class HassioPanelRouter extends HassRouterPage {
   @property({ type: Boolean }) public narrow!: boolean;
 
   protected routerOptions: RouterOptions = {
+    beforeRender: (page: string) =>
+      page === "snapshots" ? "backups" : undefined,
     routes: {
       dashboard: {
         tag: "hassio-dashboard",
@@ -30,8 +32,8 @@ class HassioPanelRouter extends HassRouterPage {
       store: {
         tag: "hassio-addon-store",
       },
-      snapshots: {
-        tag: "hassio-snapshots",
+      backups: {
+        tag: "hassio-backups",
       },
       system: {
         tag: "hassio-system",
diff --git a/hassio/src/hassio-router.ts b/hassio/src/hassio-router.ts
index 082688399e..3768d26e92 100644
--- a/hassio/src/hassio-router.ts
+++ b/hassio/src/hassio-router.ts
@@ -23,6 +23,8 @@ class HassioRouter extends HassRouterPage {
   protected routerOptions: RouterOptions = {
     // Hass.io has a page with tabs, so we route all non-matching routes to it.
     defaultPage: "dashboard",
+    beforeRender: (page: string) =>
+      page === "snapshots" ? "backups" : undefined,
     initialLoad: () => this._redirectIngress(),
     showLoading: true,
     routes: {
@@ -30,7 +32,7 @@ class HassioRouter extends HassRouterPage {
         tag: "hassio-panel",
         cache: true,
       },
-      snapshots: "dashboard",
+      backups: "dashboard",
       store: "dashboard",
       system: "dashboard",
       addon: {
diff --git a/hassio/src/hassio-tabs.ts b/hassio/src/hassio-tabs.ts
index af33a53741..5131b56f0d 100644
--- a/hassio/src/hassio-tabs.ts
+++ b/hassio/src/hassio-tabs.ts
@@ -13,8 +13,8 @@ export const supervisorTabs: PageNavigation[] = [
     iconPath: mdiStore,
   },
   {
-    translationKey: "panel.snapshots",
-    path: `/hassio/snapshots`,
+    translationKey: "panel.backups",
+    path: `/hassio/backups`,
     iconPath: mdiBackupRestore,
   },
   {
diff --git a/hassio/src/system/hassio-core-info.ts b/hassio/src/system/hassio-core-info.ts
index e335a1df78..f749eaade2 100644
--- a/hassio/src/system/hassio-core-info.ts
+++ b/hassio/src/system/hassio-core-info.ts
@@ -165,7 +165,7 @@ class HassioCoreInfo extends LitElement {
       supervisor: this.supervisor,
       name: "Home Assistant Core",
       version: this.supervisor.core.version_latest,
-      snapshotParams: {
+      backupParams: {
         name: `core_${this.supervisor.core.version}`,
         folders: ["homeassistant"],
         homeassistant: true,
diff --git a/hassio/src/system/hassio-supervisor-info.ts b/hassio/src/system/hassio-supervisor-info.ts
index 62baf5809e..2df2530a6c 100644
--- a/hassio/src/system/hassio-supervisor-info.ts
+++ b/hassio/src/system/hassio-supervisor-info.ts
@@ -3,6 +3,7 @@ import { customElement, property, state } from "lit/decorators";
 import { atLeastVersion } from "../../../src/common/config/version";
 import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/buttons/ha-progress-button";
+import "../../../src/components/ha-alert";
 import "../../../src/components/ha-card";
 import "../../../src/components/ha-settings-row";
 import "../../../src/components/ha-switch";
@@ -170,31 +171,25 @@ class HassioSupervisorInfo extends LitElement {
                     ></ha-switch>
                   </ha-settings-row>`
                 : ""
-              : html`<div class="error">
+              : html`<ha-alert
+                  alert-type="warning"
+                  .actionText=${this.supervisor.localize("common.learn_more")}
+                  @alert-action-clicked=${this._unsupportedDialog}
+                >
                   ${this.supervisor.localize(
                     "system.supervisor.unsupported_title"
                   )}
-                  <button
-                    class="link"
-                    .title=${this.supervisor.localize("common.learn_more")}
-                    @click=${this._unsupportedDialog}
-                  >
-                    Learn more
-                  </button>
-                </div>`}
+                </ha-alert>`}
             ${!this.supervisor.supervisor.healthy
-              ? html`<div class="error">
+              ? html`<ha-alert
+                  alert-type="error"
+                  .actionText=${this.supervisor.localize("common.learn_more")}
+                  @alert-action-clicked=${this._unhealthyDialog}
+                >
                   ${this.supervisor.localize(
                     "system.supervisor.unhealthy_title"
                   )}
-                  <button
-                    class="link"
-                    .title=${this.supervisor.localize("common.learn_more")}
-                    @click=${this._unhealthyDialog}
-                  >
-                    Learn more
-                  </button>
-                </div>`
+                </ha-alert>`
               : ""}
           </div>
           <div class="metrics-block">
diff --git a/hassio/src/system/hassio-supervisor-log.ts b/hassio/src/system/hassio-supervisor-log.ts
index ac0f3e8cdc..f41e0a09aa 100644
--- a/hassio/src/system/hassio-supervisor-log.ts
+++ b/hassio/src/system/hassio-supervisor-log.ts
@@ -5,6 +5,7 @@ import "@polymer/paper-listbox/paper-listbox";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../src/components/buttons/ha-progress-button";
+import "../../../src/components/ha-alert";
 import "../../../src/components/ha-card";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
 import { fetchHassioLogs } from "../../../src/data/hassio/supervisor";
@@ -67,7 +68,9 @@ class HassioSupervisorLog extends LitElement {
   protected render(): TemplateResult | void {
     return html`
       <ha-card>
-        ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
+        ${this._error
+          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+          : ""}
         ${this.hass.userData?.showAdvanced
           ? html`
               <paper-dropdown-menu
@@ -154,10 +157,6 @@ class HassioSupervisorLog extends LitElement {
           padding: 0 2%;
           width: 96%;
         }
-        .errors {
-          color: var(--error-color);
-          margin-bottom: 16px;
-        }
       `,
     ];
   }
diff --git a/package.json b/package.json
index 1b7cb54886..c13880a872 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "lint": "yarn run lint:eslint && yarn run lint:prettier && yarn run lint:types",
     "format": "yarn run format:eslint && yarn run format:prettier",
     "mocha": "ts-mocha -p test-mocha/tsconfig.test.json \"test-mocha/**/*.ts\"",
-    "test": "yarn run lint && yarn run mocha"
+    "test": "yarn run mocha"
   },
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
@@ -113,7 +113,7 @@
     "js-yaml": "^4.1.0",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
-    "lit": "^2.0.0-rc.2",
+    "lit": "^2.0.0-rc.3",
     "lit-vaadin-helpers": "^0.1.3",
     "marked": "^2.0.5",
     "mdn-polyfills": "^5.16.0",
@@ -233,8 +233,10 @@
   "resolutions": {
     "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch",
     "@webcomponents/webcomponentsjs": "^2.2.10",
-    "lit-html": "2.0.0-rc.3",
-    "lit-element": "3.0.0-rc.2"
+    "lit": "^2.0.0-rc.3",
+    "lit-html": "2.0.0-rc.4",
+    "lit-element": "3.0.0-rc.3",
+    "@lit/reactive-element": "1.0.0-rc.3"
   },
   "main": "src/home-assistant.js",
   "husky": {
diff --git a/setup.py b/setup.py
index 0f8de66825..c0b198d50f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20210809.0",
+    version="20210830.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/frontend",
     author="The Home Assistant Authors",
diff --git a/src/common/color/colors.ts b/src/common/color/colors.ts
index d70aa5ce6a..fd9de4d3df 100644
--- a/src/common/color/colors.ts
+++ b/src/common/color/colors.ts
@@ -1,5 +1,5 @@
 export const COLORS = [
-  "#377eb8",
+  "#44739e",
   "#984ea3",
   "#00d2d5",
   "#ff7f00",
diff --git a/src/common/const.ts b/src/common/const.ts
index dd4eace281..e0d8f67a04 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -56,19 +56,30 @@ export const FIXED_DOMAIN_ICONS = {
 };
 
 export const FIXED_DEVICE_CLASS_ICONS = {
+  aqi: "hass:air-filter",
   current: "hass:current-ac",
   carbon_dioxide: "mdi:molecule-co2",
   carbon_monoxide: "mdi:molecule-co",
   energy: "hass:lightning-bolt",
+  gas: "hass:gas-cylinder",
   humidity: "hass:water-percent",
   illuminance: "hass:brightness-5",
+  nitrogen_dioxide: "mdi:molecule",
+  nitrogen_monoxide: "mdi:molecule",
+  nitrous_oxide: "mdi:molecule",
+  ozone: "mdi:molecule",
   temperature: "hass:thermometer",
   monetary: "mdi:cash",
+  pm25: "mdi:molecule",
+  pm1: "mdi:molecule",
+  pm10: "mdi:molecule",
   pressure: "hass:gauge",
   power: "hass:flash",
   power_factor: "hass:angle-acute",
   signal_strength: "hass:wifi",
+  sulphur_dioxide: "mdi:molecule",
   timestamp: "hass:clock",
+  volatile_organic_compounds: "mdi:molecule",
   voltage: "hass:sine-wave",
 };
 
@@ -157,66 +168,3 @@ export const UNIT_F = "°F";
 
 /** Entity ID of the default view. */
 export const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
-
-/** HA Color Pallete. */
-export const HA_COLOR_PALETTE = [
-  "ff0029",
-  "66a61e",
-  "377eb8",
-  "984ea3",
-  "00d2d5",
-  "ff7f00",
-  "af8d00",
-  "7f80cd",
-  "b3e900",
-  "c42e60",
-  "a65628",
-  "f781bf",
-  "8dd3c7",
-  "bebada",
-  "fb8072",
-  "80b1d3",
-  "fdb462",
-  "fccde5",
-  "bc80bd",
-  "ffed6f",
-  "c4eaff",
-  "cf8c00",
-  "1b9e77",
-  "d95f02",
-  "e7298a",
-  "e6ab02",
-  "a6761d",
-  "0097ff",
-  "00d067",
-  "f43600",
-  "4ba93b",
-  "5779bb",
-  "927acc",
-  "97ee3f",
-  "bf3947",
-  "9f5b00",
-  "f48758",
-  "8caed6",
-  "f2b94f",
-  "eff26e",
-  "e43872",
-  "d9b100",
-  "9d7a00",
-  "698cff",
-  "d9d9d9",
-  "00d27e",
-  "d06800",
-  "009f82",
-  "c49200",
-  "cbe8ff",
-  "fecddf",
-  "c27eb6",
-  "8cd2ce",
-  "c4b8d9",
-  "f883b0",
-  "a49100",
-  "f48800",
-  "27d0df",
-  "a04a9b",
-];
diff --git a/src/common/datetime/create_duration_data.ts b/src/common/datetime/create_duration_data.ts
new file mode 100644
index 0000000000..92b3d01021
--- /dev/null
+++ b/src/common/datetime/create_duration_data.ts
@@ -0,0 +1,31 @@
+import { HaDurationData } from "../../components/ha-duration-input";
+import { ForDict } from "../../data/automation";
+
+export const createDurationData = (
+  duration: string | number | ForDict | undefined
+): HaDurationData => {
+  if (duration === undefined) {
+    return {};
+  }
+  if (typeof duration !== "object") {
+    if (typeof duration === "string" || isNaN(duration)) {
+      const parts = duration?.toString().split(":") || [];
+      return {
+        hours: Number(parts[0]) || 0,
+        minutes: Number(parts[1]) || 0,
+        seconds: Number(parts[2]) || 0,
+        milliseconds: Number(parts[3]) || 0,
+      };
+    }
+    return { seconds: duration };
+  }
+  const { days, minutes, seconds, milliseconds } = duration;
+  let hours = duration.hours || 0;
+  hours = (hours || 0) + (days || 0) * 24;
+  return {
+    hours,
+    minutes,
+    seconds,
+    milliseconds,
+  };
+};
diff --git a/src/common/datetime/format_date.ts b/src/common/datetime/format_date.ts
index e9b70430a0..f359973789 100644
--- a/src/common/datetime/format_date.ts
+++ b/src/common/datetime/format_date.ts
@@ -3,33 +3,11 @@ import memoizeOne from "memoize-one";
 import { FrontendLocaleData } from "../../data/translation";
 import { toLocaleDateStringSupportsOptions } from "./check_options_support";
 
-const formatDateMem = memoizeOne(
-  (locale: FrontendLocaleData) =>
-    new Intl.DateTimeFormat(locale.language, {
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-    })
-);
-
-export const formatDate = toLocaleDateStringSupportsOptions
+// Tuesday, August 10
+export const formatDateWeekday = toLocaleDateStringSupportsOptions
   ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatDateMem(locale).format(dateObj)
-  : (dateObj: Date) => format(dateObj, "longDate");
-
-const formatDateShortMem = memoizeOne(
-  (locale: FrontendLocaleData) =>
-    new Intl.DateTimeFormat(locale.language, {
-      day: "numeric",
-      month: "short",
-    })
-);
-
-export const formatDateShort = toLocaleDateStringSupportsOptions
-  ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatDateShortMem(locale).format(dateObj)
-  : (dateObj: Date) => format(dateObj, "shortDate");
-
+      formatDateWeekdayMem(locale).format(dateObj)
+  : (dateObj: Date) => format(dateObj, "dddd, MMMM D");
 const formatDateWeekdayMem = memoizeOne(
   (locale: FrontendLocaleData) =>
     new Intl.DateTimeFormat(locale.language, {
@@ -39,7 +17,80 @@ const formatDateWeekdayMem = memoizeOne(
     })
 );
 
-export const formatDateWeekday = toLocaleDateStringSupportsOptions
+// August 10, 2021
+export const formatDate = toLocaleDateStringSupportsOptions
   ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatDateWeekdayMem(locale).format(dateObj)
-  : (dateObj: Date) => format(dateObj, "dddd, MMM D");
+      formatDateMem(locale).format(dateObj)
+  : (dateObj: Date) => format(dateObj, "MMMM D, YYYY");
+const formatDateMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DateTimeFormat(locale.language, {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+    })
+);
+
+// 10/08/2021
+export const formatDateNumeric = toLocaleDateStringSupportsOptions
+  ? (dateObj: Date, locale: FrontendLocaleData) =>
+      formatDateNumericMem(locale).format(dateObj)
+  : (dateObj: Date) => format(dateObj, "M/D/YYYY");
+const formatDateNumericMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DateTimeFormat(locale.language, {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+    })
+);
+
+// Aug 10
+export const formatDateShort = toLocaleDateStringSupportsOptions
+  ? (dateObj: Date, locale: FrontendLocaleData) =>
+      formatDateShortMem(locale).format(dateObj)
+  : (dateObj: Date) => format(dateObj, "MMM D");
+const formatDateShortMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DateTimeFormat(locale.language, {
+      day: "numeric",
+      month: "short",
+    })
+);
+
+// August 2021
+export const formatDateMonthYear = toLocaleDateStringSupportsOptions
+  ? (dateObj: Date, locale: FrontendLocaleData) =>
+      formatDateMonthYearMem(locale).format(dateObj)
+  : (dateObj: Date) => format(dateObj, "MMMM YYYY");
+const formatDateMonthYearMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DateTimeFormat(locale.language, {
+      month: "long",
+      year: "numeric",
+    })
+);
+
+// August
+export const formatDateMonth = toLocaleDateStringSupportsOptions
+  ? (dateObj: Date, locale: FrontendLocaleData) =>
+      formatDateMonthMem(locale).format(dateObj)
+  : (dateObj: Date) => format(dateObj, "MMMM");
+const formatDateMonthMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DateTimeFormat(locale.language, {
+      month: "long",
+    })
+);
+
+// 2021
+export const formatDateYear = toLocaleDateStringSupportsOptions
+  ? (dateObj: Date, locale: FrontendLocaleData) =>
+      formatDateYearMem(locale).format(dateObj)
+  : (dateObj: Date) => format(dateObj, "YYYY");
+const formatDateYearMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DateTimeFormat(locale.language, {
+      year: "numeric",
+    })
+);
diff --git a/src/common/datetime/format_date_time.ts b/src/common/datetime/format_date_time.ts
index 850e82b185..0b91a40b81 100644
--- a/src/common/datetime/format_date_time.ts
+++ b/src/common/datetime/format_date_time.ts
@@ -4,6 +4,12 @@ import { FrontendLocaleData } from "../../data/translation";
 import { toLocaleStringSupportsOptions } from "./check_options_support";
 import { useAmPm } from "./use_am_pm";
 
+// August 9, 2021, 8:23 AM
+export const formatDateTime = toLocaleStringSupportsOptions
+  ? (dateObj: Date, locale: FrontendLocaleData) =>
+      formatDateTimeMem(locale).format(dateObj)
+  : (dateObj: Date, locale: FrontendLocaleData) =>
+      format(dateObj, "MMMM D, YYYY, HH:mm" + useAmPm(locale) ? " A" : "");
 const formatDateTimeMem = memoizeOne(
   (locale: FrontendLocaleData) =>
     new Intl.DateTimeFormat(locale.language, {
@@ -16,12 +22,12 @@ const formatDateTimeMem = memoizeOne(
     })
 );
 
-export const formatDateTime = toLocaleStringSupportsOptions
+// August 9, 2021, 8:23:15 AM
+export const formatDateTimeWithSeconds = toLocaleStringSupportsOptions
   ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatDateTimeMem(locale).format(dateObj)
+      formatDateTimeWithSecondsMem(locale).format(dateObj)
   : (dateObj: Date, locale: FrontendLocaleData) =>
-      format(dateObj, "MMMM D, YYYY, HH:mm" + useAmPm(locale) ? " A" : "");
-
+      format(dateObj, "MMMM D, YYYY, HH:mm:ss" + useAmPm(locale) ? " A" : "");
 const formatDateTimeWithSecondsMem = memoizeOne(
   (locale: FrontendLocaleData) =>
     new Intl.DateTimeFormat(locale.language, {
@@ -35,8 +41,20 @@ const formatDateTimeWithSecondsMem = memoizeOne(
     })
 );
 
-export const formatDateTimeWithSeconds = toLocaleStringSupportsOptions
+// 9/8/2021, 8:23 AM
+export const formatDateTimeNumeric = toLocaleStringSupportsOptions
   ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatDateTimeWithSecondsMem(locale).format(dateObj)
+      formatDateTimeNumericMem(locale).format(dateObj)
   : (dateObj: Date, locale: FrontendLocaleData) =>
-      format(dateObj, "MMMM D, YYYY, HH:mm:ss" + useAmPm(locale) ? " A" : "");
+      format(dateObj, "M/D/YYYY, HH:mm" + useAmPm(locale) ? " A" : "");
+const formatDateTimeNumericMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DateTimeFormat(locale.language, {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+      hour: "numeric",
+      minute: "2-digit",
+      hour12: useAmPm(locale),
+    })
+);
diff --git a/src/common/datetime/format_time.ts b/src/common/datetime/format_time.ts
index 14bbdf8e53..a20e1feef5 100644
--- a/src/common/datetime/format_time.ts
+++ b/src/common/datetime/format_time.ts
@@ -4,6 +4,12 @@ import { FrontendLocaleData } from "../../data/translation";
 import { toLocaleTimeStringSupportsOptions } from "./check_options_support";
 import { useAmPm } from "./use_am_pm";
 
+// 9:15 PM || 21:15
+export const formatTime = toLocaleTimeStringSupportsOptions
+  ? (dateObj: Date, locale: FrontendLocaleData) =>
+      formatTimeMem(locale).format(dateObj)
+  : (dateObj: Date, locale: FrontendLocaleData) =>
+      format(dateObj, "shortTime" + useAmPm(locale) ? " A" : "");
 const formatTimeMem = memoizeOne(
   (locale: FrontendLocaleData) =>
     new Intl.DateTimeFormat(locale.language, {
@@ -13,12 +19,12 @@ const formatTimeMem = memoizeOne(
     })
 );
 
-export const formatTime = toLocaleTimeStringSupportsOptions
+// 9:15:24 PM || 21:15:24
+export const formatTimeWithSeconds = toLocaleTimeStringSupportsOptions
   ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatTimeMem(locale).format(dateObj)
+      formatTimeWithSecondsMem(locale).format(dateObj)
   : (dateObj: Date, locale: FrontendLocaleData) =>
-      format(dateObj, "shortTime" + useAmPm(locale) ? " A" : "");
-
+      format(dateObj, "mediumTime" + useAmPm(locale) ? " A" : "");
 const formatTimeWithSecondsMem = memoizeOne(
   (locale: FrontendLocaleData) =>
     new Intl.DateTimeFormat(locale.language, {
@@ -29,12 +35,12 @@ const formatTimeWithSecondsMem = memoizeOne(
     })
 );
 
-export const formatTimeWithSeconds = toLocaleTimeStringSupportsOptions
+// Tuesday 7:00 PM || Tuesday 19:00
+export const formatTimeWeekday = toLocaleTimeStringSupportsOptions
   ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatTimeWithSecondsMem(locale).format(dateObj)
+      formatTimeWeekdayMem(locale).format(dateObj)
   : (dateObj: Date, locale: FrontendLocaleData) =>
-      format(dateObj, "mediumTime" + useAmPm(locale) ? " A" : "");
-
+      format(dateObj, "dddd, HH:mm" + useAmPm(locale) ? " A" : "");
 const formatTimeWeekdayMem = memoizeOne(
   (locale: FrontendLocaleData) =>
     new Intl.DateTimeFormat(locale.language, {
@@ -44,9 +50,3 @@ const formatTimeWeekdayMem = memoizeOne(
       hour12: useAmPm(locale),
     })
 );
-
-export const formatTimeWeekday = toLocaleTimeStringSupportsOptions
-  ? (dateObj: Date, locale: FrontendLocaleData) =>
-      formatTimeWeekdayMem(locale).format(dateObj)
-  : (dateObj: Date, locale: FrontendLocaleData) =>
-      format(dateObj, "dddd, HH:mm" + useAmPm(locale) ? " A" : "");
diff --git a/src/common/datetime/use_am_pm.ts b/src/common/datetime/use_am_pm.ts
index cf5b2c124e..97bf2911b8 100644
--- a/src/common/datetime/use_am_pm.ts
+++ b/src/common/datetime/use_am_pm.ts
@@ -1,6 +1,7 @@
+import memoizeOne from "memoize-one";
 import { FrontendLocaleData, TimeFormat } from "../../data/translation";
 
-export const useAmPm = (locale: FrontendLocaleData): boolean => {
+export const useAmPm = memoizeOne((locale: FrontendLocaleData): boolean => {
   if (
     locale.time_format === TimeFormat.language ||
     locale.time_format === TimeFormat.system
@@ -12,4 +13,4 @@ export const useAmPm = (locale: FrontendLocaleData): boolean => {
   }
 
   return locale.time_format === TimeFormat.am_pm;
-};
+});
diff --git a/src/common/entity/binary_sensor_icon.ts b/src/common/entity/binary_sensor_icon.ts
index 1ae025a2df..ef90cd64ff 100644
--- a/src/common/entity/binary_sensor_icon.ts
+++ b/src/common/entity/binary_sensor_icon.ts
@@ -44,6 +44,8 @@ export const binarySensorIcon = (state?: string, stateObj?: HassEntity) => {
       return is_off ? "hass:home-outline" : "hass:home";
     case "sound":
       return is_off ? "hass:music-note-off" : "hass:music-note";
+    case "update":
+      return is_off ? "mdi:package" : "mdi:package-up";
     case "vibration":
       return is_off ? "hass:crop-portrait" : "hass:vibrate";
     case "window":
diff --git a/src/common/util/group-by.ts b/src/common/util/group-by.ts
new file mode 100644
index 0000000000..0f3f76dfff
--- /dev/null
+++ b/src/common/util/group-by.ts
@@ -0,0 +1,15 @@
+export const groupBy = <T>(
+  list: T[],
+  keySelector: (item: T) => string
+): { [key: string]: T[] } => {
+  const result = {};
+  for (const item of list) {
+    const key = keySelector(item);
+    if (key in result) {
+      result[key].push(item);
+    } else {
+      result[key] = [item];
+    }
+  }
+  return result;
+};
diff --git a/src/common/util/time-cache-function-promise.ts b/src/common/util/time-cache-function-promise.ts
index c11a901884..d841ea256b 100644
--- a/src/common/util/time-cache-function-promise.ts
+++ b/src/common/util/time-cache-function-promise.ts
@@ -7,14 +7,10 @@ interface ResultCache<T> {
 export const timeCachePromiseFunc = async <T>(
   cacheKey: string,
   cacheTime: number,
-  func: (
-    hass: HomeAssistant,
-    entityId: string,
-    ...args: unknown[]
-  ) => Promise<T>,
+  func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
   hass: HomeAssistant,
   entityId: string,
-  ...args: unknown[]
+  ...args: any[]
 ): Promise<T> => {
   let cache: ResultCache<T> | undefined = (hass as any)[cacheKey];
 
diff --git a/src/components/chart/chart-date-adapter.ts b/src/components/chart/chart-date-adapter.ts
index a25163b662..97c78c3da3 100644
--- a/src/components/chart/chart-date-adapter.ts
+++ b/src/components/chart/chart-date-adapter.ts
@@ -35,7 +35,14 @@ import {
   endOfQuarter,
   endOfYear,
 } from "date-fns";
-import { formatDate, formatDateShort } from "../../common/datetime/format_date";
+import {
+  formatDate,
+  formatDateMonth,
+  formatDateMonthYear,
+  formatDateShort,
+  formatDateWeekday,
+  formatDateYear,
+} from "../../common/datetime/format_date";
 import {
   formatDateTime,
   formatDateTimeWithSeconds,
@@ -53,8 +60,11 @@ const FORMATS = {
   minute: "minute",
   hour: "hour",
   day: "day",
+  date: "date",
+  weekday: "weekday",
   week: "week",
   month: "month",
+  monthyear: "monthyear",
   quarter: "quarter",
   year: "year",
 };
@@ -81,16 +91,22 @@ _adapters._date.override({
         return formatTime(new Date(time), this.options.locale);
       case "hour":
         return formatTime(new Date(time), this.options.locale);
+      case "weekday":
+        return formatDateWeekday(new Date(time), this.options.locale);
+      case "date":
+        return formatDate(new Date(time), this.options.locale);
       case "day":
         return formatDateShort(new Date(time), this.options.locale);
       case "week":
         return formatDate(new Date(time), this.options.locale);
       case "month":
-        return formatDate(new Date(time), this.options.locale);
+        return formatDateMonth(new Date(time), this.options.locale);
+      case "monthyear":
+        return formatDateMonthYear(new Date(time), this.options.locale);
       case "quarter":
         return formatDate(new Date(time), this.options.locale);
       case "year":
-        return formatDate(new Date(time), this.options.locale);
+        return formatDateYear(new Date(time), this.options.locale);
       default:
         return "";
     }
diff --git a/src/components/chart/ha-chart-base.ts b/src/components/chart/ha-chart-base.ts
index 36970c31a3..1606fc07ba 100644
--- a/src/components/chart/ha-chart-base.ts
+++ b/src/components/chart/ha-chart-base.ts
@@ -61,6 +61,11 @@ export default class HaChartBase extends LitElement {
       this.chart.config.type = this.chartType;
     }
     if (changedProps.has("data")) {
+      if (this._hiddenDatasets.size) {
+        this.data.datasets.forEach((dataset, index) => {
+          dataset.hidden = this._hiddenDatasets.has(index);
+        });
+      }
       this.chart.data = this.data;
     }
     if (changedProps.has("options")) {
@@ -238,9 +243,19 @@ export default class HaChartBase extends LitElement {
     };
   }
 
-  public updateChart = (): void => {
+  public updateChart = (
+    mode:
+      | "resize"
+      | "reset"
+      | "none"
+      | "hide"
+      | "show"
+      | "normal"
+      | "active"
+      | undefined
+  ): void => {
     if (this.chart) {
-      this.chart.update();
+      this.chart.update(mode);
     }
   };
 
diff --git a/src/components/currency-datalist.ts b/src/components/currency-datalist.ts
index 7133aa560b..a5ec24d762 100644
--- a/src/components/currency-datalist.ts
+++ b/src/components/currency-datalist.ts
@@ -25,6 +25,7 @@ export const createCurrencyListEl = () => {
     "BSD",
     "BTN",
     "BWP",
+    "BYN",
     "BYR",
     "BZD",
     "CAD",
diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts
index 08929cd6f5..c1a69b8858 100644
--- a/src/components/data-table/ha-data-table.ts
+++ b/src/components/data-table/ha-data-table.ts
@@ -62,6 +62,7 @@ export interface DataTableSortColumnData {
   sortable?: boolean;
   filterable?: boolean;
   filterKey?: string;
+  valueColumn?: string;
   direction?: SortingDirection;
 }
 
@@ -76,7 +77,7 @@ export interface DataTableColumnData extends DataTableSortColumnData {
   hidden?: boolean;
 }
 
-type ClonedDataTableColumnData = Omit<DataTableColumnData, "title"> & {
+export type ClonedDataTableColumnData = Omit<DataTableColumnData, "title"> & {
   title?: TemplateResult | string;
 };
 
@@ -455,7 +456,7 @@ export class HaDataTable extends LitElement {
     const prom = this._sortColumn
       ? sortData(
           filteredData,
-          this._sortColumns,
+          this._sortColumns[this._sortColumn],
           this._sortDirection,
           this._sortColumn
         )
diff --git a/src/components/data-table/sort_filter_worker.ts b/src/components/data-table/sort_filter_worker.ts
index e0636aa4d3..286bae3014 100644
--- a/src/components/data-table/sort_filter_worker.ts
+++ b/src/components/data-table/sort_filter_worker.ts
@@ -2,8 +2,8 @@
 import { expose } from "comlink";
 import "proxy-polyfill";
 import type {
+  ClonedDataTableColumnData,
   DataTableRowData,
-  DataTableSortColumnData,
   SortableColumnContainer,
   SortingDirection,
 } from "./ha-data-table";
@@ -19,7 +19,11 @@ const filterData = (
       const [key, column] = columnEntry;
       if (column.filterable) {
         if (
-          String(column.filterKey ? row[key][column.filterKey] : row[key])
+          String(
+            column.filterKey
+              ? row[column.valueColumn || key][column.filterKey]
+              : row[column.valueColumn || key]
+          )
             .toUpperCase()
             .includes(filter)
         ) {
@@ -33,7 +37,7 @@ const filterData = (
 
 const sortData = (
   data: DataTableRowData[],
-  column: DataTableSortColumnData,
+  column: ClonedDataTableColumnData,
   direction: SortingDirection,
   sortColumn: string
 ) =>
@@ -44,12 +48,12 @@ const sortData = (
     }
 
     let valA = column.filterKey
-      ? a[sortColumn][column.filterKey]
-      : a[sortColumn];
+      ? a[column.valueColumn || sortColumn][column.filterKey]
+      : a[column.valueColumn || sortColumn];
 
     let valB = column.filterKey
-      ? b[sortColumn][column.filterKey]
-      : b[sortColumn];
+      ? b[column.valueColumn || sortColumn][column.filterKey]
+      : b[column.valueColumn || sortColumn];
 
     if (typeof valA === "string") {
       valA = valA.toUpperCase();
diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts
index eaa8f89c53..644c3afb32 100644
--- a/src/components/entity/ha-state-label-badge.ts
+++ b/src/components/entity/ha-state-label-badge.ts
@@ -257,7 +257,7 @@ export class HaStateLabelBadge extends LitElement {
       }
 
       .warning {
-        --ha-label-badge-color: var(--label-badge-yellow, #fce588);
+        --ha-label-badge-color: var(--label-badge-yellow, #f4b400);
       }
     `;
   }
diff --git a/src/components/ha-alert.ts b/src/components/ha-alert.ts
new file mode 100644
index 0000000000..a06f74b6be
--- /dev/null
+++ b/src/components/ha-alert.ts
@@ -0,0 +1,180 @@
+import "@material/mwc-button/mwc-button";
+import "@material/mwc-icon-button/mwc-icon-button";
+import {
+  mdiAlertCircleOutline,
+  mdiAlertOutline,
+  mdiCheckboxMarkedCircleOutline,
+  mdiClose,
+} from "@mdi/js";
+import { css, html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import { fireEvent } from "../common/dom/fire_event";
+import "./ha-svg-icon";
+
+const ALERT_ICONS = {
+  info: mdiAlertCircleOutline,
+  warning: mdiAlertOutline,
+  error: mdiAlertCircleOutline,
+  success: mdiCheckboxMarkedCircleOutline,
+};
+
+declare global {
+  interface HASSDomEvents {
+    "alert-dismissed-clicked": undefined;
+    "alert-action-clicked": undefined;
+  }
+}
+
+@customElement("ha-alert")
+class HaAlert extends LitElement {
+  @property() public title = "";
+
+  @property({ attribute: "alert-type" }) public alertType:
+    | "info"
+    | "warning"
+    | "error"
+    | "success" = "info";
+
+  @property({ attribute: "action-text" }) public actionText = "";
+
+  @property({ type: Boolean }) public dismissable = false;
+
+  @property({ type: Boolean }) public rtl = false;
+
+  public render() {
+    return html`
+      <div
+        class="issue-type ${classMap({
+          rtl: this.rtl,
+          [this.alertType]: true,
+        })}"
+      >
+        <div class="icon">
+          <ha-svg-icon .path=${ALERT_ICONS[this.alertType]}></ha-svg-icon>
+        </div>
+        <div class="content">
+          <div
+            class="main-content ${classMap({
+              "no-title": !this.title,
+            })}"
+          >
+            ${this.title ? html`<div class="title">${this.title}</div>` : ""}
+            <slot></slot>
+          </div>
+          <div class="action">
+            ${this.actionText
+              ? html`<mwc-button
+                  @click=${this._action_clicked}
+                  .label=${this.actionText}
+                ></mwc-button>`
+              : this.dismissable
+              ? html`<mwc-icon-button
+                  @click=${this._dismiss_clicked}
+                  aria-label="Dismiss alert"
+                >
+                  <ha-svg-icon .path=${mdiClose}> </ha-svg-icon>
+                </mwc-icon-button> `
+              : ""}
+          </div>
+        </div>
+      </div>
+    `;
+  }
+
+  private _dismiss_clicked() {
+    fireEvent(this, "alert-dismissed-clicked");
+  }
+
+  private _action_clicked() {
+    fireEvent(this, "alert-action-clicked");
+  }
+
+  static styles = css`
+    .issue-type {
+      position: relative;
+      padding: 4px;
+      display: flex;
+      margin: 4px 0;
+    }
+    .issue-type.rtl {
+      flex-direction: row-reverse;
+    }
+    .issue-type::before {
+      position: absolute;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+      opacity: 0.12;
+      pointer-events: none;
+      content: "";
+      border-radius: 4px;
+    }
+    .icon {
+      margin: 4px 8px;
+      width: 24px;
+    }
+    .main-content.no-title {
+      margin-top: 6px;
+    }
+    .issue-type.rtl > .content {
+      flex-direction: row-reverse;
+      text-align: right;
+    }
+    .content {
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+    }
+    .main-content {
+      overflow-wrap: anywhere;
+    }
+    .title {
+      font-weight: bold;
+      margin-top: 6px;
+    }
+
+    mwc-button {
+      --mdc-theme-primary: var(--primary-text-color);
+    }
+
+    .action {
+      align-self: center;
+    }
+
+    .issue-type.info > .icon {
+      color: var(--info-color);
+    }
+    .issue-type.info::before {
+      background-color: var(--info-color);
+    }
+
+    .issue-type.warning > .icon {
+      color: var(--warning-color);
+    }
+    .issue-type.warning::before {
+      background-color: var(--warning-color);
+    }
+
+    .issue-type.error > .icon {
+      color: var(--error-color);
+    }
+    .issue-type.error::before {
+      background-color: var(--error-color);
+    }
+
+    .issue-type.success > .icon {
+      color: var(--success-color);
+    }
+    .issue-type.success::before {
+      background-color: var(--success-color);
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-alert": HaAlert;
+  }
+}
diff --git a/src/components/ha-button-toggle-group.ts b/src/components/ha-button-toggle-group.ts
index 374be87341..ce07e95dd1 100644
--- a/src/components/ha-button-toggle-group.ts
+++ b/src/components/ha-button-toggle-group.ts
@@ -1,7 +1,8 @@
 import "@material/mwc-button/mwc-button";
+import type { Button } from "@material/mwc-button/mwc-button";
 import "@material/mwc-icon-button/mwc-icon-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement, property, queryAll } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
 import { fireEvent } from "../common/dom/fire_event";
 import type { ToggleButton } from "../types";
@@ -15,6 +16,10 @@ export class HaButtonToggleGroup extends LitElement {
 
   @property({ type: Boolean }) public fullWidth = false;
 
+  @property({ type: Boolean }) public dense = false;
+
+  @queryAll("mwc-button") private _buttons?: Button[];
+
   protected render(): TemplateResult {
     return html`
       <div>
@@ -34,6 +39,8 @@ export class HaButtonToggleGroup extends LitElement {
                     ? `${100 / this.buttons.length}%`
                     : "initial",
                 })}
+                outlined
+                .dense=${this.dense}
                 .value=${button.value}
                 ?active=${this.active === button.value}
                 @click=${this._handleClick}
@@ -44,6 +51,16 @@ export class HaButtonToggleGroup extends LitElement {
     `;
   }
 
+  protected updated() {
+    // Work around Safari default margin that is not reset in mwc-button as of aug 2021
+    this._buttons?.forEach(async (button) => {
+      await button.updateComplete;
+      (
+        button.shadowRoot!.querySelector("button") as HTMLButtonElement
+      ).style.margin = "0";
+    });
+  }
+
   private _handleClick(ev): void {
     this.active = ev.currentTarget.value;
     fireEvent(this, "value-changed", { value: this.active });
@@ -56,10 +73,16 @@ export class HaButtonToggleGroup extends LitElement {
         --mdc-icon-button-size: var(--button-toggle-size, 36px);
         --mdc-icon-size: var(--button-toggle-icon-size, 20px);
       }
-      mwc-icon-button,
       mwc-button {
+        --mdc-shape-small: 0;
+        --mdc-button-outline-width: 1px 0 1px 1px;
+      }
+      mwc-icon-button {
         border: 1px solid var(--primary-color);
         border-right-width: 0px;
+      }
+      mwc-icon-button,
+      mwc-button {
         position: relative;
         cursor: pointer;
       }
@@ -82,16 +105,19 @@ export class HaButtonToggleGroup extends LitElement {
       }
       mwc-icon-button:first-child,
       mwc-button:first-child {
+        --mdc-shape-small: 4px 0 0 4px;
         border-radius: 4px 0 0 4px;
       }
       mwc-icon-button:last-child,
       mwc-button:last-child {
         border-radius: 0 4px 4px 0;
         border-right-width: 1px;
+        --mdc-shape-small: 0 4px 4px 0;
+        --mdc-button-outline-width: 1px;
       }
       mwc-icon-button:only-child,
       mwc-button:only-child {
-        border-radius: 4px;
+        --mdc-shape-small: 4px;
         border-right-width: 1px;
       }
     `;
diff --git a/src/components/ha-camera-stream.ts b/src/components/ha-camera-stream.ts
index 9d91e81ffd..57b4649a53 100644
--- a/src/components/ha-camera-stream.ts
+++ b/src/components/ha-camera-stream.ts
@@ -8,7 +8,6 @@ import {
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
-import { fireEvent } from "../common/dom/fire_event";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { supportsFeature } from "../common/entity/supports-feature";
 import {
@@ -41,6 +40,32 @@ class HaCameraStream extends LitElement {
 
   @state() private _url?: string;
 
+  @state() private _connected = false;
+
+  public willUpdate(changedProps: PropertyValues): void {
+    if (
+      changedProps.has("stateObj") &&
+      !this._shouldRenderMJPEG &&
+      this.stateObj &&
+      (changedProps.get("stateObj") as CameraEntity | undefined)?.entity_id !==
+        this.stateObj.entity_id
+    ) {
+      this._forceMJPEG = undefined;
+      this._url = undefined;
+      this._getStreamUrl();
+    }
+  }
+
+  public connectedCallback() {
+    super.connectedCallback();
+    this._connected = true;
+  }
+
+  public disconnectedCallback() {
+    super.disconnectedCallback();
+    this._connected = false;
+  }
+
   protected render(): TemplateResult {
     if (!this.stateObj) {
       return html``;
@@ -50,10 +75,11 @@ class HaCameraStream extends LitElement {
       ${__DEMO__ || this._shouldRenderMJPEG
         ? html`
             <img
-              @load=${this._elementResized}
               .src=${__DEMO__
-                ? this.stateObj!.attributes.entity_picture
-                : computeMJPEGStreamUrl(this.stateObj)}
+                ? this.stateObj!.attributes.entity_picture!
+                : this._connected
+                ? computeMJPEGStreamUrl(this.stateObj)
+                : ""}
               .alt=${`Preview of the ${computeStateName(
                 this.stateObj
               )} camera.`}
@@ -75,13 +101,6 @@ class HaCameraStream extends LitElement {
     `;
   }
 
-  protected updated(changedProps: PropertyValues): void {
-    if (changedProps.has("stateObj") && !this._shouldRenderMJPEG) {
-      this._forceMJPEG = undefined;
-      this._getStreamUrl();
-    }
-  }
-
   private get _shouldRenderMJPEG() {
     return (
       this._forceMJPEG === this.stateObj!.entity_id ||
@@ -107,10 +126,6 @@ class HaCameraStream extends LitElement {
     }
   }
 
-  private _elementResized() {
-    fireEvent(this, "iron-resize");
-  }
-
   static get styles(): CSSResultGroup {
     return css`
       :host,
diff --git a/src/components/ha-duration-input.ts b/src/components/ha-duration-input.ts
new file mode 100644
index 0000000000..32651cb2c2
--- /dev/null
+++ b/src/components/ha-duration-input.ts
@@ -0,0 +1,140 @@
+import { html, LitElement, TemplateResult } from "lit";
+import { customElement, property, query } from "lit/decorators";
+import { fireEvent } from "../common/dom/fire_event";
+import "./paper-time-input";
+
+export interface HaDurationData {
+  hours?: number;
+  minutes?: number;
+  seconds?: number;
+  milliseconds?: number;
+}
+
+@customElement("ha-duration-input")
+class HaDurationInput extends LitElement {
+  @property({ attribute: false }) public data!: HaDurationData;
+
+  @property() public label?: string;
+
+  @property() public suffix?: string;
+
+  @property({ type: Boolean }) public required?: boolean;
+
+  @property({ type: Boolean }) public enableMillisecond?: boolean;
+
+  @query("paper-time-input", true) private _input?: HTMLElement;
+
+  public focus() {
+    if (this._input) {
+      this._input.focus();
+    }
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <paper-time-input
+        .label=${this.label}
+        .required=${this.required}
+        .autoValidate=${this.required}
+        error-message="Required"
+        enable-second
+        .enableMillisecond=${this.enableMillisecond}
+        format="24"
+        .hour=${this._parseDuration(this._hours)}
+        .min=${this._parseDuration(this._minutes)}
+        .sec=${this._parseDuration(this._seconds)}
+        .millisec=${this._parseDurationMillisec(this._milliseconds)}
+        @hour-changed=${this._hourChanged}
+        @min-changed=${this._minChanged}
+        @sec-changed=${this._secChanged}
+        @millisec-changed=${this._millisecChanged}
+        float-input-labels
+        no-hours-limit
+        always-float-input-labels
+        hour-label="hh"
+        min-label="mm"
+        sec-label="ss"
+        millisec-label="ms"
+      ></paper-time-input>
+    `;
+  }
+
+  private get _hours() {
+    return this.data && this.data.hours ? Number(this.data.hours) : 0;
+  }
+
+  private get _minutes() {
+    return this.data && this.data.minutes ? Number(this.data.minutes) : 0;
+  }
+
+  private get _seconds() {
+    return this.data && this.data.seconds ? Number(this.data.seconds) : 0;
+  }
+
+  private get _milliseconds() {
+    return this.data && this.data.milliseconds
+      ? Number(this.data.milliseconds)
+      : 0;
+  }
+
+  private _parseDuration(value) {
+    return value.toString().padStart(2, "0");
+  }
+
+  private _parseDurationMillisec(value) {
+    return value.toString().padStart(3, "0");
+  }
+
+  private _hourChanged(ev) {
+    this._durationChanged(ev, "hours");
+  }
+
+  private _minChanged(ev) {
+    this._durationChanged(ev, "minutes");
+  }
+
+  private _secChanged(ev) {
+    this._durationChanged(ev, "seconds");
+  }
+
+  private _millisecChanged(ev) {
+    this._durationChanged(ev, "milliseconds");
+  }
+
+  private _durationChanged(ev, unit) {
+    let value = Number(ev.detail.value);
+
+    if (value === this[`_${unit}`]) {
+      return;
+    }
+
+    let hours = this._hours;
+    let minutes = this._minutes;
+
+    if (unit === "seconds" && value > 59) {
+      minutes += Math.floor(value / 60);
+      value %= 60;
+    }
+
+    if (unit === "minutes" && value > 59) {
+      hours += Math.floor(value / 60);
+      value %= 60;
+    }
+
+    fireEvent(this, "value-changed", {
+      value: {
+        hours,
+        minutes,
+        seconds: this._seconds,
+        milliseconds: this._milliseconds,
+        ...{ [unit]: value },
+      },
+    });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-duration-input": HaDurationInput;
+  }
+}
diff --git a/src/components/ha-form/ha-form-positive_time_period_dict.ts b/src/components/ha-form/ha-form-positive_time_period_dict.ts
index 04ec575981..7806e5c685 100644
--- a/src/components/ha-form/ha-form-positive_time_period_dict.ts
+++ b/src/components/ha-form/ha-form-positive_time_period_dict.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
-import "../ha-time-input";
+import "../ha-duration-input";
 import { HaFormElement, HaFormTimeData, HaFormTimeSchema } from "./ha-form";
 
 @customElement("ha-form-positive_time_period_dict")
@@ -23,11 +23,11 @@ export class HaFormTimePeriod extends LitElement implements HaFormElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-time-input
+      <ha-duration-input
         .label=${this.label}
         .required=${this.schema.required}
         .data=${this.data}
-      ></ha-time-input>
+      ></ha-duration-input>
     `;
   }
 }
diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts
index 1a4c02e319..49b19a8328 100644
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -2,7 +2,7 @@ import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../common/dom/fire_event";
-import { HaTimeData } from "../ha-time-input";
+import { HaDurationData } from "../ha-duration-input";
 import "./ha-form-boolean";
 import "./ha-form-constant";
 import "./ha-form-float";
@@ -88,7 +88,7 @@ export type HaFormFloatData = number;
 export type HaFormBooleanData = boolean;
 export type HaFormSelectData = string;
 export type HaFormMultiSelectData = string[];
-export type HaFormTimeData = HaTimeData;
+export type HaFormTimeData = HaDurationData;
 
 export interface HaFormElement extends LitElement {
   schema: HaFormSchema | HaFormSchema[];
diff --git a/src/components/ha-gauge.ts b/src/components/ha-gauge.ts
index 25dbae2b5f..2e96a0c4bc 100644
--- a/src/components/ha-gauge.ts
+++ b/src/components/ha-gauge.ts
@@ -1,4 +1,4 @@
-import { css, LitElement, PropertyValues, svg } from "lit";
+import { css, LitElement, PropertyValues, svg, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { styleMap } from "lit/directives/style-map";
@@ -75,9 +75,22 @@ export class Gauge extends LitElement {
           this.levels
             ? this.levels
                 .sort((a, b) => a.level - b.level)
-                .map((level) => {
+                .map((level, idx) => {
+                  let firstPath: TemplateResult | undefined;
+                  if (idx === 0 && level.level !== this.min) {
+                    const angle = getAngle(this.min, this.min, this.max);
+                    firstPath = svg`<path
+                        stroke="var(--info-color)"
+                        class="level"
+                        d="M
+                          ${50 - 40 * Math.cos((angle * Math.PI) / 180)}
+                          ${50 - 40 * Math.sin((angle * Math.PI) / 180)}
+                         A 40 40 0 0 1 90 50
+                        "
+                      ></path>`;
+                  }
                   const angle = getAngle(level.level, this.min, this.max);
-                  return svg`<path
+                  return svg`${firstPath}<path
                       stroke="${level.stroke}"
                       class="level"
                       d="M
diff --git a/src/components/ha-hls-player.ts b/src/components/ha-hls-player.ts
index 1985605323..d621e79d80 100644
--- a/src/components/ha-hls-player.ts
+++ b/src/components/ha-hls-player.ts
@@ -98,6 +98,11 @@ class HaHLSPlayer extends LitElement {
 
     const Hls: typeof HlsType = (await import("hls.js/dist/hls.light.min"))
       .default;
+
+    if (!this.isConnected) {
+      return;
+    }
+
     let hlsSupported = Hls.isSupported();
 
     if (!hlsSupported) {
@@ -115,6 +120,10 @@ class HaHLSPlayer extends LitElement {
     const useExoPlayer = await useExoPlayerPromise;
     const masterPlaylist = await (await masterPlaylistPromise).text();
 
+    if (!this.isConnected) {
+      return;
+    }
+
     // Parse playlist assuming it is a master playlist. Match group 1 is whether hevc, match group 2 is regular playlist url
     // See https://tools.ietf.org/html/rfc8216 for HLS spec details
     const playlistRegexp =
diff --git a/src/components/ha-selector/ha-selector-time.ts b/src/components/ha-selector/ha-selector-time.ts
index 84ab97c8da..f1a116d371 100644
--- a/src/components/ha-selector/ha-selector-time.ts
+++ b/src/components/ha-selector/ha-selector-time.ts
@@ -1,12 +1,8 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { useAmPm } from "../../common/datetime/use_am_pm";
-import { fireEvent } from "../../common/dom/fire_event";
 import { TimeSelector } from "../../data/selector";
-import { FrontendLocaleData } from "../../data/translation";
 import { HomeAssistant } from "../../types";
-import "../paper-time-input";
+import "../ha-time-input";
 
 @customElement("ha-selector-time")
 export class HaTimeSelector extends LitElement {
@@ -20,51 +16,17 @@ export class HaTimeSelector extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  private _useAmPmMem = memoizeOne((locale: FrontendLocaleData): boolean =>
-    useAmPm(locale)
-  );
-
   protected render() {
-    const useAMPM = this._useAmPmMem(this.hass.locale);
-
-    const parts = this.value?.split(":") || [];
-    const hours = parts[0];
-
     return html`
-      <paper-time-input
-        .label=${this.label}
-        .hour=${hours &&
-        (useAMPM && Number(hours) > 12 ? Number(hours) - 12 : hours)}
-        .min=${parts[1]}
-        .sec=${parts[2]}
-        .format=${useAMPM ? 12 : 24}
-        .amPm=${useAMPM && (Number(hours) > 12 ? "PM" : "AM")}
+      <ha-time-input
+        .value=${this.value}
+        .locale=${this.hass.locale}
         .disabled=${this.disabled}
-        @change=${this._timeChanged}
-        @am-pm-changed=${this._timeChanged}
         hide-label
         enable-second
-      ></paper-time-input>
+      ></ha-time-input>
     `;
   }
-
-  private _timeChanged(ev) {
-    let value = ev.target.value;
-    const useAMPM = this._useAmPmMem(this.hass.locale);
-    let hours = Number(ev.target.hour || 0);
-    if (value && useAMPM) {
-      if (ev.target.amPm === "PM") {
-        hours += 12;
-      }
-      value = `${hours}:${ev.target.min || "00"}:${ev.target.sec || "00"}`;
-    }
-    if (value === this.value) {
-      return;
-    }
-    fireEvent(this, "value-changed", {
-      value,
-    });
-  }
 }
 
 declare global {
diff --git a/src/components/ha-slider.js b/src/components/ha-slider.js
index 0740f9acc5..57caa35a8d 100644
--- a/src/components/ha-slider.js
+++ b/src/components/ha-slider.js
@@ -19,14 +19,14 @@ class HaSlider extends PaperSliderClass {
             }
 
             .pin > .slider-knob > .slider-knob-inner {
-              font-size:  var(--ha-slider-pin-font-size, 10px);
+              font-size:  var(--ha-slider-pin-font-size, 15px);
               line-height: normal;
               cursor: pointer;
             }
 
             .disabled.ring > .slider-knob > .slider-knob-inner {
-              background-color: var(--paper-slider-disabled-knob-color, var(--paper-grey-400));
-              border: 2px solid var(--paper-slider-disabled-knob-color, var(--paper-grey-400));
+              background-color: var(--paper-slider-disabled-knob-color, var(--disabled-text-color));
+              border: 2px solid var(--paper-slider-disabled-knob-color, var(--disabled-text-color));
             }
 
             .pin > .slider-knob > .slider-knob-inner::before {
diff --git a/src/components/ha-time-input.ts b/src/components/ha-time-input.ts
index 382ea4d569..c4ca542801 100644
--- a/src/components/ha-time-input.ts
+++ b/src/components/ha-time-input.ts
@@ -1,134 +1,78 @@
-import { html, LitElement, TemplateResult } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
+import { useAmPm } from "../common/datetime/use_am_pm";
 import { fireEvent } from "../common/dom/fire_event";
 import "./paper-time-input";
-
-export interface HaTimeData {
-  hours?: number;
-  minutes?: number;
-  seconds?: number;
-  milliseconds?: number;
-}
+import { FrontendLocaleData } from "../data/translation";
 
 @customElement("ha-time-input")
-class HaTimeInput extends LitElement {
-  @property() public data!: HaTimeData;
+export class HaTimeInput extends LitElement {
+  @property() public locale!: FrontendLocaleData;
+
+  @property() public value?: string;
 
   @property() public label?: string;
 
-  @property() public suffix?: string;
+  @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required?: boolean;
+  @property({ type: Boolean, attribute: "hide-label" }) public hideLabel =
+    false;
 
-  @property({ type: Boolean }) public enableMillisecond?: boolean;
+  @property({ type: Boolean, attribute: "enable-second" })
+  public enableSecond = false;
 
-  @query("paper-time-input", true) private _input?: HTMLElement;
+  protected render() {
+    const useAMPM = useAmPm(this.locale);
 
-  public focus() {
-    if (this._input) {
-      this._input.focus();
+    const parts = this.value?.split(":") || [];
+    let hours = parts[0];
+    const numberHours = Number(parts[0]);
+    if (numberHours && useAMPM && numberHours > 12) {
+      hours = String(numberHours - 12).padStart(2, "0");
+    }
+    if (useAMPM && numberHours === 0) {
+      hours = "12";
     }
-  }
 
-  protected render(): TemplateResult {
     return html`
       <paper-time-input
         .label=${this.label}
-        .required=${this.required}
-        .autoValidate=${this.required}
-        error-message="Required"
-        enable-second
-        .enableMillisecond=${this.enableMillisecond}
-        format="24"
-        .hour=${this._parseDuration(this._hours)}
-        .min=${this._parseDuration(this._minutes)}
-        .sec=${this._parseDuration(this._seconds)}
-        .millisec=${this._parseDurationMillisec(this._milliseconds)}
-        @hour-changed=${this._hourChanged}
-        @min-changed=${this._minChanged}
-        @sec-changed=${this._secChanged}
-        @millisec-changed=${this._millisecChanged}
-        float-input-labels
-        no-hours-limit
-        always-float-input-labels
-        hour-label="hh"
-        min-label="mm"
-        sec-label="ss"
-        millisec-label="ms"
+        .hour=${hours}
+        .min=${parts[1]}
+        .sec=${parts[2]}
+        .format=${useAMPM ? 12 : 24}
+        .amPm=${useAMPM && (numberHours >= 12 ? "PM" : "AM")}
+        .disabled=${this.disabled}
+        @change=${this._timeChanged}
+        @am-pm-changed=${this._timeChanged}
+        .hideLabel=${this.hideLabel}
+        .enableSecond=${this.enableSecond}
       ></paper-time-input>
     `;
   }
 
-  private get _hours() {
-    return this.data && this.data.hours ? Number(this.data.hours) : 0;
-  }
-
-  private get _minutes() {
-    return this.data && this.data.minutes ? Number(this.data.minutes) : 0;
-  }
-
-  private get _seconds() {
-    return this.data && this.data.seconds ? Number(this.data.seconds) : 0;
-  }
-
-  private get _milliseconds() {
-    return this.data && this.data.milliseconds
-      ? Number(this.data.milliseconds)
-      : 0;
-  }
-
-  private _parseDuration(value) {
-    return value.toString().padStart(2, "0");
-  }
-
-  private _parseDurationMillisec(value) {
-    return value.toString().padStart(3, "0");
-  }
-
-  private _hourChanged(ev) {
-    this._durationChanged(ev, "hours");
-  }
-
-  private _minChanged(ev) {
-    this._durationChanged(ev, "minutes");
-  }
-
-  private _secChanged(ev) {
-    this._durationChanged(ev, "seconds");
-  }
-
-  private _millisecChanged(ev) {
-    this._durationChanged(ev, "milliseconds");
-  }
-
-  private _durationChanged(ev, unit) {
-    let value = Number(ev.detail.value);
-
-    if (value === this[`_${unit}`]) {
+  private _timeChanged(ev) {
+    let value = ev.target.value;
+    const useAMPM = useAmPm(this.locale);
+    let hours = Number(ev.target.hour || 0);
+    if (value && useAMPM) {
+      if (ev.target.amPm === "PM" && hours < 12) {
+        hours += 12;
+      }
+      if (ev.target.amPm === "AM" && hours === 12) {
+        hours = 0;
+      }
+      value = `${hours.toString().padStart(2, "0")}:${ev.target.min || "00"}:${
+        ev.target.sec || "00"
+      }`;
+    }
+    if (value === this.value) {
       return;
     }
-
-    let hours = this._hours;
-    let minutes = this._minutes;
-
-    if (unit === "seconds" && value > 59) {
-      minutes += Math.floor(value / 60);
-      value %= 60;
-    }
-
-    if (unit === "minutes" && value > 59) {
-      hours += Math.floor(value / 60);
-      value %= 60;
-    }
-
+    this.value = value;
+    fireEvent(this, "change");
     fireEvent(this, "value-changed", {
-      value: {
-        hours,
-        minutes,
-        seconds: this._seconds,
-        milliseconds: this._milliseconds,
-        ...{ [unit]: value },
-      },
+      value,
     });
   }
 }
diff --git a/src/components/trace/ha-trace-path-details.ts b/src/components/trace/ha-trace-path-details.ts
index 5ba95e8cfe..57b00ef5ac 100644
--- a/src/components/trace/ha-trace-path-details.ts
+++ b/src/components/trace/ha-trace-path-details.ts
@@ -5,7 +5,6 @@ import { classMap } from "lit/directives/class-map";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
 import "../ha-code-editor";
 import "../ha-icon-button";
-import type { NodeInfo } from "./hat-graph";
 import "./hat-logbook-note";
 import { LogbookEntry } from "../../data/logbook";
 import {
@@ -17,6 +16,7 @@ import {
 import "../../panels/logbook/ha-logbook";
 import { traceTabStyles } from "./trace-tab-styles";
 import { HomeAssistant } from "../../types";
+import type { NodeInfo } from "./hat-script-graph";
 
 @customElement("ha-trace-path-details")
 export class HaTracePathDetails extends LitElement {
@@ -30,7 +30,7 @@ export class HaTracePathDetails extends LitElement {
 
   @property({ attribute: false }) public selected!: NodeInfo;
 
-  @property() renderedNodes: Record<string, any> = {};
+  @property() public renderedNodes: Record<string, any> = {};
 
   @property() public trackedNodes!: Record<string, any>;
 
diff --git a/src/components/trace/ha-trace-timeline.ts b/src/components/trace/ha-trace-timeline.ts
index 2680254f93..1223732a14 100644
--- a/src/components/trace/ha-trace-timeline.ts
+++ b/src/components/trace/ha-trace-timeline.ts
@@ -1,11 +1,11 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { NodeInfo } from "./hat-graph";
 import "./hat-logbook-note";
 import "./hat-trace-timeline";
 import type { LogbookEntry } from "../../data/logbook";
 import type { TraceExtended } from "../../data/trace";
 import type { HomeAssistant } from "../../types";
+import type { NodeInfo } from "./hat-script-graph";
 
 @customElement("ha-trace-timeline")
 export class HaTraceTimeline extends LitElement {
@@ -15,7 +15,7 @@ export class HaTraceTimeline extends LitElement {
 
   @property({ attribute: false }) public logbookEntries!: LogbookEntry[];
 
-  @property() public selected!: NodeInfo;
+  @property({ attribute: false }) public selected!: NodeInfo;
 
   protected render(): TemplateResult {
     return html`
diff --git a/src/components/trace/hat-graph-branch.ts b/src/components/trace/hat-graph-branch.ts
new file mode 100644
index 0000000000..4670f2f5a7
--- /dev/null
+++ b/src/components/trace/hat-graph-branch.ts
@@ -0,0 +1,186 @@
+import { css, html, LitElement, svg } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import { BRANCH_HEIGHT, SPACING } from "./hat-graph-const";
+
+interface BranchConfig {
+  x: number;
+  height: number;
+  start: boolean;
+  end: boolean;
+  track: boolean;
+}
+
+/**
+ * @attribute active
+ * @attribute track
+ */
+@customElement("hat-graph-branch")
+export class HatGraphBranch extends LitElement {
+  @property({ reflect: true, type: Boolean }) disabled?: boolean;
+
+  @property({ type: Boolean }) selected?: boolean;
+
+  @property({ type: Boolean }) start = false;
+
+  @property({ type: Boolean }) short = false;
+
+  @state() _branches: BranchConfig[] = [];
+
+  private _totalWidth = 0;
+
+  private _maxHeight = 0;
+
+  private _updateBranches(ev: Event) {
+    let total_width = 0;
+    const heights: number[] = [];
+    const branches: BranchConfig[] = [];
+    (ev.target as HTMLSlotElement).assignedElements().forEach((c) => {
+      const width = c.clientWidth;
+      const height = c.clientHeight;
+      branches.push({
+        x: width / 2 + total_width,
+        height,
+        start: c.hasAttribute("graphStart"),
+        end: c.hasAttribute("graphEnd"),
+        track: c.hasAttribute("track"),
+      });
+      total_width += width;
+      heights.push(height);
+    });
+    this._totalWidth = total_width;
+    this._maxHeight = Math.max(...heights);
+    this._branches = branches.sort((a, b) => {
+      if (a.track && !b.track) {
+        return 1;
+      }
+      if (a.track && b.track) {
+        return 0;
+      }
+      return -1;
+    });
+  }
+
+  render() {
+    return html`
+      <slot name="head"></slot>
+      ${!this.start
+        ? svg`
+            <svg
+              id="top"
+              width="${this._totalWidth}"
+            >
+              ${this._branches.map((branch) =>
+                branch.start
+                  ? ""
+                  : svg`
+                  <path
+                    class=${classMap({
+                      track: branch.track,
+                    })}
+                    d="
+                      M ${this._totalWidth / 2} 0
+                      L ${branch.x} ${BRANCH_HEIGHT}
+                      "/>
+                `
+              )}
+            </svg>
+          `
+        : ""}
+      <div id="branches">
+        <svg id="lines" width="${this._totalWidth}" height="${this._maxHeight}">
+          ${this._branches.map((branch) => {
+            if (branch.end) return "";
+            return svg`
+                    <path
+                      class=${classMap({
+                        track: branch.track,
+                      })}
+                      d="
+                        M ${branch.x} ${branch.height}
+                        v ${this._maxHeight - branch.height}
+                        "/>
+                  `;
+          })}
+        </svg>
+        <slot @slotchange=${this._updateBranches}></slot>
+      </div>
+
+      ${!this.short
+        ? svg`
+            <svg
+              id="bottom"
+              width="${this._totalWidth}"
+            >
+              ${this._branches.map((branch) => {
+                if (branch.end) return "";
+                return svg`
+                  <path
+                    class=${classMap({
+                      track: branch.track,
+                    })}
+                    d="
+                      M ${branch.x} 0
+                      V ${SPACING}
+                      L ${this._totalWidth / 2} ${BRANCH_HEIGHT + SPACING}
+                      "/>
+                `;
+              })}
+            </svg>
+          `
+        : ""}
+    `;
+  }
+
+  static get styles() {
+    return css`
+      :host {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+      }
+      :host(:focus) {
+        outline: none;
+      }
+      #branches {
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        align-items: start;
+      }
+      ::slotted(*) {
+        z-index: 1;
+      }
+      ::slotted([slot="head"]) {
+        margin-bottom: calc(var(--hat-graph-branch-height) / -2);
+      }
+      #lines {
+        position: absolute;
+      }
+      #top {
+        height: var(--hat-graph-branch-height);
+      }
+      #bottom {
+        height: calc(var(--hat-graph-branch-height) + var(--hat-graph-spacing));
+      }
+      path {
+        stroke: var(--stroke-clr);
+        stroke-width: 2;
+        fill: none;
+      }
+      path.track {
+        stroke: var(--track-clr);
+      }
+      :host([disabled]) path {
+        stroke: var(--disabled-clr);
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hat-graph-branch": HatGraphBranch;
+  }
+}
diff --git a/src/components/trace/hat-graph-const.ts b/src/components/trace/hat-graph-const.ts
new file mode 100644
index 0000000000..06a59da94f
--- /dev/null
+++ b/src/components/trace/hat-graph-const.ts
@@ -0,0 +1,3 @@
+export const SPACING = 10;
+export const NODE_SIZE = 30;
+export const BRANCH_HEIGHT = 20;
diff --git a/src/components/trace/hat-graph-node.ts b/src/components/trace/hat-graph-node.ts
index bb418dc23e..5b623eb61e 100644
--- a/src/components/trace/hat-graph-node.ts
+++ b/src/components/trace/hat-graph-node.ts
@@ -1,7 +1,18 @@
-import { css, LitElement, svg } from "lit";
+import {
+  css,
+  LitElement,
+  PropertyValues,
+  html,
+  TemplateResult,
+  svg,
+} from "lit";
 import { customElement, property } from "lit/decorators";
-import { NODE_SIZE, SPACING } from "./hat-graph";
+import { NODE_SIZE, SPACING } from "./hat-graph-const";
 
+/**
+ * @attribute active
+ * @attribute track
+ */
 @customElement("hat-graph-node")
 export class HatGraphNode extends LitElement {
   @property() iconPath?: string;
@@ -10,31 +21,30 @@ export class HatGraphNode extends LitElement {
 
   @property({ reflect: true, type: Boolean }) graphStart?: boolean;
 
-  @property({ reflect: true, type: Boolean }) nofocus?: boolean;
+  @property({ type: Boolean, attribute: "nofocus" }) noFocus = false;
 
   @property({ reflect: true, type: Number }) badge?: number;
 
-  connectedCallback() {
-    super.connectedCallback();
-    if (!this.hasAttribute("tabindex") && !this.nofocus)
-      this.setAttribute("tabindex", "0");
+  protected updated(changedProps: PropertyValues) {
+    if (changedProps.has("noFocus")) {
+      if (!this.hasAttribute("tabindex") && !this.noFocus) {
+        this.setAttribute("tabindex", "0");
+      } else if (changedProps.get("noFocus") !== undefined && this.noFocus) {
+        this.removeAttribute("tabindex");
+      }
+    }
   }
 
-  render() {
+  protected render(): TemplateResult {
     const height = NODE_SIZE + (this.graphStart ? 2 : SPACING + 1);
     const width = SPACING + NODE_SIZE;
-    return svg`
-    <svg
-    width="${width}px"
-    height="${height}px"
-    viewBox="-${Math.ceil(width / 2)} -${
-      this.graphStart
-        ? Math.ceil(height / 2)
-        : Math.ceil((NODE_SIZE + SPACING * 2) / 2)
-    } ${width} ${height}"
-    >
-      ${
-        this.graphStart
+    return html`
+      <svg
+        viewBox="-${Math.ceil(width / 2)} -${this.graphStart
+          ? Math.ceil(height / 2)
+          : Math.ceil((NODE_SIZE + SPACING * 2) / 2)} ${width} ${height}"
+      >
+        ${this.graphStart
           ? ``
           : svg`
           <path
@@ -45,41 +55,31 @@ export class HatGraphNode extends LitElement {
             "
             line-caps="round"
           />
-          `
-      }
-    <g class="node">
-      <circle
-        cx="0"
-        cy="0"
-        r="${NODE_SIZE / 2}"
-      />
-      }
-      ${
-        this.badge
-          ? svg`
+          `}
+        <g class="node">
+          <circle cx="0" cy="0" r=${NODE_SIZE / 2} />
+          }
+          ${this.badge
+            ? svg`
         <g class="number">
           <circle
             cx="8"
-            cy="${-NODE_SIZE / 2}"
+            cy=${-NODE_SIZE / 2}
             r="8"
           ></circle>
           <text
             x="8"
-            y="${-NODE_SIZE / 2}"
+            y=${-NODE_SIZE / 2}
             text-anchor="middle"
             alignment-baseline="middle"
           >${this.badge > 9 ? "9+" : this.badge}</text>
         </g>
       `
-          : ""
-      }
-      <g
-        style="pointer-events: none"
-        transform="translate(${-12} ${-12})"
-      >
-        ${this.iconPath ? svg`<path class="icon" d="${this.iconPath}"/>` : ""}
-      </g>
-    </g>
+            : ""}
+          <g style="pointer-events: none" transform="translate(${-12} ${-12})">
+            ${this.iconPath ? svg`<path class="icon" d=${this.iconPath}/>` : ""}
+          </g>
+        </g>
       </svg>
     `;
   }
@@ -89,12 +89,19 @@ export class HatGraphNode extends LitElement {
       :host {
         display: flex;
         flex-direction: column;
+        width: calc(var(--hat-graph-node-size) + var(--hat-graph-spacing));
+        height: calc(
+          var(--hat-graph-node-size) + var(--hat-graph-spacing) + 1px
+        );
       }
-      :host(.track) {
+      :host([graphStart]) {
+        height: calc(var(--hat-graph-node-size) + 2px);
+      }
+      :host([track]) {
         --stroke-clr: var(--track-clr);
         --icon-clr: var(--default-icon-clr);
       }
-      :host(.active) circle {
+      :host([active]) circle {
         --stroke-clr: var(--active-clr);
         --icon-clr: var(--default-icon-clr);
       }
@@ -108,13 +115,9 @@ export class HatGraphNode extends LitElement {
       :host([disabled]) circle {
         stroke: var(--disabled-clr);
       }
-      :host-context([disabled]) {
-        --stroke-clr: var(--disabled-clr);
-      }
-      :host([nofocus]):host-context(.active),
-      :host([nofocus]):host-context(:focus) {
-        --circle-clr: var(--active-clr);
-        --icon-clr: var(--default-icon-clr);
+      svg {
+        width: 100%;
+        height: 100%;
       }
       circle,
       path.connector {
@@ -137,24 +140,6 @@ export class HatGraphNode extends LitElement {
       path.icon {
         fill: var(--icon-clr);
       }
-
-      :host(.triggered) svg {
-        overflow: visible;
-      }
-      :host(.triggered) circle {
-        animation: glow 10s;
-      }
-      @keyframes glow {
-        0% {
-          filter: drop-shadow(0px 0px 5px rgba(var(--rgb-trigger-color), 0));
-        }
-        10% {
-          filter: drop-shadow(0px 0px 10px rgba(var(--rgb-trigger-color), 1));
-        }
-        100% {
-          filter: drop-shadow(0px 0px 5px rgba(var(--rgb-trigger-color), 0));
-        }
-      }
     `;
   }
 }
diff --git a/src/components/trace/hat-graph-spacer.ts b/src/components/trace/hat-graph-spacer.ts
index e30c05bd5a..37c79a18bb 100644
--- a/src/components/trace/hat-graph-spacer.ts
+++ b/src/components/trace/hat-graph-spacer.ts
@@ -1,27 +1,26 @@
-import { css, LitElement, svg } from "lit";
+import { css, LitElement, html } from "lit";
 import { customElement, property } from "lit/decorators";
-import { NODE_SIZE, SPACING } from "./hat-graph";
+import { SPACING, NODE_SIZE } from "./hat-graph-const";
 
+/**
+ * @attribute active
+ * @attribute track
+ */
 @customElement("hat-graph-spacer")
 export class HatGraphSpacer extends LitElement {
   @property({ reflect: true, type: Boolean }) disabled?: boolean;
 
   render() {
-    return svg`
-    <svg
-    width="${SPACING}px"
-    height="${SPACING + NODE_SIZE + 1}px"
-    viewBox="-${SPACING / 2} 0 10 ${SPACING + NODE_SIZE + 1}"
-    >
-          <path
-            class="connector"
-            d="
+    return html`
+      <svg viewBox="-${SPACING / 2} 0 10 ${SPACING + NODE_SIZE + 1}">
+        <path
+          d="
               M 0 ${SPACING + NODE_SIZE + 1}
-              L 0 0
+              V 0
             "
-            line-caps="round"
-          />
-      }
+          line-caps="round"
+        />
+        }
       </svg>
     `;
   }
@@ -31,15 +30,21 @@ export class HatGraphSpacer extends LitElement {
       :host {
         display: flex;
         flex-direction: column;
+        align-items: center;
       }
-      :host(.track) {
+      svg {
+        width: var(--hat-graph-spacing);
+        height: calc(
+          var(--hat-graph-spacing) + var(--hat-graph-node-size) + 1px
+        );
+      }
+      :host([track]) {
         --stroke-clr: var(--track-clr);
-        --icon-clr: var(--default-icon-clr);
       }
       :host-context([disabled]) {
         --stroke-clr: var(--disabled-clr);
       }
-      path.connector {
+      path {
         stroke: var(--stroke-clr);
         stroke-width: 2;
         fill: none;
diff --git a/src/components/trace/hat-graph.ts b/src/components/trace/hat-graph.ts
deleted file mode 100644
index 540ecdc44e..0000000000
--- a/src/components/trace/hat-graph.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-import { css, html, LitElement, svg } from "lit";
-import { customElement, property } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-
-export const BRANCH_HEIGHT = 20;
-export const SPACING = 10;
-export const NODE_SIZE = 30;
-
-const track_converter = {
-  fromAttribute: (value) => value.split(",").map((v) => parseInt(v)),
-  toAttribute: (value) =>
-    value instanceof Array ? value.join(",") : `${value}`,
-};
-
-export interface NodeInfo {
-  path: string;
-  config: any;
-}
-
-interface BranchConfig {
-  x: number;
-  height: number;
-  start: boolean;
-  end: boolean;
-}
-
-@customElement("hat-graph")
-export class HatGraph extends LitElement {
-  @property({ type: Number }) _num_items = 0;
-
-  @property({ reflect: true, type: Boolean }) branching?: boolean;
-
-  @property({ converter: track_converter })
-  track_start?: number[];
-
-  @property({ converter: track_converter }) track_end?: number[];
-
-  @property({ reflect: true, type: Boolean }) disabled?: boolean;
-
-  @property({ type: Boolean }) selected?: boolean;
-
-  @property({ type: Boolean }) short = false;
-
-  async updateChildren() {
-    this._num_items = this.children.length;
-  }
-
-  render() {
-    const branches: BranchConfig[] = [];
-    let total_width = 0;
-    let max_height = 0;
-    let min_height = Number.POSITIVE_INFINITY;
-    if (this.branching) {
-      for (const c of Array.from(this.children)) {
-        if (c.slot === "head") continue;
-        const rect = c.getBoundingClientRect();
-        branches.push({
-          x: rect.width / 2 + total_width,
-          height: rect.height,
-          start: c.getAttribute("graphStart") != null,
-          end: c.getAttribute("graphEnd") != null,
-        });
-        total_width += rect.width;
-        max_height = Math.max(max_height, rect.height);
-        min_height = Math.min(min_height, rect.height);
-      }
-    }
-
-    return html`
-      <slot name="head" @slotchange=${this.updateChildren}> </slot>
-      ${this.branching && branches.some((branch) => !branch.start)
-        ? svg`
-            <svg
-              id="top"
-              width="${total_width}"
-              height="${BRANCH_HEIGHT}"
-            >
-              ${branches.map((branch, i) => {
-                if (branch.start) return "";
-                return svg`
-                  <path
-                    class="${classMap({
-                      line: true,
-                      track: this.track_start?.includes(i) ?? false,
-                    })}"
-                    id="${this.track_start?.includes(i) ? "track-start" : ""}"
-                    index=${i}
-                    d="
-                      M ${total_width / 2} 0
-                      L ${branch.x} ${BRANCH_HEIGHT}
-                      "/>
-                `;
-              })}
-              <use xlink:href="#track-start" />
-            </svg>
-          `
-        : ""}
-      <div id="branches">
-        ${this.branching
-          ? svg`
-              <svg
-                id="lines"
-                width="${total_width}"
-                height="${max_height}"
-              >
-                ${branches.map((branch, i) => {
-                  if (branch.end) return "";
-                  return svg`
-                    <path
-                      class="${classMap({
-                        line: true,
-                        track: this.track_end?.includes(i) ?? false,
-                      })}"
-                      index=${i}
-                      d="
-                        M ${branch.x} ${branch.height}
-                        l 0 ${max_height - branch.height}
-                        "/>
-                  `;
-                })}
-              </svg>
-            `
-          : ""}
-        <slot @slotchange=${this.updateChildren}></slot>
-      </div>
-
-      ${this.branching && !this.short
-        ? svg`
-            <svg
-              id="bottom"
-              width="${total_width}"
-              height="${BRANCH_HEIGHT + SPACING}"
-            >
-              ${branches.map((branch, i) => {
-                if (branch.end) return "";
-                return svg`
-                  <path
-                    class="${classMap({
-                      line: true,
-                      track: this.track_end?.includes(i) ?? false,
-                    })}"
-                    id="${this.track_end?.includes(i) ? "track-end" : ""}"
-                    index=${i}
-                    d="
-                      M ${branch.x} 0
-                      L ${branch.x} ${SPACING}
-                      L ${total_width / 2} ${BRANCH_HEIGHT + SPACING}
-                      "/>
-                `;
-              })}
-              <use xlink:href="#track-end" />
-            </svg>
-          `
-        : ""}
-    `;
-  }
-
-  static get styles() {
-    return css`
-      :host {
-        position: relative;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        --stroke-clr: var(--stroke-color, var(--secondary-text-color));
-        --active-clr: var(--active-color, var(--primary-color));
-        --track-clr: var(--track-color, var(--accent-color));
-        --hover-clr: var(--hover-color, var(--primary-color));
-        --disabled-clr: var(--disabled-color, var(--disabled-text-color));
-        --default-trigger-color: 3, 169, 244;
-        --rgb-trigger-color: var(--trigger-color, var(--default-trigger-color));
-        --background-clr: var(--background-color, white);
-        --default-icon-clr: var(--icon-color, black);
-        --icon-clr: var(--stroke-clr);
-      }
-      :host(:focus) {
-        outline: none;
-      }
-      #branches {
-        position: relative;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-      }
-      :host([branching]) #branches {
-        flex-direction: row;
-        align-items: start;
-      }
-      :host([branching]) ::slotted(*) {
-        z-index: 1;
-      }
-      :host([branching]) ::slotted([slot="head"]) {
-        margin-bottom: ${-BRANCH_HEIGHT / 2}px;
-      }
-
-      #lines {
-        position: absolute;
-      }
-
-      path.line {
-        stroke: var(--stroke-clr);
-        stroke-width: 2;
-        fill: none;
-      }
-      path.line.track {
-        stroke: var(--track-clr);
-      }
-      :host([disabled]) path.line {
-        stroke: var(--disabled-clr);
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "hat-graph": HatGraph;
-  }
-}
diff --git a/src/components/trace/hat-script-graph.ts b/src/components/trace/hat-script-graph.ts
index 70af9c6b2b..33751f2f8e 100644
--- a/src/components/trace/hat-script-graph.ts
+++ b/src/components/trace/hat-script-graph.ts
@@ -19,7 +19,6 @@ import {
 } from "@mdi/js";
 import { css, html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../../common/dom/fire_event";
 import { ensureArray } from "../../common/ensure-array";
 import { Condition, Trigger } from "../../data/automation";
@@ -41,9 +40,15 @@ import {
   TraceExtended,
 } from "../../data/trace";
 import "../ha-svg-icon";
-import { NodeInfo, NODE_SIZE, SPACING } from "./hat-graph";
 import "./hat-graph-node";
 import "./hat-graph-spacer";
+import "./hat-graph-branch";
+import { NODE_SIZE, SPACING, BRANCH_HEIGHT } from "./hat-graph-const";
+
+export interface NodeInfo {
+  path: string;
+  config: any;
+}
 
 declare global {
   interface HASSDomEvents {
@@ -52,14 +57,14 @@ declare global {
 }
 
 @customElement("hat-script-graph")
-class HatScriptGraph extends LitElement {
+export class HatScriptGraph extends LitElement {
   @property({ attribute: false }) public trace!: TraceExtended;
 
-  @property({ attribute: false }) public selected;
+  @property({ attribute: false }) public selected?: string;
 
-  @property() renderedNodes: Record<string, any> = {};
+  public renderedNodes: Record<string, NodeInfo> = {};
 
-  @property() trackedNodes: Record<string, any> = {};
+  public trackedNodes: Record<string, NodeInfo> = {};
 
   private selectNode(config, path) {
     return () => {
@@ -69,72 +74,54 @@ class HatScriptGraph extends LitElement {
 
   private render_trigger(config: Trigger, i: number) {
     const path = `trigger/${i}`;
-    const tracked = this.trace && path in this.trace.trace;
+    const track = this.trace && path in this.trace.trace;
     this.renderedNodes[path] = { config, path };
-    if (tracked) {
+    if (track) {
       this.trackedNodes[path] = this.renderedNodes[path];
     }
     return html`
       <hat-graph-node
         graphStart
+        ?track=${track}
         @focus=${this.selectNode(config, path)}
-        class=${classMap({
-          track: tracked,
-          active: this.selected === path,
-        })}
+        ?active=${this.selected === path}
         .iconPath=${mdiAsterisk}
-        tabindex=${tracked ? "0" : "-1"}
+        tabindex=${track ? "0" : "-1"}
       ></hat-graph-node>
     `;
   }
 
   private render_condition(config: Condition, i: number) {
     const path = `condition/${i}`;
-    const trace = this.trace.trace[path] as ConditionTraceStep[] | undefined;
-    const track_path =
-      trace?.[0].result === undefined ? 0 : trace[0].result.result ? 1 : 2;
     this.renderedNodes[path] = { config, path };
-    if (trace) {
+    if (this.trace && path in this.trace.trace) {
       this.trackedNodes[path] = this.renderedNodes[path];
     }
-    return html`
-      <hat-graph
-        branching
-        @focus=${this.selectNode(config, path)}
-        class=${classMap({
-          track: track_path,
-          active: this.selected === path,
-        })}
-        .track_start=${[track_path]}
-        .track_end=${[track_path]}
-        tabindex=${trace ? "-1" : "0"}
-        short
-      >
-        <hat-graph-node
-          slot="head"
-          class=${classMap({
-            track: trace !== undefined,
-          })}
-          .iconPath=${mdiAbTesting}
-          nofocus
-          graphEnd
-        ></hat-graph-node>
-        <div
-          style=${`width: ${NODE_SIZE + SPACING}px;`}
-          graphStart
-          graphEnd
-        ></div>
-        <div></div>
-        <hat-graph-node
-          .iconPath=${mdiClose}
-          graphEnd
-          nofocus
-          class=${classMap({
-            track: track_path === 2,
-          })}
-        ></hat-graph-node>
-      </hat-graph>
-    `;
+    return this.render_condition_node(config, path);
+  }
+
+  private typeRenderers = {
+    condition: this.render_condition_node,
+    delay: this.render_delay_node,
+    event: this.render_event_node,
+    scene: this.render_scene_node,
+    service: this.render_service_node,
+    wait_template: this.render_wait_node,
+    wait_for_trigger: this.render_wait_node,
+    repeat: this.render_repeat_node,
+    choose: this.render_choose_node,
+    device_id: this.render_device_node,
+    other: this.render_other_node,
+  };
+
+  private render_action_node(node: Action, path: string, graphStart = false) {
+    const type =
+      Object.keys(this.typeRenderers).find((key) => key in node) || "other";
+    this.renderedNodes[path] = { config: node, path };
+    if (this.trace && path in this.trace.trace) {
+      this.trackedNodes[path] = this.renderedNodes[path];
+    }
+    return this.typeRenderers[type].bind(this)(node, path, graphStart);
   }
 
   private render_choose_node(
@@ -143,30 +130,26 @@ class HatScriptGraph extends LitElement {
     graphStart = false
   ) {
     const trace = this.trace.trace[path] as ChooseActionTraceStep[] | undefined;
-    const trace_path =
-      trace !== undefined
-        ? trace[0].result === undefined || trace[0].result.choice === "default"
-          ? [Array.isArray(config.choose) ? config.choose.length : 0]
-          : [trace[0].result.choice]
-        : [];
+    const trace_path = trace
+      ? trace.map((trc) =>
+          trc.result === undefined || trc.result.choice === "default"
+            ? "default"
+            : trc.result.choice
+        )
+      : [];
+    const track_default = trace_path.includes("default");
     return html`
-      <hat-graph
+      <hat-graph-branch
         tabindex=${trace === undefined ? "-1" : "0"}
-        branching
-        .track_start=${trace_path}
-        .track_end=${trace_path}
         @focus=${this.selectNode(config, path)}
-        class=${classMap({
-          track: trace !== undefined,
-          active: this.selected === path,
-        })}
+        ?track=${trace !== undefined}
+        ?active=${this.selected === path}
       >
         <hat-graph-node
           .graphStart=${graphStart}
           .iconPath=${mdiCallSplit}
-          class=${classMap({
-            track: trace !== undefined,
-          })}
+          ?track=${trace !== undefined}
+          ?active=${this.selected === path}
           slot="head"
           nofocus
         ></hat-graph-node>
@@ -174,46 +157,39 @@ class HatScriptGraph extends LitElement {
         ${config.choose
           ? ensureArray(config.choose)?.map((branch, i) => {
               const branch_path = `${path}/choose/${i}`;
-              const track_this =
-                trace !== undefined && trace[0].result?.choice === i;
+              const track_this = trace_path.includes(i);
               this.renderedNodes[branch_path] = { config, path: branch_path };
               if (track_this) {
                 this.trackedNodes[branch_path] =
                   this.renderedNodes[branch_path];
               }
               return html`
-                <hat-graph>
+                <div class="graph-container" ?track=${track_this}>
                   <hat-graph-node
                     .iconPath=${!trace || track_this
                       ? mdiCheckBoxOutline
                       : mdiCheckboxBlankOutline}
                     @focus=${this.selectNode(config, branch_path)}
-                    class=${classMap({
-                      active: this.selected === branch_path,
-                      track: track_this,
-                    })}
+                    ?track=${track_this}
+                    ?active=${this.selected === branch_path}
                   ></hat-graph-node>
                   ${ensureArray(branch.sequence).map((action, j) =>
-                    this.render_node(action, `${branch_path}/sequence/${j}`)
+                    this.render_action_node(
+                      action,
+                      `${branch_path}/sequence/${j}`
+                    )
                   )}
-                </hat-graph>
+                </div>
               `;
             })
           : ""}
-        <hat-graph>
-          <hat-graph-spacer
-            class=${classMap({
-              track:
-                trace !== undefined &&
-                (trace[0].result === undefined ||
-                  trace[0].result.choice === "default"),
-            })}
-          ></hat-graph-spacer>
+        <div ?track=${track_default}>
+          <hat-graph-spacer ?track=${track_default}></hat-graph-spacer>
           ${ensureArray(config.default)?.map((action, i) =>
-            this.render_node(action, `${path}/default/${i}`)
+            this.render_action_node(action, `${path}/default/${i}`)
           )}
-        </hat-graph>
-      </hat-graph>
+        </div>
+      </hat-graph-branch>
     `;
   }
 
@@ -222,41 +198,54 @@ class HatScriptGraph extends LitElement {
     path: string,
     graphStart = false
   ) {
-    const trace = (this.trace.trace[path] as ConditionTraceStep[]) || undefined;
-    const track_path =
-      trace?.[0].result === undefined ? 0 : trace[0].result.result ? 1 : 2;
+    const trace = this.trace.trace[path] as ConditionTraceStep[] | undefined;
+    let track = false;
+    let trackPass = false;
+    let trackFailed = false;
+    if (trace) {
+      for (const trc of trace) {
+        if (trc.result) {
+          track = true;
+          if (trc.result.result) {
+            trackPass = true;
+          } else {
+            trackFailed = true;
+          }
+        }
+        if (trackPass && trackFailed) {
+          break;
+        }
+      }
+    }
     return html`
-      <hat-graph
-        branching
+      <hat-graph-branch
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: track_path,
-          active: this.selected === path,
-        })}
-        .track_start=${[track_path]}
-        .track_end=${[track_path]}
+        ?track=${track}
+        ?active=${this.selected === path}
         tabindex=${trace === undefined ? "-1" : "0"}
         short
       >
         <hat-graph-node
           .graphStart=${graphStart}
           slot="head"
-          class=${classMap({
-            track: Boolean(trace),
-          })}
+          ?track=${track}
+          ?active=${this.selected === path}
           .iconPath=${mdiAbTesting}
           nofocus
         ></hat-graph-node>
-        <div style=${`width: ${NODE_SIZE + SPACING}px;`}></div>
-        <div></div>
+        <div
+          style=${`width: ${NODE_SIZE + SPACING}px;`}
+          graphStart
+          graphEnd
+        ></div>
+        <div ?track=${trackPass}></div>
         <hat-graph-node
           .iconPath=${mdiClose}
           nofocus
-          class=${classMap({
-            track: track_path === 2,
-          })}
+          ?track=${trackFailed}
+          ?active=${this.selected === path}
         ></hat-graph-node>
-      </hat-graph>
+      </hat-graph-branch>
     `;
   }
 
@@ -270,10 +259,8 @@ class HatScriptGraph extends LitElement {
         .graphStart=${graphStart}
         .iconPath=${mdiTimerOutline}
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -289,10 +276,8 @@ class HatScriptGraph extends LitElement {
         .graphStart=${graphStart}
         .iconPath=${mdiDevices}
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -308,10 +293,8 @@ class HatScriptGraph extends LitElement {
         .graphStart=${graphStart}
         .iconPath=${mdiExclamation}
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -323,43 +306,35 @@ class HatScriptGraph extends LitElement {
     graphStart = false
   ) {
     const trace: any = this.trace.trace[path];
-    const track_path = trace ? [0, 1] : [];
     const repeats = this.trace?.trace[`${path}/repeat/sequence/0`]?.length;
     return html`
-      <hat-graph
-        .track_start=${track_path}
-        .track_end=${track_path}
+      <hat-graph-branch
         tabindex=${trace === undefined ? "-1" : "0"}
-        branching
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
       >
         <hat-graph-node
           .graphStart=${graphStart}
           .iconPath=${mdiRefresh}
-          class=${classMap({
-            track: trace,
-          })}
+          ?track=${path in this.trace.trace}
+          ?active=${this.selected === path}
           slot="head"
           nofocus
         ></hat-graph-node>
         <hat-graph-node
           .iconPath=${mdiArrowUp}
+          ?track=${repeats > 1}
+          ?active=${this.selected === path}
           nofocus
-          class=${classMap({
-            track: track_path.includes(1),
-          })}
-          .badge=${repeats}
+          .badge=${repeats > 1 ? repeats : undefined}
         ></hat-graph-node>
-        <hat-graph>
+        <div ?track=${trace}>
           ${ensureArray(node.repeat.sequence).map((action, i) =>
-            this.render_node(action, `${path}/repeat/sequence/${i}`)
+            this.render_action_node(action, `${path}/repeat/sequence/${i}`)
           )}
-        </hat-graph>
-      </hat-graph>
+        </div>
+      </hat-graph-branch>
     `;
   }
 
@@ -373,10 +348,8 @@ class HatScriptGraph extends LitElement {
         .graphStart=${graphStart}
         .iconPath=${mdiExclamation}
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -392,10 +365,8 @@ class HatScriptGraph extends LitElement {
         .graphStart=${graphStart}
         .iconPath=${mdiChevronRight}
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -411,10 +382,8 @@ class HatScriptGraph extends LitElement {
         .graphStart=${graphStart}
         .iconPath=${mdiTrafficLight}
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
         tabindex=${this.trace && path in this.trace.trace ? "0" : "-1"}
       ></hat-graph-node>
     `;
@@ -426,95 +395,55 @@ class HatScriptGraph extends LitElement {
         .graphStart=${graphStart}
         .iconPath=${mdiCodeBrackets}
         @focus=${this.selectNode(node, path)}
-        class=${classMap({
-          track: path in this.trace.trace,
-          active: this.selected === path,
-        })}
+        ?track=${path in this.trace.trace}
+        ?active=${this.selected === path}
       ></hat-graph-node>
     `;
   }
 
-  private render_node(node: Action, path: string, graphStart = false) {
-    const NODE_TYPES = {
-      choose: this.render_choose_node,
-      condition: this.render_condition_node,
-      delay: this.render_delay_node,
-      device_id: this.render_device_node,
-      event: this.render_event_node,
-      repeat: this.render_repeat_node,
-      scene: this.render_scene_node,
-      service: this.render_service_node,
-      wait_template: this.render_wait_node,
-      wait_for_trigger: this.render_wait_node,
-      other: this.render_other_node,
-    };
-
-    const type = Object.keys(NODE_TYPES).find((key) => key in node) || "other";
-    const nodeEl = NODE_TYPES[type].bind(this)(node, path, graphStart);
-    this.renderedNodes[path] = { config: node, path };
-    if (this.trace && path in this.trace.trace) {
-      this.trackedNodes[path] = this.renderedNodes[path];
-    }
-    return nodeEl;
-  }
-
   protected render() {
     const paths = Object.keys(this.trackedNodes);
-    const manual_triggered = this.trace && "trigger" in this.trace.trace;
-    let track_path = manual_triggered ? undefined : [0];
     const trigger_nodes =
       "trigger" in this.trace.config
-        ? ensureArray(this.trace.config.trigger).map((trigger, i) => {
-            if (this.trace && `trigger/${i}` in this.trace.trace) {
-              track_path = [i];
-            }
-            return this.render_trigger(trigger, i);
-          })
+        ? ensureArray(this.trace.config.trigger).map((trigger, i) =>
+            this.render_trigger(trigger, i)
+          )
         : undefined;
     try {
       return html`
-        <hat-graph class="parent">
-          <div></div>
+        <div class="parent graph-container">
           ${trigger_nodes
-            ? html`<hat-graph
-                branching
-                id="trigger"
-                .short=${trigger_nodes.length < 2}
-                .track_start=${track_path}
-                .track_end=${track_path}
-              >
+            ? html`<hat-graph-branch start .short=${trigger_nodes.length < 2}>
                 ${trigger_nodes}
-              </hat-graph>`
+              </hat-graph-branch>`
             : ""}
           ${"condition" in this.trace.config
-            ? html`<hat-graph id="condition">
-                ${ensureArray(this.trace.config.condition)?.map(
-                  (condition, i) => this.render_condition(condition!, i)
-                )}
-              </hat-graph>`
+            ? html`${ensureArray(this.trace.config.condition)?.map(
+                (condition, i) => this.render_condition(condition, i)
+              )}`
             : ""}
           ${"action" in this.trace.config
             ? html`${ensureArray(this.trace.config.action).map((action, i) =>
-                this.render_node(action, `action/${i}`)
+                this.render_action_node(action, `action/${i}`)
               )}`
             : ""}
           ${"sequence" in this.trace.config
             ? html`${ensureArray(this.trace.config.sequence).map((action, i) =>
-                this.render_node(action, `sequence/${i}`, i === 0)
+                this.render_action_node(action, `sequence/${i}`, i === 0)
               )}`
             : ""}
-        </hat-graph>
+        </div>
         <div class="actions">
           <mwc-icon-button
             .disabled=${paths.length === 0 || paths[0] === this.selected}
-            @click=${this.previousTrackedNode}
+            @click=${this._previousTrackedNode}
           >
             <ha-svg-icon .path=${mdiChevronUp}></ha-svg-icon>
           </mwc-icon-button>
           <mwc-icon-button
             .disabled=${paths.length === 0 ||
             paths[paths.length - 1] === this.selected}
-            @click=${this.nextTrackedNode}
+            @click=${this._nextTrackedNode}
           >
             <ha-svg-icon .path=${mdiChevronDown}></ha-svg-icon>
           </mwc-icon-button>
@@ -545,44 +474,39 @@ class HatScriptGraph extends LitElement {
   protected updated(changedProps: PropertyValues<this>) {
     super.updated(changedProps);
 
-    // Select first node if new trace loaded but no selection given.
-    if (changedProps.has("trace")) {
-      const tracked = this.trackedNodes;
-      const paths = Object.keys(tracked);
+    if (!changedProps.has("trace")) {
+      return;
+    }
 
-      // If trace changed and we have no or an invalid selection, select first option.
-      if (this.selected === "" || !(this.selected in paths)) {
-        // Find first tracked node with node info
-        for (const path of paths) {
-          if (tracked[path]) {
-            fireEvent(this, "graph-node-selected", tracked[path]);
-            break;
-          }
+    // If trace changed and we have no or an invalid selection, select first option.
+    if (!this.selected || !(this.selected in this.trackedNodes)) {
+      const firstNode = this.trackedNodes[Object.keys(this.trackedNodes)[0]];
+      if (firstNode) {
+        fireEvent(this, "graph-node-selected", firstNode);
+      }
+    }
+
+    if (this.trace) {
+      const sortKeys = Object.keys(this.trace.trace);
+      const keys = Object.keys(this.renderedNodes).sort(
+        (a, b) => sortKeys.indexOf(a) - sortKeys.indexOf(b)
+      );
+      const sortedTrackedNodes = {};
+      const sortedRenderedNodes = {};
+      for (const key of keys) {
+        sortedRenderedNodes[key] = this.renderedNodes[key];
+        if (key in this.trackedNodes) {
+          sortedTrackedNodes[key] = this.trackedNodes[key];
         }
       }
-
-      if (this.trace) {
-        const sortKeys = Object.keys(this.trace.trace);
-        const keys = Object.keys(this.renderedNodes).sort(
-          (a, b) => sortKeys.indexOf(a) - sortKeys.indexOf(b)
-        );
-        const sortedTrackedNodes = {};
-        const sortedRenderedNodes = {};
-        for (const key of keys) {
-          sortedRenderedNodes[key] = this.renderedNodes[key];
-          if (key in this.trackedNodes) {
-            sortedTrackedNodes[key] = this.trackedNodes[key];
-          }
-        }
-        this.renderedNodes = sortedRenderedNodes;
-        this.trackedNodes = sortedTrackedNodes;
-      }
+      this.renderedNodes = sortedRenderedNodes;
+      this.trackedNodes = sortedTrackedNodes;
     }
   }
 
-  public previousTrackedNode() {
+  private _previousTrackedNode() {
     const nodes = Object.keys(this.trackedNodes);
-    const prevIndex = nodes.indexOf(this.selected) - 1;
+    const prevIndex = nodes.indexOf(this.selected!) - 1;
     if (prevIndex >= 0) {
       fireEvent(
         this,
@@ -592,9 +516,9 @@ class HatScriptGraph extends LitElement {
     }
   }
 
-  public nextTrackedNode() {
+  private _nextTrackedNode() {
     const nodes = Object.keys(this.trackedNodes);
-    const nextIndex = nodes.indexOf(this.selected) + 1;
+    const nextIndex = nodes.indexOf(this.selected!) + 1;
     if (nextIndex < nodes.length) {
       fireEvent(
         this,
@@ -608,6 +532,25 @@ class HatScriptGraph extends LitElement {
     return css`
       :host {
         display: flex;
+        --stroke-clr: var(--stroke-color, var(--secondary-text-color));
+        --active-clr: var(--active-color, var(--primary-color));
+        --track-clr: var(--track-color, var(--accent-color));
+        --hover-clr: var(--hover-color, var(--primary-color));
+        --disabled-clr: var(--disabled-color, var(--disabled-text-color));
+        --default-trigger-color: 3, 169, 244;
+        --rgb-trigger-color: var(--trigger-color, var(--default-trigger-color));
+        --background-clr: var(--background-color, white);
+        --default-icon-clr: var(--icon-color, black);
+        --icon-clr: var(--stroke-clr);
+
+        --hat-graph-spacing: ${SPACING}px;
+        --hat-graph-node-size: ${NODE_SIZE}px;
+        --hat-graph-branch-height: ${BRANCH_HEIGHT}px;
+      }
+      .graph-container {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
       }
       .actions {
         display: flex;
diff --git a/src/data/automation.ts b/src/data/automation.ts
index da6a12ddba..b6ea4c90c6 100644
--- a/src/data/automation.ts
+++ b/src/data/automation.ts
@@ -46,9 +46,11 @@ export interface BlueprintAutomationConfig extends ManualAutomationConfig {
 }
 
 export interface ForDict {
-  hours?: number | string;
-  minutes?: number | string;
-  seconds?: number | string;
+  days?: number;
+  hours?: number;
+  minutes?: number;
+  seconds?: number;
+  milliseconds?: number;
 }
 
 export interface ContextConstraint {
diff --git a/src/data/calendar.ts b/src/data/calendar.ts
index 4ebc4bb23b..67506ac19b 100644
--- a/src/data/calendar.ts
+++ b/src/data/calendar.ts
@@ -1,4 +1,4 @@
-import { HA_COLOR_PALETTE } from "../common/const";
+import { getColorByIndex } from "../common/color/colors";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeStateName } from "../common/entity/compute_state_name";
 import type { CalendarEvent, HomeAssistant } from "../types";
@@ -81,5 +81,5 @@ export const getCalendars = (hass: HomeAssistant): Calendar[] =>
     .map((eid, idx) => ({
       entity_id: eid,
       name: computeStateName(hass.states[eid]),
-      backgroundColor: `#${HA_COLOR_PALETTE[idx % HA_COLOR_PALETTE.length]}`,
+      backgroundColor: getColorByIndex(idx),
     }));
diff --git a/src/data/camera.ts b/src/data/camera.ts
index 8e93b45e09..945fe474f9 100644
--- a/src/data/camera.ts
+++ b/src/data/camera.ts
@@ -36,17 +36,21 @@ export interface Stream {
 export const computeMJPEGStreamUrl = (entity: CameraEntity) =>
   `/api/camera_proxy_stream/${entity.entity_id}?token=${entity.attributes.access_token}`;
 
-export const fetchThumbnailUrlWithCache = (
+export const fetchThumbnailUrlWithCache = async (
   hass: HomeAssistant,
-  entityId: string
-) =>
-  timeCachePromiseFunc(
+  entityId: string,
+  width: number,
+  height: number
+) => {
+  const base_url = await timeCachePromiseFunc(
     "_cameraTmbUrl",
     9000,
     fetchThumbnailUrl,
     hass,
     entityId
   );
+  return `${base_url}&width=${width}&height=${height}`;
+};
 
 export const fetchThumbnailUrl = async (
   hass: HomeAssistant,
diff --git a/src/data/config_flow.ts b/src/data/config_flow.ts
index caa61f48bc..95af6f6e12 100644
--- a/src/data/config_flow.ts
+++ b/src/data/config_flow.ts
@@ -6,6 +6,7 @@ import { DataEntryFlowProgress, DataEntryFlowStep } from "./data_entry_flow";
 import { domainToName } from "./integration";
 
 export const DISCOVERY_SOURCES = [
+  "usb",
   "unignore",
   "dhcp",
   "homekit",
diff --git a/src/data/energy.ts b/src/data/energy.ts
index a35dded6d1..6e1cb28796 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -6,6 +6,7 @@ import {
   startOfYesterday,
 } from "date-fns";
 import { Collection, getCollection } from "home-assistant-js-websocket";
+import { groupBy } from "../common/util/group-by";
 import { subscribeOne } from "../common/util/subscribe-one";
 import { HomeAssistant } from "../types";
 import { ConfigEntry, getConfigEntries } from "./config_entries";
@@ -47,6 +48,28 @@ export const emptySolarEnergyPreference =
     config_entry_solar_forecast: null,
   });
 
+export const emptyBatteryEnergyPreference =
+  (): BatterySourceTypeEnergyPreference => ({
+    type: "battery",
+    stat_energy_from: "",
+    stat_energy_to: "",
+  });
+export const emptyGasEnergyPreference = (): GasSourceTypeEnergyPreference => ({
+  type: "gas",
+  stat_energy_from: "",
+  stat_cost: null,
+  entity_energy_from: null,
+  entity_energy_price: null,
+  number_energy_price: null,
+});
+
+interface EnergySolarForecast {
+  wh_hours: Record<string, number>;
+}
+export type EnergySolarForecasts = {
+  [config_entry_id: string]: EnergySolarForecast;
+};
+
 export interface DeviceConsumptionEnergyPreference {
   // This is an ever increasing value
   stat_consumption: string;
@@ -94,9 +117,31 @@ export interface SolarSourceTypeEnergyPreference {
   config_entry_solar_forecast: string[] | null;
 }
 
+export interface BatterySourceTypeEnergyPreference {
+  type: "battery";
+  stat_energy_from: string;
+  stat_energy_to: string;
+}
+export interface GasSourceTypeEnergyPreference {
+  type: "gas";
+
+  // kWh meter
+  stat_energy_from: string;
+
+  // $ meter
+  stat_cost: string | null;
+
+  // Can be used to generate costs if stat_cost omitted
+  entity_energy_from: string | null;
+  entity_energy_price: string | null;
+  number_energy_price: number | null;
+}
+
 type EnergySource =
   | SolarSourceTypeEnergyPreference
-  | GridSourceTypeEnergyPreference;
+  | GridSourceTypeEnergyPreference
+  | BatterySourceTypeEnergyPreference
+  | GasSourceTypeEnergyPreference;
 
 export interface EnergyPreferences {
   energy_sources: EnergySource[];
@@ -105,6 +150,18 @@ export interface EnergyPreferences {
 
 export interface EnergyInfo {
   cost_sensors: Record<string, string>;
+  solar_forecast_domains: string[];
+}
+
+export interface EnergyValidationIssue {
+  type: string;
+  identifier: string;
+  value?: unknown;
+}
+
+export interface EnergyPreferencesValidation {
+  energy_sources: EnergyValidationIssue[][];
+  device_consumption: EnergyValidationIssue[][];
 }
 
 export const getEnergyInfo = (hass: HomeAssistant) =>
@@ -112,6 +169,11 @@ export const getEnergyInfo = (hass: HomeAssistant) =>
     type: "energy/info",
   });
 
+export const getEnergyPreferenceValidation = (hass: HomeAssistant) =>
+  hass.callWS<EnergyPreferencesValidation>({
+    type: "energy/validate",
+  });
+
 export const getEnergyPreferences = (hass: HomeAssistant) =>
   hass.callWS<EnergyPreferences>({
     type: "energy/get_prefs",
@@ -132,19 +194,12 @@ export const saveEnergyPreferences = async (
 interface EnergySourceByType {
   grid?: GridSourceTypeEnergyPreference[];
   solar?: SolarSourceTypeEnergyPreference[];
+  battery?: BatterySourceTypeEnergyPreference[];
+  gas?: GasSourceTypeEnergyPreference[];
 }
 
-export const energySourcesByType = (prefs: EnergyPreferences) => {
-  const types: EnergySourceByType = {};
-  for (const source of prefs.energy_sources) {
-    if (source.type in types) {
-      types[source.type]!.push(source as any);
-    } else {
-      types[source.type] = [source as any];
-    }
-  }
-  return types;
-};
+export const energySourcesByType = (prefs: EnergyPreferences) =>
+  groupBy(prefs.energy_sources, (item) => item.type) as EnergySourceByType;
 
 export interface EnergyData {
   start: Date;
@@ -203,6 +258,24 @@ const getEnergyData = async (
       continue;
     }
 
+    if (source.type === "gas") {
+      statIDs.push(source.stat_energy_from);
+      if (source.stat_cost) {
+        statIDs.push(source.stat_cost);
+      }
+      const costStatId = info.cost_sensors[source.stat_energy_from];
+      if (costStatId) {
+        statIDs.push(costStatId);
+      }
+      continue;
+    }
+
+    if (source.type === "battery") {
+      statIDs.push(source.stat_energy_from);
+      statIDs.push(source.stat_energy_to);
+      continue;
+    }
+
     // grid source
     for (const flowFrom of source.flow_from) {
       statIDs.push(flowFrom.stat_energy_from);
@@ -375,3 +448,8 @@ export const getEnergyDataCollection = (
   };
   return collection;
 };
+
+export const getEnergySolarForecasts = (hass: HomeAssistant) =>
+  hass.callWS<EnergySolarForecasts>({
+    type: "energy/solar_forecast",
+  });
diff --git a/src/data/forecast_solar.ts b/src/data/forecast_solar.ts
deleted file mode 100644
index 91b9620216..0000000000
--- a/src/data/forecast_solar.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { HomeAssistant } from "../types";
-
-export interface ForecastSolarForecast {
-  wh_hours: Record<string, number>;
-}
-
-export const getForecastSolarForecasts = (hass: HomeAssistant) =>
-  hass.callWS<Record<string, ForecastSolarForecast>>({
-    type: "forecast_solar/forecasts",
-  });
diff --git a/src/data/hassio/backup.ts b/src/data/hassio/backup.ts
new file mode 100644
index 0000000000..69771eb363
--- /dev/null
+++ b/src/data/hassio/backup.ts
@@ -0,0 +1,233 @@
+import { atLeastVersion } from "../../common/config/version";
+import { HomeAssistant } from "../../types";
+import { hassioApiResultExtractor, HassioResponse } from "./common";
+
+export const friendlyFolderName = {
+  ssl: "SSL",
+  homeassistant: "Configuration",
+  "addons/local": "Local add-ons",
+  media: "Media",
+  share: "Share",
+};
+
+interface BackupContent {
+  homeassistant: boolean;
+  folders: string[];
+  addons: string[];
+}
+
+export interface HassioBackup {
+  slug: string;
+  date: string;
+  name: string;
+  type: "full" | "partial";
+  protected: boolean;
+  content: BackupContent;
+}
+
+export interface HassioBackupDetail extends HassioBackup {
+  size: number;
+  homeassistant: string;
+  addons: Array<{
+    slug: "ADDON_SLUG";
+    name: "NAME";
+    version: "INSTALLED_VERSION";
+    size: "SIZE_IN_MB";
+  }>;
+  repositories: string[];
+  folders: string[];
+}
+
+export interface HassioFullBackupCreateParams {
+  name: string;
+  password?: string;
+  confirm_password?: string;
+}
+export interface HassioPartialBackupCreateParams
+  extends HassioFullBackupCreateParams {
+  folders?: string[];
+  addons?: string[];
+  homeassistant?: boolean;
+}
+
+export const fetchHassioBackups = async (
+  hass: HomeAssistant
+): Promise<HassioBackup[]> => {
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    const data: {
+      [key: string]: HassioBackup[];
+    } = await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/${
+        atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+      }`,
+      method: "get",
+    });
+    return data[
+      atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+    ];
+  }
+
+  return hassioApiResultExtractor(
+    await hass.callApi<HassioResponse<{ snapshots: HassioBackup[] }>>(
+      "GET",
+      `hassio/${
+        atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+      }`
+    )
+  ).snapshots;
+};
+
+export const fetchHassioBackupInfo = async (
+  hass: HomeAssistant,
+  backup: string
+): Promise<HassioBackupDetail> => {
+  if (hass) {
+    if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+      return hass.callWS({
+        type: "supervisor/api",
+        endpoint: `/${
+          atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+        }/${backup}/info`,
+        method: "get",
+      });
+    }
+    return hassioApiResultExtractor(
+      await hass.callApi<HassioResponse<HassioBackupDetail>>(
+        "GET",
+        `hassio/${
+          atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+        }/${backup}/info`
+      )
+    );
+  }
+  // When called from onboarding we don't have hass
+  const resp = await fetch(`/api/hassio/backups/${backup}/info`, {
+    method: "GET",
+  });
+  const data = (await resp.json()).data;
+  return data;
+};
+
+export const reloadHassioBackups = async (hass: HomeAssistant) => {
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/${
+        atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+      }/reload`,
+      method: "post",
+    });
+    return;
+  }
+
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/${
+      atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+    }/reload`
+  );
+};
+
+export const createHassioFullBackup = async (
+  hass: HomeAssistant,
+  data: HassioFullBackupCreateParams
+) => {
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/${
+        atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+      }/new/full`,
+      method: "post",
+      timeout: null,
+      data,
+    });
+    return;
+  }
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/${
+      atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+    }/new/full`,
+    data
+  );
+};
+
+export const removeBackup = async (hass: HomeAssistant, slug: string) => {
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/${
+        atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+      }/${slug}/remove`,
+      method: "post",
+    });
+    return;
+  }
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/${
+      atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+    }/${slug}/remove`
+  );
+};
+
+export const createHassioPartialBackup = async (
+  hass: HomeAssistant,
+  data: HassioPartialBackupCreateParams
+) => {
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/${
+        atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+      }/new/partial`,
+      method: "post",
+      timeout: null,
+      data,
+    });
+    return;
+  }
+
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/${
+      atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+    }/new/partial`,
+    data
+  );
+};
+
+export const uploadBackup = async (
+  hass: HomeAssistant,
+  file: File
+): Promise<HassioResponse<HassioBackup>> => {
+  const fd = new FormData();
+  let resp;
+  fd.append("file", file);
+  if (hass) {
+    resp = await hass.fetchWithAuth(
+      `/api/hassio/${
+        atLeastVersion(hass.config.version, 2021, 9) ? "backups" : "snapshots"
+      }/new/upload`,
+      {
+        method: "POST",
+        body: fd,
+      }
+    );
+  } else {
+    // When called from onboarding we don't have hass
+    resp = await fetch("/api/hassio/backups/new/upload", {
+      method: "POST",
+      body: fd,
+    });
+  }
+
+  if (resp.status === 413) {
+    throw new Error("Uploaded backup is too large");
+  } else if (resp.status !== 200) {
+    throw new Error(`${resp.status} ${resp.statusText}`);
+  }
+  return resp.json();
+};
diff --git a/src/data/hassio/snapshot.ts b/src/data/hassio/snapshot.ts
deleted file mode 100644
index 35220e80b6..0000000000
--- a/src/data/hassio/snapshot.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import { atLeastVersion } from "../../common/config/version";
-import { HomeAssistant } from "../../types";
-import { hassioApiResultExtractor, HassioResponse } from "./common";
-
-export const friendlyFolderName = {
-  ssl: "SSL",
-  homeassistant: "Configuration",
-  "addons/local": "Local add-ons",
-  media: "Media",
-  share: "Share",
-};
-
-interface SnapshotContent {
-  homeassistant: boolean;
-  folders: string[];
-  addons: string[];
-}
-
-export interface HassioSnapshot {
-  slug: string;
-  date: string;
-  name: string;
-  type: "full" | "partial";
-  protected: boolean;
-  content: SnapshotContent;
-}
-
-export interface HassioSnapshotDetail extends HassioSnapshot {
-  size: number;
-  homeassistant: string;
-  addons: Array<{
-    slug: "ADDON_SLUG";
-    name: "NAME";
-    version: "INSTALLED_VERSION";
-    size: "SIZE_IN_MB";
-  }>;
-  repositories: string[];
-  folders: string[];
-}
-
-export interface HassioFullSnapshotCreateParams {
-  name: string;
-  password?: string;
-  confirm_password?: string;
-}
-export interface HassioPartialSnapshotCreateParams
-  extends HassioFullSnapshotCreateParams {
-  folders?: string[];
-  addons?: string[];
-  homeassistant?: boolean;
-}
-
-export const fetchHassioSnapshots = async (
-  hass: HomeAssistant
-): Promise<HassioSnapshot[]> => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    const data: { snapshots: HassioSnapshot[] } = await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/snapshots`,
-      method: "get",
-    });
-    return data.snapshots;
-  }
-
-  return hassioApiResultExtractor(
-    await hass.callApi<HassioResponse<{ snapshots: HassioSnapshot[] }>>(
-      "GET",
-      "hassio/snapshots"
-    )
-  ).snapshots;
-};
-
-export const fetchHassioSnapshotInfo = async (
-  hass: HomeAssistant,
-  snapshot: string
-): Promise<HassioSnapshotDetail> => {
-  if (hass) {
-    if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-      return hass.callWS({
-        type: "supervisor/api",
-        endpoint: `/snapshots/${snapshot}/info`,
-        method: "get",
-      });
-    }
-    return hassioApiResultExtractor(
-      await hass.callApi<HassioResponse<HassioSnapshotDetail>>(
-        "GET",
-        `hassio/snapshots/${snapshot}/info`
-      )
-    );
-  }
-  // When called from onboarding we don't have hass
-  const resp = await fetch(`/api/hassio/snapshots/${snapshot}/info`, {
-    method: "GET",
-  });
-  const data = (await resp.json()).data;
-  return data;
-};
-
-export const reloadHassioSnapshots = async (hass: HomeAssistant) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/snapshots/reload",
-      method: "post",
-    });
-    return;
-  }
-
-  await hass.callApi<HassioResponse<void>>("POST", `hassio/snapshots/reload`);
-};
-
-export const createHassioFullSnapshot = async (
-  hass: HomeAssistant,
-  data: HassioFullSnapshotCreateParams
-) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/snapshots/new/full",
-      method: "post",
-      timeout: null,
-      data,
-    });
-    return;
-  }
-  await hass.callApi<HassioResponse<void>>(
-    "POST",
-    `hassio/snapshots/new/full`,
-    data
-  );
-};
-
-export const removeSnapshot = async (hass: HomeAssistant, slug: string) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: `/snapshots/${slug}/remove`,
-      method: "post",
-    });
-    return;
-  }
-  await hass.callApi<HassioResponse<void>>(
-    "POST",
-    `hassio/snapshots/${slug}/remove`
-  );
-};
-
-export const createHassioPartialSnapshot = async (
-  hass: HomeAssistant,
-  data: HassioPartialSnapshotCreateParams
-) => {
-  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
-    await hass.callWS({
-      type: "supervisor/api",
-      endpoint: "/snapshots/new/partial",
-      method: "post",
-      timeout: null,
-      data,
-    });
-    return;
-  }
-
-  await hass.callApi<HassioResponse<void>>(
-    "POST",
-    `hassio/snapshots/new/partial`,
-    data
-  );
-};
-
-export const uploadSnapshot = async (
-  hass: HomeAssistant,
-  file: File
-): Promise<HassioResponse<HassioSnapshot>> => {
-  const fd = new FormData();
-  let resp;
-  fd.append("file", file);
-  if (hass) {
-    resp = await hass.fetchWithAuth("/api/hassio/snapshots/new/upload", {
-      method: "POST",
-      body: fd,
-    });
-  } else {
-    // When called from onboarding we don't have hass
-    resp = await fetch("/api/hassio/snapshots/new/upload", {
-      method: "POST",
-      body: fd,
-    });
-  }
-
-  if (resp.status === 413) {
-    throw new Error("Uploaded snapshot is too large");
-  } else if (resp.status !== 200) {
-    throw new Error(`${resp.status} ${resp.statusText}`);
-  }
-  return resp.json();
-};
diff --git a/src/data/history.ts b/src/data/history.ts
index b1e1b9f82a..a8264b42ca 100644
--- a/src/data/history.ts
+++ b/src/data/history.ts
@@ -1,3 +1,4 @@
+import { addDays, addMonths, startOfDay, startOfMonth } from "date-fns";
 import { HassEntity } from "home-assistant-js-websocket";
 import { computeStateDisplay } from "../common/entity/compute_state_display";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
@@ -238,14 +239,17 @@ export const computeHistory = (
       return;
     }
 
-    const stateWithUnit = stateInfo.find(
-      (state) => state.attributes && "unit_of_measurement" in state.attributes
+    const stateWithUnitorStateClass = stateInfo.find(
+      (state) =>
+        state.attributes &&
+        ("unit_of_measurement" in state.attributes ||
+          "state_class" in state.attributes)
     );
 
     let unit: string | undefined;
 
-    if (stateWithUnit) {
-      unit = stateWithUnit.attributes.unit_of_measurement;
+    if (stateWithUnitorStateClass) {
+      unit = stateWithUnitorStateClass.attributes.unit_of_measurement || " ";
     } else {
       unit = {
         climate: hass.config.unit_system.temperature,
@@ -406,3 +410,90 @@ export const calculateStatisticsSumGrowthWithPercentage = (
 
   return sum;
 };
+
+export const reduceSumStatisticsByDay = (
+  values: StatisticValue[]
+): StatisticValue[] => {
+  if (!values?.length) {
+    return [];
+  }
+  const result: StatisticValue[] = [];
+  if (
+    values.length > 1 &&
+    new Date(values[0].start).getDate() === new Date(values[1].start).getDate()
+  ) {
+    // add init value if the first value isn't end of previous period
+    result.push({
+      ...values[0]!,
+      start: startOfMonth(addDays(new Date(values[0].start), -1)).toISOString(),
+    });
+  }
+  let lastValue: StatisticValue;
+  let prevDate: number | undefined;
+  for (const value of values) {
+    const date = new Date(value.start).getDate();
+    if (prevDate === undefined) {
+      prevDate = date;
+    }
+    if (prevDate !== date) {
+      // Last value of the day
+      result.push({
+        ...lastValue!,
+        start: startOfDay(new Date(lastValue!.start)).toISOString(),
+      });
+      prevDate = date;
+    }
+    lastValue = value;
+  }
+  // Add final value
+  result.push({
+    ...lastValue!,
+    start: startOfDay(new Date(lastValue!.start)).toISOString(),
+  });
+  return result;
+};
+
+export const reduceSumStatisticsByMonth = (
+  values: StatisticValue[]
+): StatisticValue[] => {
+  if (!values?.length) {
+    return [];
+  }
+  const result: StatisticValue[] = [];
+  if (
+    values.length > 1 &&
+    new Date(values[0].start).getMonth() ===
+      new Date(values[1].start).getMonth()
+  ) {
+    // add init value if the first value isn't end of previous period
+    result.push({
+      ...values[0]!,
+      start: startOfMonth(
+        addMonths(new Date(values[0].start), -1)
+      ).toISOString(),
+    });
+  }
+  let lastValue: StatisticValue;
+  let prevMonth: number | undefined;
+  for (const value of values) {
+    const month = new Date(value.start).getMonth();
+    if (prevMonth === undefined) {
+      prevMonth = month;
+    }
+    if (prevMonth !== month) {
+      // Last value of the day
+      result.push({
+        ...lastValue!,
+        start: startOfMonth(new Date(lastValue!.start)).toISOString(),
+      });
+      prevMonth = month;
+    }
+    lastValue = value;
+  }
+  // Add final value
+  result.push({
+    ...lastValue!,
+    start: startOfMonth(new Date(lastValue!.start)).toISOString(),
+  });
+  return result;
+};
diff --git a/src/data/usb.ts b/src/data/usb.ts
new file mode 100644
index 0000000000..03246a2dad
--- /dev/null
+++ b/src/data/usb.ts
@@ -0,0 +1,4 @@
+import { HomeAssistant } from "../types";
+
+export const scanUSBDevices = (hass: HomeAssistant) =>
+  hass.callWS({ type: "usb/scan" });
diff --git a/src/data/zwave_js.ts b/src/data/zwave_js.ts
index b443d62fbc..d2d69d4dff 100644
--- a/src/data/zwave_js.ts
+++ b/src/data/zwave_js.ts
@@ -24,12 +24,22 @@ export interface ZWaveJSController {
   is_heal_network_active: boolean;
 }
 
-export interface ZWaveJSNode {
+export interface ZWaveJSNodeStatus {
   node_id: number;
   ready: boolean;
   status: number;
 }
 
+export interface ZwaveJSNodeMetadata {
+  node_id: number;
+  exclusion: string;
+  inclusion: string;
+  manual: string;
+  wakeup: string;
+  reset: string;
+  device_database_url: string;
+}
+
 export interface ZWaveJSNodeConfigParams {
   [key: string]: ZWaveJSNodeConfigParam;
 }
@@ -132,13 +142,24 @@ export const fetchNodeStatus = (
   hass: HomeAssistant,
   entry_id: string,
   node_id: number
-): Promise<ZWaveJSNode> =>
+): Promise<ZWaveJSNodeStatus> =>
   hass.callWS({
     type: "zwave_js/node_status",
     entry_id,
     node_id,
   });
 
+export const fetchNodeMetadata = (
+  hass: HomeAssistant,
+  entry_id: string,
+  node_id: number
+): Promise<ZwaveJSNodeMetadata> =>
+  hass.callWS({
+    type: "zwave_js/node_metadata",
+    entry_id,
+    node_id,
+  });
+
 export const fetchNodeConfigParameters = (
   hass: HomeAssistant,
   entry_id: string,
diff --git a/src/dialogs/config-flow/step-flow-pick-flow.ts b/src/dialogs/config-flow/step-flow-pick-flow.ts
index 0e407fad89..82578354d3 100644
--- a/src/dialogs/config-flow/step-flow-pick-flow.ts
+++ b/src/dialogs/config-flow/step-flow-pick-flow.ts
@@ -41,7 +41,12 @@ class StepFlowPickFlow extends LitElement {
             <img
               slot="item-icon"
               loading="lazy"
-              src=${brandsUrl(flow.handler, "icon", true)}
+              src=${brandsUrl({
+                domain: flow.handler,
+                type: "icon",
+                useFallback: true,
+                darkOptimized: this.hass.selectedTheme?.dark,
+              })}
               referrerpolicy="no-referrer"
             />
 
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index 00977e462e..f0e5ab0409 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -96,7 +96,12 @@ class StepFlowPickHandler extends LitElement {
                     <img
                       slot="item-icon"
                       loading="lazy"
-                      src=${brandsUrl(handler.slug, "icon", true)}
+                      src=${brandsUrl({
+                        domain: handler.slug,
+                        type: "icon",
+                        useFallback: true,
+                        darkOptimized: this.hass.selectedTheme?.dark,
+                      })}
                       referrerpolicy="no-referrer"
                     />
 
diff --git a/src/dialogs/more-info/controls/more-info-climate.ts b/src/dialogs/more-info/controls/more-info-climate.ts
index 7d21934698..a98d669cf0 100644
--- a/src/dialogs/more-info/controls/more-info-climate.ts
+++ b/src/dialogs/more-info/controls/more-info-climate.ts
@@ -149,14 +149,12 @@ class MoreInfoClimate extends LitElement {
                     ${stateObj.attributes.humidity} %
                   </div>
                   <ha-slider
-                    class="humidity"
                     step="1"
                     pin
                     ignore-bar-touch
                     dir=${rtlDirection}
                     .min=${stateObj.attributes.min_humidity}
                     .max=${stateObj.attributes.max_humidity}
-                    .secondaryProgress=${stateObj.attributes.max_humidity}
                     .value=${stateObj.attributes.humidity}
                     @change=${this._targetHumiditySliderChanged}
                   >
@@ -479,11 +477,6 @@ class MoreInfoClimate extends LitElement {
         margin-left: 4%;
       }
 
-      .humidity {
-        --paper-slider-active-color: var(--paper-blue-400);
-        --paper-slider-secondary-color: var(--paper-blue-400);
-      }
-
       .single-row {
         padding: 8px 0;
       }
diff --git a/src/dialogs/more-info/controls/more-info-humidifier.ts b/src/dialogs/more-info/controls/more-info-humidifier.ts
index 43da799a16..8271b86703 100644
--- a/src/dialogs/more-info/controls/more-info-humidifier.ts
+++ b/src/dialogs/more-info/controls/more-info-humidifier.ts
@@ -53,14 +53,12 @@ class MoreInfoHumidifier extends LitElement {
           <div class="single-row">
             <div class="target-humidity">${stateObj.attributes.humidity} %</div>
             <ha-slider
-              class="humidity"
               step="1"
               pin
               ignore-bar-touch
               dir=${rtlDirection}
               .min=${stateObj.attributes.min_humidity}
               .max=${stateObj.attributes.max_humidity}
-              .secondaryProgress=${stateObj.attributes.max_humidity}
               .value=${stateObj.attributes.humidity}
               @change=${this._targetHumiditySliderChanged}
             >
@@ -201,11 +199,6 @@ class MoreInfoHumidifier extends LitElement {
         direction: ltr;
       }
 
-      .humidity {
-        --paper-slider-active-color: var(--paper-blue-400);
-        --paper-slider-secondary-color: var(--paper-blue-400);
-      }
-
       .single-row {
         padding: 8px 0;
       }
diff --git a/src/dialogs/more-info/controls/more-info-input_datetime.js b/src/dialogs/more-info/controls/more-info-input_datetime.js
deleted file mode 100644
index cff1b5233b..0000000000
--- a/src/dialogs/more-info/controls/more-info-input_datetime.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import "@polymer/iron-flex-layout/iron-flex-layout-classes";
-import "@polymer/paper-input/paper-input";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import { attributeClassNames } from "../../../common/entity/attribute_class_names";
-import "../../../components/ha-date-input";
-import "../../../components/ha-relative-time";
-import "../../../components/paper-time-input";
-
-class DatetimeInput extends PolymerElement {
-  static get template() {
-    return html`
-      <div class$="[[computeClassNames(stateObj)]]">
-        <template is="dom-if" if="[[doesHaveDate(stateObj)]]" restamp="">
-          <div>
-            <ha-date-input
-              id="dateInput"
-              label="Date"
-              value="{{selectedDate}}"
-            ></ha-date-input>
-          </div>
-        </template>
-        <template is="dom-if" if="[[doesHaveTime(stateObj)]]" restamp="">
-          <div>
-            <paper-time-input
-              hour="{{selectedHour}}"
-              min="{{selectedMinute}}"
-              format="24"
-            ></paper-time-input>
-          </div>
-        </template>
-      </div>
-    `;
-  }
-
-  constructor() {
-    super();
-    this.is_ready = false;
-  }
-
-  static get properties() {
-    return {
-      hass: {
-        type: Object,
-      },
-
-      stateObj: {
-        type: Object,
-        observer: "stateObjChanged",
-      },
-
-      selectedDate: {
-        type: String,
-        observer: "dateTimeChanged",
-      },
-
-      selectedHour: {
-        type: Number,
-        observer: "dateTimeChanged",
-      },
-
-      selectedMinute: {
-        type: Number,
-        observer: "dateTimeChanged",
-      },
-    };
-  }
-
-  ready() {
-    super.ready();
-    this.is_ready = true;
-  }
-
-  /* Convert the date in the stateObj into a string useable by vaadin-date-picker */
-  getDateString(stateObj) {
-    if (stateObj.state === "unknown") {
-      return "";
-    }
-    let monthFiller;
-    if (stateObj.attributes.month < 10) {
-      monthFiller = "0";
-    } else {
-      monthFiller = "";
-    }
-
-    let dayFiller;
-    if (stateObj.attributes.day < 10) {
-      dayFiller = "0";
-    } else {
-      dayFiller = "";
-    }
-
-    return (
-      stateObj.attributes.year +
-      "-" +
-      monthFiller +
-      stateObj.attributes.month +
-      "-" +
-      dayFiller +
-      stateObj.attributes.day
-    );
-  }
-
-  /* Should fire when any value was changed *by the user*, not b/c of setting
-   * initial values. */
-  dateTimeChanged() {
-    // Check if the change is really coming from the user
-    if (!this.is_ready) {
-      return;
-    }
-
-    let changed = false;
-    let minuteFiller;
-
-    const serviceData = {
-      entity_id: this.stateObj.entity_id,
-    };
-
-    if (this.stateObj.attributes.has_time) {
-      changed =
-        changed ||
-        parseInt(this.selectedMinute) !== this.stateObj.attributes.minute;
-      changed =
-        changed ||
-        parseInt(this.selectedHour) !== this.stateObj.attributes.hour;
-      if (this.selectedMinute < 10) {
-        minuteFiller = "0";
-      } else {
-        minuteFiller = "";
-      }
-      const timeStr =
-        this.selectedHour + ":" + minuteFiller + this.selectedMinute;
-      serviceData.time = timeStr;
-    }
-
-    if (this.stateObj.attributes.has_date) {
-      if (this.selectedDate.length === 0) {
-        return; // Date was not set
-      }
-
-      const dateValInput = new Date(this.selectedDate);
-      const dateValState = new Date(
-        this.stateObj.attributes.year,
-        this.stateObj.attributes.month - 1,
-        this.stateObj.attributes.day
-      );
-
-      changed = changed || dateValState !== dateValInput;
-
-      serviceData.date = this.selectedDate;
-    }
-
-    if (changed) {
-      this.hass.callService("input_datetime", "set_datetime", serviceData);
-    }
-  }
-
-  stateObjChanged(newVal) {
-    // Set to non-ready s.t. dateTimeChanged does not fire
-    this.is_ready = false;
-
-    if (newVal.attributes.has_time) {
-      this.selectedHour = newVal.attributes.hour;
-      this.selectedMinute = newVal.attributes.minute;
-    }
-
-    if (newVal.attributes.has_date) {
-      this.selectedDate = this.getDateString(newVal);
-    }
-
-    this.is_ready = true;
-  }
-
-  doesHaveDate(stateObj) {
-    return stateObj.attributes.has_date;
-  }
-
-  doesHaveTime(stateObj) {
-    return stateObj.attributes.has_time;
-  }
-
-  computeClassNames(stateObj) {
-    return (
-      "more-info-input_datetime " +
-      attributeClassNames(stateObj, ["has_time", "has_date"])
-    );
-  }
-}
-
-customElements.define("more-info-input_datetime", DatetimeInput);
diff --git a/src/dialogs/more-info/controls/more-info-input_datetime.ts b/src/dialogs/more-info/controls/more-info-input_datetime.ts
new file mode 100644
index 0000000000..af1e9aa6a1
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-input_datetime.ts
@@ -0,0 +1,103 @@
+import { HassEntity } from "home-assistant-js-websocket";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
+import "../../../components/ha-date-input";
+import "../../../components/ha-time-input";
+import { UNAVAILABLE_STATES, UNKNOWN } from "../../../data/entity";
+import { setInputDateTimeValue } from "../../../data/input_datetime";
+import type { HomeAssistant } from "../../../types";
+
+@customElement("more-info-input_datetime")
+class MoreInfoInputDatetime extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ attribute: false }) public stateObj?: HassEntity;
+
+  protected render(): TemplateResult {
+    if (!this.stateObj) {
+      return html``;
+    }
+
+    return html`
+        ${
+          this.stateObj.attributes.has_date
+            ? html`
+                <ha-date-input
+                  .value=${`${this.stateObj.attributes.year}-${this.stateObj.attributes.month}-${this.stateObj.attributes.day}`}
+                  .disabled=${UNAVAILABLE_STATES.includes(this.stateObj.state)}
+                  @value-changed=${this._dateChanged}
+                >
+                </ha-date-input>
+              `
+            : ``
+        }
+        ${
+          this.stateObj.attributes.has_time
+            ? html`
+                <ha-time-input
+                  .value=${this.stateObj.state === UNKNOWN
+                    ? ""
+                    : this.stateObj.attributes.has_date
+                    ? this.stateObj.state.split(" ")[1]
+                    : this.stateObj.state}
+                  .locale=${this.hass.locale}
+                  .disabled=${UNAVAILABLE_STATES.includes(this.stateObj.state)}
+                  hide-label
+                  @value-changed=${this._timeChanged}
+                  @click=${this._stopEventPropagation}
+                ></ha-time-input>
+              `
+            : ``
+        }
+      </hui-generic-entity-row>
+    `;
+  }
+
+  private _stopEventPropagation(ev: Event): void {
+    ev.stopPropagation();
+  }
+
+  private _timeChanged(ev): void {
+    setInputDateTimeValue(
+      this.hass!,
+      this.stateObj!.entity_id,
+      ev.detail.value,
+      this.stateObj!.attributes.has_date
+        ? this.stateObj!.state.split(" ")[0]
+        : undefined
+    );
+    ev.target.blur();
+  }
+
+  private _dateChanged(ev): void {
+    setInputDateTimeValue(
+      this.hass!,
+      this.stateObj!.entity_id,
+      this.stateObj!.attributes.has_time
+        ? this.stateObj!.state.split(" ")[1]
+        : undefined,
+      ev.detail.value
+    );
+
+    ev.target.blur();
+  }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      :host {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
+      ha-date-input + ha-time-input {
+        margin-left: 4px;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "more-info-input_datetime": MoreInfoInputDatetime;
+  }
+}
diff --git a/src/html/_js_base.html.template b/src/html/_js_base.html.template
index 0824d82b4b..0eea886de2 100644
--- a/src/html/_js_base.html.template
+++ b/src/html/_js_base.html.template
@@ -21,5 +21,5 @@
             "content" in document.createElement("template"))) {
         document.write("<script src='/static/polyfills/webcomponents-bundle.js'><"+"/script>");
       }
-      var isS11_12 = /.*Version\/(?:11|12)(?:\.\d+)*.*Safari\//.test(navigator.userAgent);
+      var isS11_12 = /(?:.*(?:iPhone|iPad).*OS (?:11|12)_\d)|(?:.*Version\/(?:11|12)(?:\.\d+)*.*Safari\/)/.test(navigator.userAgent);
     </script>
diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index b189d39b60..2468644605 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -211,6 +211,7 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
     if (!this.hass!.connection.connected) {
       return;
     }
+    window.stop();
     this.hass!.connection.suspend();
   }
 
diff --git a/src/onboarding/ha-onboarding.ts b/src/onboarding/ha-onboarding.ts
index 1d0b571b3e..e06665b300 100644
--- a/src/onboarding/ha-onboarding.ts
+++ b/src/onboarding/ha-onboarding.ts
@@ -89,13 +89,13 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
             </onboarding-create-user>`
           : ""}
         ${this._supervisor
-          ? html`<onboarding-restore-snapshot
+          ? html`<onboarding-restore-backup
               .localize=${this.localize}
               .restoring=${this._restoring}
               .discoveryInformation=${this._discoveryInformation}
-              @restoring=${this._restoringSnapshot}
+              @restoring=${this._restoringBackup}
             >
-            </onboarding-restore-snapshot>`
+            </onboarding-restore-backup>`
           : ""}
       `;
     }
@@ -170,7 +170,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
     return this._steps ? this._steps.find((stp) => !stp.done) : undefined;
   }
 
-  private _restoringSnapshot() {
+  private _restoringBackup() {
     this._restoring = true;
   }
 
@@ -183,12 +183,12 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
       ].includes(response.installation_type);
       if (this._supervisor) {
         // Only load if we have supervisor
-        import("./onboarding-restore-snapshot");
+        import("./onboarding-restore-backup");
       }
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error(
-        "Something went wrong loading onboarding-restore-snapshot",
+        "Something went wrong loading onboarding-restore-backup",
         err
       );
     }
diff --git a/src/onboarding/integration-badge.ts b/src/onboarding/integration-badge.ts
index 7958ca7080..c7a18f07ca 100644
--- a/src/onboarding/integration-badge.ts
+++ b/src/onboarding/integration-badge.ts
@@ -11,13 +11,19 @@ class IntegrationBadge extends LitElement {
 
   @property() public badgeIcon?: string;
 
+  @property({ type: Boolean }) public darkOptimizedIcon?: boolean;
+
   @property({ type: Boolean, reflect: true }) public clickable = false;
 
   protected render(): TemplateResult {
     return html`
       <div class="icon">
         <img
-          src=${brandsUrl(this.domain, "icon")}
+          src=${brandsUrl({
+            domain: this.domain,
+            type: "icon",
+            darkOptimized: this.darkOptimizedIcon,
+          })}
           referrerpolicy="no-referrer"
         />
         ${this.badgeIcon
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index 9426c88ad4..acafb6e191 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -10,6 +10,7 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { compare } from "../common/string/compare";
+import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { LocalizeFunc } from "../common/translations/localize";
 import { ConfigEntry, getConfigEntries } from "../data/config_entries";
 import {
@@ -19,6 +20,7 @@ import {
 } from "../data/config_flow";
 import { DataEntryFlowProgress } from "../data/data_entry_flow";
 import { domainToName } from "../data/integration";
+import { scanUSBDevices } from "../data/usb";
 import {
   loadConfigFlowDialog,
   showConfigFlowDialog,
@@ -78,6 +80,7 @@ class OnboardingIntegrations extends LitElement {
               .domain=${entry.domain}
               .title=${title}
               badgeIcon="hass:check"
+              .darkOptimizedIcon=${this.hass.selectedTheme?.dark}
             ></integration-badge>
           `,
         ];
@@ -94,6 +97,7 @@ class OnboardingIntegrations extends LitElement {
                 clickable
                 .domain=${flow.handler}
                 .title=${title}
+                .darkOptimizedIcon=${this.hass.selectedTheme?.dark}
               ></integration-badge>
             </button>
           `,
@@ -132,6 +136,7 @@ class OnboardingIntegrations extends LitElement {
 
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
+    this._scanUSBDevices();
     loadConfigFlowDialog();
     this._loadConfigEntries();
     /* polyfill for paper-dropdown */
@@ -157,6 +162,13 @@ class OnboardingIntegrations extends LitElement {
     });
   }
 
+  private async _scanUSBDevices() {
+    if (!isComponentLoaded(this.hass, "usb")) {
+      return;
+    }
+    await scanUSBDevices(this.hass);
+  }
+
   private async _loadConfigEntries() {
     const entries = await getConfigEntries(this.hass!);
     // We filter out the config entry for the local weather and rpi_power.
diff --git a/src/onboarding/onboarding-restore-snapshot.ts b/src/onboarding/onboarding-restore-backup.ts
similarity index 80%
rename from src/onboarding/onboarding-restore-snapshot.ts
rename to src/onboarding/onboarding-restore-backup.ts
index ca1afc56eb..bc3c2d4265 100644
--- a/src/onboarding/onboarding-restore-snapshot.ts
+++ b/src/onboarding/onboarding-restore-backup.ts
@@ -2,8 +2,8 @@ import "@material/mwc-button/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../hassio/src/components/hassio-ansi-to-html";
-import { showHassioSnapshotDialog } from "../../hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot";
-import { showSnapshotUploadDialog } from "../../hassio/src/dialogs/snapshot/show-dialog-snapshot-upload";
+import { showHassioBackupDialog } from "../../hassio/src/dialogs/backup/show-dialog-hassio-backup";
+import { showBackupUploadDialog } from "../../hassio/src/dialogs/backup/show-dialog-backup-upload";
 import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-card";
 import {
@@ -21,8 +21,8 @@ declare global {
   }
 }
 
-@customElement("onboarding-restore-snapshot")
-class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
+@customElement("onboarding-restore-backup")
+class OnboardingRestoreBackup extends ProvideHassLitMixin(LitElement) {
   @property() public localize!: LocalizeFunc;
 
   @property() public language!: string;
@@ -42,15 +42,15 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
           <onboarding-loading></onboarding-loading>
         </ha-card>`
       : html`
-          <button class="link" @click=${this._uploadSnapshot}>
+          <button class="link" @click=${this._uploadBackup}>
             ${this.localize("ui.panel.page-onboarding.restore.description")}
           </button>
         `;
   }
 
-  private _uploadSnapshot(): void {
-    showSnapshotUploadDialog(this, {
-      showSnapshot: (slug: string) => this._showSnapshotDialog(slug),
+  private _uploadBackup(): void {
+    showBackupUploadDialog(this, {
+      showBackup: (slug: string) => this._showBackupDialog(slug),
       onboarding: true,
     });
   }
@@ -79,8 +79,8 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
     }
   }
 
-  private _showSnapshotDialog(slug: string): void {
-    showHassioSnapshotDialog(this, {
+  private _showBackupDialog(slug: string): void {
+    showHassioBackupDialog(this, {
       slug,
       onboarding: true,
       localize: this.localize,
@@ -118,6 +118,6 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "onboarding-restore-snapshot": OnboardingRestoreSnapshot;
+    "onboarding-restore-backup": OnboardingRestoreBackup;
   }
 }
diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
index 96719a003f..05fdbe4cf3 100644
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -252,6 +252,9 @@ export default class HaAutomationActionRow extends LitElement {
   }
 
   private _handleUiModeNotAvailable(ev: CustomEvent) {
+    // Prevent possible parent action-row from switching to yamlMode
+    ev.stopPropagation();
+
     this._warnings = handleStructError(this.hass, ev.detail).warnings;
     if (!this._yamlMode) {
       this._yamlMode = true;
diff --git a/src/panels/config/automation/action/ha-automation-action.ts b/src/panels/config/automation/action/ha-automation-action.ts
index dfdf25b215..a51749e902 100644
--- a/src/panels/config/automation/action/ha-automation-action.ts
+++ b/src/panels/config/automation/action/ha-automation-action.ts
@@ -53,6 +53,9 @@ export default class HaAutomationAction extends LitElement {
   }
 
   private _move(ev: CustomEvent) {
+    // Prevent possible parent action-row from also moving
+    ev.stopPropagation();
+
     const index = (ev.target as any).index;
     const newIndex = ev.detail.direction === "up" ? index - 1 : index + 1;
     const actions = this.actions.concat();
diff --git a/src/panels/config/automation/action/types/ha-automation-action-delay.ts b/src/panels/config/automation/action/types/ha-automation-action-delay.ts
index ab9a3ed8ab..e03a533be6 100644
--- a/src/panels/config/automation/action/types/ha-automation-action-delay.ts
+++ b/src/panels/config/automation/action/types/ha-automation-action-delay.ts
@@ -1,14 +1,13 @@
-import "@polymer/paper-input/paper-input";
 import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { hasTemplate } from "../../../../../common/string/has-template";
-import "../../../../../components/entity/ha-entity-picker";
-import { HaFormTimeData } from "../../../../../components/ha-form/ha-form";
-import "../../../../../components/ha-service-picker";
+import type { HaDurationData } from "../../../../../components/ha-duration-input";
+import "../../../../../components/ha-duration-input";
 import { DelayAction } from "../../../../../data/script";
 import { HomeAssistant } from "../../../../../types";
 import { ActionElement } from "../ha-automation-action-row";
+import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 
 @customElement("ha-automation-action-delay")
 export class HaDelayAction extends LitElement implements ActionElement {
@@ -16,13 +15,13 @@ export class HaDelayAction extends LitElement implements ActionElement {
 
   @property() public action!: DelayAction;
 
-  @property() public _timeData!: HaFormTimeData;
+  @property() public _timeData!: HaDurationData;
 
   public static get defaultConfig() {
     return { delay: "" };
   }
 
-  protected updated(changedProperties: PropertyValues) {
+  public willUpdate(changedProperties: PropertyValues) {
     if (!changedProperties.has("action")) {
       return;
     }
@@ -36,37 +35,15 @@ export class HaDelayAction extends LitElement implements ActionElement {
       return;
     }
 
-    if (typeof this.action.delay !== "object") {
-      if (typeof this.action.delay === "string" || isNaN(this.action.delay)) {
-        const parts = this.action.delay?.toString().split(":") || [];
-        this._timeData = {
-          hours: Number(parts[0]) || 0,
-          minutes: Number(parts[1]) || 0,
-          seconds: Number(parts[2]) || 0,
-          milliseconds: Number(parts[3]) || 0,
-        };
-      } else {
-        this._timeData = { seconds: this.action.delay };
-      }
-      return;
-    }
-    const { days, minutes, seconds, milliseconds } = this.action.delay;
-    let { hours } = this.action.delay || 0;
-    hours = (hours || 0) + (days || 0) * 24;
-    this._timeData = {
-      hours: hours,
-      minutes: minutes,
-      seconds: seconds,
-      milliseconds: milliseconds,
-    };
+    this._timeData = createDurationData(this.action.delay);
   }
 
   protected render() {
-    return html`<ha-time-input
+    return html`<ha-duration-input
       .data=${this._timeData}
       enableMillisecond
       @value-changed=${this._valueChanged}
-    ></ha-time-input>`;
+    ></ha-duration-input>`;
   }
 
   private _valueChanged(ev: CustomEvent) {
diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
index 1b841f0af9..22103067f8 100644
--- a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
+++ b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
@@ -1,14 +1,16 @@
 import "@polymer/paper-input/paper-input";
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
+import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import "../../../../../components/entity/ha-entity-attribute-picker";
 import "../../../../../components/entity/ha-entity-picker";
-import { ForDict, StateCondition } from "../../../../../data/automation";
+import { StateCondition } from "../../../../../data/automation";
 import { HomeAssistant } from "../../../../../types";
 import {
   ConditionElement,
   handleChangeEvent,
 } from "../ha-automation-condition-row";
+import "../../../../../components/ha-duration-input";
 
 @customElement("ha-automation-condition-state")
 export class HaStateCondition extends LitElement implements ConditionElement {
@@ -22,23 +24,7 @@ export class HaStateCondition extends LitElement implements ConditionElement {
 
   protected render() {
     const { entity_id, attribute, state } = this.condition;
-    let forTime = this.condition.for;
-
-    if (
-      forTime &&
-      ((forTime as ForDict).hours ||
-        (forTime as ForDict).minutes ||
-        (forTime as ForDict).seconds)
-    ) {
-      // If the trigger was defined using the yaml dict syntax, convert it to
-      // the equivalent string format
-      let { hours = 0, minutes = 0, seconds = 0 } = forTime as ForDict;
-      hours = hours.toString().padStart(2, "0");
-      minutes = minutes.toString().padStart(2, "0");
-      seconds = seconds.toString().padStart(2, "0");
-
-      forTime = `${hours}:${minutes}:${seconds}`;
-    }
+    const forTime = createDurationData(this.condition.for);
 
     return html`
       <ha-entity-picker
@@ -67,14 +53,14 @@ export class HaStateCondition extends LitElement implements ConditionElement {
         .value=${state}
         @value-changed=${this._valueChanged}
       ></paper-input>
-      <paper-input
+      <ha-duration-input
         .label=${this.hass.localize(
           "ui.panel.config.automation.editor.triggers.type.state.for"
         )}
         .name=${"for"}
-        .value=${forTime}
+        .data=${forTime}
         @value-changed=${this._valueChanged}
-      ></paper-input>
+      ></ha-duration-input>
     `;
   }
 
diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-time.ts b/src/panels/config/automation/condition/types/ha-automation-condition-time.ts
index e606e31eac..f227847a3f 100644
--- a/src/panels/config/automation/condition/types/ha-automation-condition-time.ts
+++ b/src/panels/config/automation/condition/types/ha-automation-condition-time.ts
@@ -1,5 +1,4 @@
 import { Radio } from "@material/mwc-radio";
-import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
@@ -13,6 +12,7 @@ import {
   ConditionElement,
   handleChangeEvent,
 } from "../ha-automation-condition-row";
+import "../../../../../components/ha-time-input";
 
 const includeDomains = ["input_datetime"];
 
@@ -89,14 +89,15 @@ export class HaTimeCondition extends LitElement implements ConditionElement {
             .hass=${this.hass}
             allow-custom-entity
           ></ha-entity-picker>`
-        : html`<paper-input
+        : html`<ha-time-input
             .label=${this.hass.localize(
               "ui.panel.config.automation.editor.conditions.type.time.after"
             )}
-            name="after"
+            .locale=${this.hass.locale}
+            .name=${"after"}
             .value=${after?.startsWith("input_datetime.") ? "" : after}
             @value-changed=${this._valueChanged}
-          ></paper-input>`}
+          ></ha-time-input>`}
 
       <ha-formfield
         .label=${this.hass!.localize(
@@ -134,14 +135,15 @@ export class HaTimeCondition extends LitElement implements ConditionElement {
             .hass=${this.hass}
             allow-custom-entity
           ></ha-entity-picker>`
-        : html`<paper-input
+        : html`<ha-time-input
             .label=${this.hass.localize(
               "ui.panel.config.automation.editor.conditions.type.time.before"
             )}
-            name="before"
+            .name=${"before"}
+            .locale=${this.hass.locale}
             .value=${before?.startsWith("input_datetime.") ? "" : before}
             @value-changed=${this._valueChanged}
-          ></paper-input>`}
+          ></ha-time-input>`}
       ${Object.keys(DAYS).map(
         (day) => html`
           <ha-formfield
diff --git a/src/panels/config/automation/ha-automation-trace.ts b/src/panels/config/automation/ha-automation-trace.ts
index eb007735dd..b4ba49cc05 100644
--- a/src/panels/config/automation/ha-automation-trace.ts
+++ b/src/panels/config/automation/ha-automation-trace.ts
@@ -6,12 +6,11 @@ import {
   mdiRefresh,
 } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { repeat } from "lit/directives/repeat";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { formatDateTimeWithSeconds } from "../../../common/datetime/format_date_time";
-import type { NodeInfo } from "../../../components/trace/hat-graph";
 import "../../../components/trace/hat-script-graph";
 import { AutomationEntity } from "../../../data/automation";
 import { getLogbookDataForContext, LogbookEntry } from "../../../data/logbook";
@@ -31,6 +30,10 @@ import "../../../components/trace/ha-trace-logbook";
 import "../../../components/trace/ha-trace-path-details";
 import "../../../components/trace/ha-trace-timeline";
 import { traceTabStyles } from "../../../components/trace/trace-tab-styles";
+import type {
+  HatScriptGraph,
+  NodeInfo,
+} from "../../../components/trace/hat-script-graph";
 
 @customElement("ha-automation-trace")
 export class HaAutomationTrace extends LitElement {
@@ -65,12 +68,14 @@ export class HaAutomationTrace extends LitElement {
     | "logbook"
     | "blueprint" = "details";
 
+  @query("hat-script-graph") private _graph?: HatScriptGraph;
+
   protected render(): TemplateResult {
     const stateObj = this._entityId
       ? this.hass.states[this._entityId]
       : undefined;
 
-    const graph = this.shadowRoot!.querySelector("hat-script-graph");
+    const graph = this._graph;
     const trackedNodes = graph?.trackedNodes;
     const renderedNodes = graph?.renderedNodes;
 
@@ -294,7 +299,6 @@ export class HaAutomationTrace extends LitElement {
     if (changedProps.has("_runId") && this._runId) {
       this._trace = undefined;
       this._logbookEntries = undefined;
-      this.shadowRoot!.querySelector("select")!.value = this._runId;
       this._loadTrace();
     }
 
@@ -427,14 +431,13 @@ export class HaAutomationTrace extends LitElement {
     this._logbookEntries = traceInfo.logbookEntries;
   }
 
-  private _showTab(ev) {
+  private _showTab(ev: Event) {
     this._view = (ev.target as any).view;
   }
 
-  private _timelinePathPicked(ev) {
+  private _timelinePathPicked(ev: CustomEvent) {
     const path = ev.detail.value;
-    const nodes =
-      this.shadowRoot!.querySelector("hat-script-graph")!.trackedNodes;
+    const nodes = this._graph!.trackedNodes;
     if (nodes[path]) {
       this._selected = nodes[path];
     }
@@ -487,9 +490,12 @@ export class HaAutomationTrace extends LitElement {
           border-right: 1px solid var(--divider-color);
           overflow-x: auto;
           max-width: 50%;
+          padding-bottom: 16px;
         }
         :host([narrow]) .graph {
           max-width: 100%;
+          justify-content: center;
+          display: flex;
         }
 
         .info {
diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
index 8cd132ce3f..d137278f98 100644
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -9,6 +9,7 @@ import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { dynamicElement } from "../../../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import { handleStructError } from "../../../../common/structs/handle-errors";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-card";
 import "../../../../components/ha-icon-button";
@@ -80,6 +81,8 @@ export default class HaAutomationTriggerRow extends LitElement {
 
   @property() public trigger!: Trigger;
 
+  @state() private _warnings?: string[];
+
   @state() private _yamlMode = false;
 
   protected render() {
@@ -118,6 +121,20 @@ export default class HaAutomationTriggerRow extends LitElement {
               </mwc-list-item>
             </ha-button-menu>
           </div>
+          ${this._warnings
+            ? html`<div class="warning">
+                ${this.hass.localize("ui.errors.config.editor_not_supported")}:
+                <br />
+                ${this._warnings.length && this._warnings[0] !== undefined
+                  ? html` <ul>
+                      ${this._warnings.map(
+                        (warning) => html`<li>${warning}</li>`
+                      )}
+                    </ul>`
+                  : ""}
+                ${this.hass.localize("ui.errors.config.edit_in_yaml_supported")}
+              </div>`
+            : ""}
           ${yamlMode
             ? html`
                 ${selected === -1
@@ -170,7 +187,7 @@ export default class HaAutomationTriggerRow extends LitElement {
                   @value-changed=${this._idChanged}
                 >
                 </paper-input>
-                <div>
+                <div @ui-mode-not-available=${this._handleUiModeNotAvailable}>
                   ${dynamicElement(
                     `ha-automation-trigger-${this.trigger.platform}`,
                     { hass: this.hass, trigger: this.trigger }
@@ -182,6 +199,13 @@ export default class HaAutomationTriggerRow extends LitElement {
     `;
   }
 
+  private _handleUiModeNotAvailable(ev: CustomEvent) {
+    this._warnings = handleStructError(this.hass, ev.detail).warnings;
+    if (!this._yamlMode) {
+      this._yamlMode = true;
+    }
+  }
+
   private _handleAction(ev: CustomEvent<ActionDetail>) {
     switch (ev.detail.index) {
       case 0:
@@ -258,6 +282,7 @@ export default class HaAutomationTriggerRow extends LitElement {
   }
 
   private _switchYamlMode() {
+    this._warnings = undefined;
     this._yamlMode = !this._yamlMode;
   }
 
diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-numeric_state.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-numeric_state.ts
index cf7cf64115..27c2c6d708 100644
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-numeric_state.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-numeric_state.ts
@@ -1,11 +1,15 @@
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-input/paper-textarea";
-import { html, LitElement } from "lit";
+import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
+import { createDurationData } from "../../../../../common/datetime/create_duration_data";
+import { fireEvent } from "../../../../../common/dom/fire_event";
+import { hasTemplate } from "../../../../../common/string/has-template";
 import "../../../../../components/entity/ha-entity-picker";
-import { ForDict, NumericStateTrigger } from "../../../../../data/automation";
+import { NumericStateTrigger } from "../../../../../data/automation";
 import { HomeAssistant } from "../../../../../types";
 import { handleChangeEvent } from "../ha-automation-trigger-row";
+import "../../../../../components/ha-duration-input";
 
 @customElement("ha-automation-trigger-numeric_state")
 export default class HaNumericStateTrigger extends LitElement {
@@ -13,6 +17,20 @@ export default class HaNumericStateTrigger extends LitElement {
 
   @property() public trigger!: NumericStateTrigger;
 
+  public willUpdate(changedProperties: PropertyValues) {
+    if (!changedProperties.has("trigger")) {
+      return;
+    }
+    // Check for templates in trigger. If found, revert to YAML mode.
+    if (this.trigger && hasTemplate(this.trigger)) {
+      fireEvent(
+        this,
+        "ui-mode-not-available",
+        Error(this.hass.localize("ui.errors.config.no_template_editor_support"))
+      );
+    }
+  }
+
   public static get defaultConfig() {
     return {
       entity_id: "",
@@ -21,23 +39,8 @@ export default class HaNumericStateTrigger extends LitElement {
 
   public render() {
     const { value_template, entity_id, attribute, below, above } = this.trigger;
-    let trgFor = this.trigger.for;
+    const trgFor = createDurationData(this.trigger.for);
 
-    if (
-      trgFor &&
-      ((trgFor as ForDict).hours ||
-        (trgFor as ForDict).minutes ||
-        (trgFor as ForDict).seconds)
-    ) {
-      // If the trigger was defined using the yaml dict syntax, convert it to
-      // the equivalent string format
-      let { hours = 0, minutes = 0, seconds = 0 } = trgFor as ForDict;
-      hours = hours.toString();
-      minutes = minutes.toString().padStart(2, "0");
-      seconds = seconds.toString().padStart(2, "0");
-
-      trgFor = `${hours}:${minutes}:${seconds}`;
-    }
     return html`
       <ha-entity-picker
         .value="${entity_id}"
@@ -82,14 +85,14 @@ export default class HaNumericStateTrigger extends LitElement {
         @value-changed=${this._valueChanged}
         dir="ltr"
       ></paper-textarea>
-      <paper-input
+      <ha-duration-input
         .label=${this.hass.localize(
           "ui.panel.config.automation.editor.triggers.type.state.for"
         )}
-        name="for"
-        .value=${trgFor}
+        .name=${"for"}
+        .data=${trgFor}
         @value-changed=${this._valueChanged}
-      ></paper-input>
+      ></ha-duration-input>
     `;
   }
 
diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
index 1ad3b18555..6be2d30fab 100644
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
@@ -1,10 +1,14 @@
 import "@polymer/paper-input/paper-input";
-import { html, LitElement } from "lit";
+import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
+import { createDurationData } from "../../../../../common/datetime/create_duration_data";
+import { fireEvent } from "../../../../../common/dom/fire_event";
+import { hasTemplate } from "../../../../../common/string/has-template";
 import "../../../../../components/entity/ha-entity-attribute-picker";
 import "../../../../../components/entity/ha-entity-picker";
-import { ForDict, StateTrigger } from "../../../../../data/automation";
+import { StateTrigger } from "../../../../../data/automation";
 import { HomeAssistant } from "../../../../../types";
+import "../../../../../components/ha-duration-input";
 import {
   handleChangeEvent,
   TriggerElement,
@@ -20,25 +24,23 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
     return { entity_id: "" };
   }
 
+  public willUpdate(changedProperties: PropertyValues) {
+    if (!changedProperties.has("trigger")) {
+      return;
+    }
+    // Check for templates in trigger. If found, revert to YAML mode.
+    if (this.trigger && hasTemplate(this.trigger)) {
+      fireEvent(
+        this,
+        "ui-mode-not-available",
+        Error(this.hass.localize("ui.errors.config.no_template_editor_support"))
+      );
+    }
+  }
+
   protected render() {
     const { entity_id, attribute, to, from } = this.trigger;
-    let trgFor = this.trigger.for;
-
-    if (
-      trgFor &&
-      ((trgFor as ForDict).hours ||
-        (trgFor as ForDict).minutes ||
-        (trgFor as ForDict).seconds)
-    ) {
-      // If the trigger was defined using the yaml dict syntax, convert it to
-      // the equivalent string format
-      let { hours = 0, minutes = 0, seconds = 0 } = trgFor as ForDict;
-      hours = hours.toString();
-      minutes = minutes.toString().padStart(2, "0");
-      seconds = seconds.toString().padStart(2, "0");
-
-      trgFor = `${hours}:${minutes}:${seconds}`;
-    }
+    const trgFor = createDurationData(this.trigger.for);
 
     return html`
       <ha-entity-picker
@@ -75,14 +77,14 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
         .value=${to}
         @value-changed=${this._valueChanged}
       ></paper-input>
-      <paper-input
+      <ha-duration-input
         .label=${this.hass.localize(
           "ui.panel.config.automation.editor.triggers.type.state.for"
         )}
         .name=${"for"}
-        .value=${trgFor}
+        .data=${trgFor}
         @value-changed=${this._valueChanged}
-      ></paper-input>
+      ></ha-duration-input>
     `;
   }
 
diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-time.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-time.ts
index ddb0404907..a72c5a9749 100644
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-time.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-time.ts
@@ -1,5 +1,4 @@
-import "@polymer/paper-input/paper-input";
-import { html, LitElement } from "lit";
+import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../../components/entity/ha-entity-picker";
 import "../../../../../components/ha-formfield";
@@ -10,9 +9,10 @@ import {
   handleChangeEvent,
   TriggerElement,
 } from "../ha-automation-trigger-row";
+import "../../../../../components/ha-time-input";
+import { fireEvent } from "../../../../../common/dom/fire_event";
 
 const includeDomains = ["input_datetime"];
-
 @customElement("ha-automation-trigger-time")
 export class HaTimeTrigger extends LitElement implements TriggerElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -25,11 +25,32 @@ export class HaTimeTrigger extends LitElement implements TriggerElement {
     return { at: "" };
   }
 
+  public willUpdate(changedProperties: PropertyValues) {
+    if (!changedProperties.has("trigger")) {
+      return;
+    }
+    // We dont support multiple times atm.
+    if (this.trigger && Array.isArray(this.trigger.at)) {
+      fireEvent(
+        this,
+        "ui-mode-not-available",
+        Error(this.hass.localize("ui.errors.config.editor_not_supported"))
+      );
+    }
+  }
+
   protected render() {
-    const { at } = this.trigger;
-    const inputMode = this._inputMode ?? at?.startsWith("input_datetime.");
-    return html`
-      <ha-formfield
+    const at = this.trigger.at;
+
+    if (Array.isArray(at)) {
+      return html``;
+    }
+
+    const inputMode =
+      this._inputMode ??
+      (at?.startsWith("input_datetime.") || at?.startsWith("sensor."));
+
+    return html`<ha-formfield
         .label=${this.hass!.localize(
           "ui.panel.config.automation.editor.triggers.type.time.type_value"
         )}
@@ -53,6 +74,7 @@ export class HaTimeTrigger extends LitElement implements TriggerElement {
           ?checked=${inputMode}
         ></ha-radio>
       </ha-formfield>
+
       ${inputMode
         ? html`<ha-entity-picker
             .label=${this.hass.localize(
@@ -60,20 +82,26 @@ export class HaTimeTrigger extends LitElement implements TriggerElement {
             )}
             .includeDomains=${includeDomains}
             .name=${"at"}
-            .value=${at?.startsWith("input_datetime.") ? at : ""}
+            .value=${at?.startsWith("input_datetime.") ||
+            at?.startsWith("sensor.")
+              ? at
+              : ""}
             @value-changed=${this._valueChanged}
             .hass=${this.hass}
             allow-custom-entity
           ></ha-entity-picker>`
-        : html`<paper-input
+        : html`<ha-time-input
             .label=${this.hass.localize(
               "ui.panel.config.automation.editor.triggers.type.time.at"
             )}
-            name="at"
-            .value=${at?.startsWith("input_datetime.") ? "" : at}
+            .name=${"at"}
+            .value=${at?.startsWith("input_datetime.") ||
+            at?.startsWith("sensor.")
+              ? ""
+              : at}
+            .locale=${this.hass.locale}
             @value-changed=${this._valueChanged}
-          ></paper-input>`}
-    `;
+          ></ha-time-input>`} `;
   }
 
   private _handleModeChanged(ev: Event) {
diff --git a/src/panels/config/cloud/account/cloud-remote-pref.ts b/src/panels/config/cloud/account/cloud-remote-pref.ts
index 77b1463196..f01070f887 100644
--- a/src/panels/config/cloud/account/cloud-remote-pref.ts
+++ b/src/panels/config/cloud/account/cloud-remote-pref.ts
@@ -59,7 +59,7 @@ export class CloudRemotePref extends LitElement {
               remote_connected
                 ? "connected"
                 : remote_enabled
-                ? "connecting"
+                ? "reconnecting"
                 : "not_connected"
             }`
           )}
diff --git a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
index 254e61d88d..3733967efb 100644
--- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
@@ -16,7 +16,7 @@ import {
   fetchNodeStatus,
   getIdentifiersFromDevice,
   nodeStatus,
-  ZWaveJSNode,
+  ZWaveJSNodeStatus,
   ZWaveJSNodeIdentifiers,
 } from "../../../../../../data/zwave_js";
 import { haStyle } from "../../../../../../resources/styles";
@@ -36,7 +36,7 @@ export class HaDeviceInfoZWaveJS extends LitElement {
 
   @state() private _nodeId?: number;
 
-  @state() private _node?: ZWaveJSNode;
+  @state() private _node?: ZWaveJSNodeStatus;
 
   protected updated(changedProperties: PropertyValues) {
     if (changedProperties.has("device")) {
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index c0243a31c3..6bc5ec64a1 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -241,7 +241,11 @@ export class HaConfigDevicePage extends LitElement {
                     integrations.length
                       ? html`
                           <img
-                            src=${brandsUrl(integrations[0], "logo")}
+                            src=${brandsUrl({
+                              domain: integrations[0],
+                              type: "logo",
+                              darkOptimized: this.hass.selectedTheme?.dark,
+                            })}
                             referrerpolicy="no-referrer"
                             @load=${this._onImageLoad}
                             @error=${this._onImageError}
diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts
index b30b7a24d4..5c31fb7b8c 100644
--- a/src/panels/config/devices/ha-config-devices-dashboard.ts
+++ b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -212,6 +212,10 @@ export class HaConfigDeviceDashboard extends LitElement {
           this._batteryEntity(device.id, deviceEntityLookup),
           this._batteryChargingEntity(device.id, deviceEntityLookup),
         ],
+        battery_level:
+          this.hass.states[
+            this._batteryEntity(device.id, deviceEntityLookup) || ""
+          ]?.state,
       }));
 
       this._numHiddenDevices = startLength - outputDevices.length;
@@ -286,9 +290,11 @@ export class HaConfigDeviceDashboard extends LitElement {
       columns.battery_entity = {
         title: this.hass.localize("ui.panel.config.devices.data_table.battery"),
         sortable: true,
+        filterable: true,
         type: "numeric",
         width: narrow ? "95px" : "15%",
         maxWidth: "95px",
+        valueColumn: "battery_level",
         template: (batteryEntityPair: DeviceRowData["battery_entity"]) => {
           const battery =
             batteryEntityPair && batteryEntityPair[0]
diff --git a/src/panels/config/energy/components/ha-energy-battery-settings.ts b/src/panels/config/energy/components/ha-energy-battery-settings.ts
new file mode 100644
index 0000000000..d1360fd61d
--- /dev/null
+++ b/src/panels/config/energy/components/ha-energy-battery-settings.ts
@@ -0,0 +1,202 @@
+import "@material/mwc-button/mwc-button";
+import { mdiBatteryHigh, mdiDelete, mdiPencil } from "@mdi/js";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
+import { fireEvent } from "../../../../common/dom/fire_event";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
+import "../../../../components/entity/ha-statistic-picker";
+import "../../../../components/ha-card";
+import "../../../../components/ha-settings-row";
+import {
+  BatterySourceTypeEnergyPreference,
+  EnergyPreferences,
+  EnergyPreferencesValidation,
+  EnergyValidationIssue,
+  saveEnergyPreferences,
+} from "../../../../data/energy";
+import {
+  showConfirmationDialog,
+  showAlertDialog,
+} from "../../../../dialogs/generic/show-dialog-box";
+import { haStyle } from "../../../../resources/styles";
+import { HomeAssistant } from "../../../../types";
+import { documentationUrl } from "../../../../util/documentation-url";
+import { showEnergySettingsBatteryDialog } from "../dialogs/show-dialogs-energy";
+import "./ha-energy-validation-result";
+import { energyCardStyles } from "./styles";
+
+@customElement("ha-energy-battery-settings")
+export class EnergyBatterySettings extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ attribute: false })
+  public preferences!: EnergyPreferences;
+
+  @property({ attribute: false })
+  public validationResult?: EnergyPreferencesValidation;
+
+  protected render(): TemplateResult {
+    const batterySources: BatterySourceTypeEnergyPreference[] = [];
+    const batteryValidation: EnergyValidationIssue[][] = [];
+
+    this.preferences.energy_sources.forEach((source, idx) => {
+      if (source.type !== "battery") {
+        return;
+      }
+      batterySources.push(source);
+
+      if (this.validationResult) {
+        batteryValidation.push(this.validationResult.energy_sources[idx]);
+      }
+    });
+
+    return html`
+      <ha-card>
+        <h1 class="card-header">
+          <ha-svg-icon .path=${mdiBatteryHigh}></ha-svg-icon>
+          ${this.hass.localize("ui.panel.config.energy.battery.title")}
+        </h1>
+
+        <div class="card-content">
+          <p>
+            ${this.hass.localize("ui.panel.config.energy.battery.sub")}
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="${documentationUrl(this.hass, "/docs/energy/battery/")}"
+              >${this.hass.localize(
+                "ui.panel.config.energy.battery.learn_more"
+              )}</a
+            >
+          </p>
+          ${batteryValidation.map(
+            (result) =>
+              html`
+                <ha-energy-validation-result
+                  .hass=${this.hass}
+                  .issues=${result}
+                ></ha-energy-validation-result>
+              `
+          )}
+
+          <h3>Battery systems</h3>
+          ${batterySources.map((source) => {
+            const fromEntityState = this.hass.states[source.stat_energy_from];
+            const toEntityState = this.hass.states[source.stat_energy_to];
+            return html`
+              <div class="row" .source=${source}>
+                ${toEntityState?.attributes.icon
+                  ? html`<ha-icon
+                      .icon=${toEntityState.attributes.icon}
+                    ></ha-icon>`
+                  : html`<ha-svg-icon .path=${mdiBatteryHigh}></ha-svg-icon>`}
+                <div class="content">
+                  <span
+                    >${toEntityState
+                      ? computeStateName(toEntityState)
+                      : source.stat_energy_from}</span
+                  >
+                  <span
+                    >${fromEntityState
+                      ? computeStateName(fromEntityState)
+                      : source.stat_energy_to}</span
+                  >
+                </div>
+                <mwc-icon-button @click=${this._editSource}>
+                  <ha-svg-icon .path=${mdiPencil}></ha-svg-icon>
+                </mwc-icon-button>
+                <mwc-icon-button @click=${this._deleteSource}>
+                  <ha-svg-icon .path=${mdiDelete}></ha-svg-icon>
+                </mwc-icon-button>
+              </div>
+            `;
+          })}
+          <div class="row border-bottom">
+            <ha-svg-icon .path=${mdiBatteryHigh}></ha-svg-icon>
+            <mwc-button @click=${this._addSource}
+              >Add battery system</mwc-button
+            >
+          </div>
+        </div>
+      </ha-card>
+    `;
+  }
+
+  private _addSource() {
+    showEnergySettingsBatteryDialog(this, {
+      saveCallback: async (source) => {
+        await this._savePreferences({
+          ...this.preferences,
+          energy_sources: this.preferences.energy_sources.concat(source),
+        });
+      },
+    });
+  }
+
+  private _editSource(ev) {
+    const origSource: BatterySourceTypeEnergyPreference =
+      ev.currentTarget.closest(".row").source;
+    showEnergySettingsBatteryDialog(this, {
+      source: { ...origSource },
+      saveCallback: async (newSource) => {
+        await this._savePreferences({
+          ...this.preferences,
+          energy_sources: this.preferences.energy_sources.map((src) =>
+            src === origSource ? newSource : src
+          ),
+        });
+      },
+    });
+  }
+
+  private async _deleteSource(ev) {
+    const sourceToDelete: BatterySourceTypeEnergyPreference =
+      ev.currentTarget.closest(".row").source;
+
+    if (
+      !(await showConfirmationDialog(this, {
+        title: "Are you sure you want to delete this source?",
+      }))
+    ) {
+      return;
+    }
+
+    try {
+      await this._savePreferences({
+        ...this.preferences,
+        energy_sources: this.preferences.energy_sources.filter(
+          (source) => source !== sourceToDelete
+        ),
+      });
+    } catch (err) {
+      showAlertDialog(this, { title: `Failed to save config: ${err.message}` });
+    }
+  }
+
+  private async _savePreferences(preferences: EnergyPreferences) {
+    const result = await saveEnergyPreferences(this.hass, preferences);
+    fireEvent(this, "value-changed", { value: result });
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      energyCardStyles,
+      css`
+        .row {
+          height: 58px;
+        }
+        .content {
+          display: flex;
+          flex-direction: column;
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-energy-battery-settings": EnergyBatterySettings;
+  }
+}
diff --git a/src/panels/config/energy/components/ha-energy-device-settings.ts b/src/panels/config/energy/components/ha-energy-device-settings.ts
index 16b7dc38d2..c99b36849d 100644
--- a/src/panels/config/energy/components/ha-energy-device-settings.ts
+++ b/src/panels/config/energy/components/ha-energy-device-settings.ts
@@ -5,12 +5,11 @@ import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeStateName } from "../../../../common/entity/compute_state_name";
 import { stateIcon } from "../../../../common/entity/state_icon";
-import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-card";
-import "../../../../components/ha-settings-row";
 import {
   DeviceConsumptionEnergyPreference,
   EnergyPreferences,
+  EnergyPreferencesValidation,
   saveEnergyPreferences,
 } from "../../../../data/energy";
 import {
@@ -21,6 +20,7 @@ import { haStyle } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
 import { documentationUrl } from "../../../../util/documentation-url";
 import { showEnergySettingsDeviceDialog } from "../dialogs/show-dialogs-energy";
+import "./ha-energy-validation-result";
 import { energyCardStyles } from "./styles";
 
 @customElement("ha-energy-device-settings")
@@ -30,6 +30,9 @@ export class EnergyDeviceSettings extends LitElement {
   @property({ attribute: false })
   public preferences!: EnergyPreferences;
 
+  @property({ attribute: false })
+  public validationResult?: EnergyPreferencesValidation;
+
   protected render(): TemplateResult {
     return html`
       <ha-card>
@@ -57,6 +60,15 @@ export class EnergyDeviceSettings extends LitElement {
               )}</a
             >
           </p>
+          ${this.validationResult?.device_consumption.map(
+            (result) =>
+              html`
+                <ha-energy-validation-result
+                  .hass=${this.hass}
+                  .issues=${result}
+                ></ha-energy-validation-result>
+              `
+          )}
           <h3>Devices</h3>
           ${this.preferences.device_consumption.map((device) => {
             const entityState = this.hass.states[device.stat_consumption];
@@ -101,7 +113,7 @@ export class EnergyDeviceSettings extends LitElement {
 
     if (
       !(await showConfirmationDialog(this, {
-        title: "Are you sure you wan't to delete this device?",
+        title: "Are you sure you want to delete this device?",
       }))
     ) {
       return;
diff --git a/src/panels/config/energy/components/ha-energy-gas-settings.ts b/src/panels/config/energy/components/ha-energy-gas-settings.ts
new file mode 100644
index 0000000000..4b57b0ee3d
--- /dev/null
+++ b/src/panels/config/energy/components/ha-energy-gas-settings.ts
@@ -0,0 +1,175 @@
+import "@material/mwc-button/mwc-button";
+import { mdiDelete, mdiFire, mdiPencil } from "@mdi/js";
+import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
+import { fireEvent } from "../../../../common/dom/fire_event";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
+import "../../../../components/ha-card";
+import {
+  EnergyPreferences,
+  saveEnergyPreferences,
+  GasSourceTypeEnergyPreference,
+  EnergyPreferencesValidation,
+  EnergyValidationIssue,
+} from "../../../../data/energy";
+import {
+  showConfirmationDialog,
+  showAlertDialog,
+} from "../../../../dialogs/generic/show-dialog-box";
+import { haStyle } from "../../../../resources/styles";
+import { HomeAssistant } from "../../../../types";
+import { documentationUrl } from "../../../../util/documentation-url";
+import { showEnergySettingsGasDialog } from "../dialogs/show-dialogs-energy";
+import "./ha-energy-validation-result";
+import { energyCardStyles } from "./styles";
+
+@customElement("ha-energy-gas-settings")
+export class EnergyGasSettings extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ attribute: false })
+  public preferences!: EnergyPreferences;
+
+  @property({ attribute: false })
+  public validationResult?: EnergyPreferencesValidation;
+
+  protected render(): TemplateResult {
+    const gasSources: GasSourceTypeEnergyPreference[] = [];
+    const gasValidation: EnergyValidationIssue[][] = [];
+
+    this.preferences.energy_sources.forEach((source, idx) => {
+      if (source.type !== "gas") {
+        return;
+      }
+      gasSources.push(source);
+
+      if (this.validationResult) {
+        gasValidation.push(this.validationResult.energy_sources[idx]);
+      }
+    });
+
+    return html`
+      <ha-card>
+        <h1 class="card-header">
+          <ha-svg-icon .path=${mdiFire}></ha-svg-icon>
+          ${this.hass.localize("ui.panel.config.energy.gas.title")}
+        </h1>
+
+        <div class="card-content">
+          <p>
+            ${this.hass.localize("ui.panel.config.energy.gas.sub")}
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="${documentationUrl(this.hass, "/docs/energy/gas/")}"
+              >${this.hass.localize("ui.panel.config.energy.gas.learn_more")}</a
+            >
+          </p>
+          ${gasValidation.map(
+            (result) =>
+              html`
+                <ha-energy-validation-result
+                  .hass=${this.hass}
+                  .issues=${result}
+                ></ha-energy-validation-result>
+              `
+          )}
+          <h3>Gas consumption</h3>
+          ${gasSources.map((source) => {
+            const entityState = this.hass.states[source.stat_energy_from];
+            return html`
+              <div class="row" .source=${source}>
+                ${entityState?.attributes.icon
+                  ? html`<ha-icon
+                      .icon=${entityState.attributes.icon}
+                    ></ha-icon>`
+                  : html`<ha-svg-icon .path=${mdiFire}></ha-svg-icon>`}
+                <span class="content"
+                  >${entityState
+                    ? computeStateName(entityState)
+                    : source.stat_energy_from}</span
+                >
+                <mwc-icon-button @click=${this._editSource}>
+                  <ha-svg-icon .path=${mdiPencil}></ha-svg-icon>
+                </mwc-icon-button>
+                <mwc-icon-button @click=${this._deleteSource}>
+                  <ha-svg-icon .path=${mdiDelete}></ha-svg-icon>
+                </mwc-icon-button>
+              </div>
+            `;
+          })}
+          <div class="row border-bottom">
+            <ha-svg-icon .path=${mdiFire}></ha-svg-icon>
+            <mwc-button @click=${this._addSource}>Add gas source</mwc-button>
+          </div>
+        </div>
+      </ha-card>
+    `;
+  }
+
+  private _addSource() {
+    showEnergySettingsGasDialog(this, {
+      saveCallback: async (source) => {
+        await this._savePreferences({
+          ...this.preferences,
+          energy_sources: this.preferences.energy_sources.concat(source),
+        });
+      },
+    });
+  }
+
+  private _editSource(ev) {
+    const origSource: GasSourceTypeEnergyPreference =
+      ev.currentTarget.closest(".row").source;
+    showEnergySettingsGasDialog(this, {
+      source: { ...origSource },
+      saveCallback: async (newSource) => {
+        await this._savePreferences({
+          ...this.preferences,
+          energy_sources: this.preferences.energy_sources.map((src) =>
+            src === origSource ? newSource : src
+          ),
+        });
+      },
+    });
+  }
+
+  private async _deleteSource(ev) {
+    const sourceToDelete: GasSourceTypeEnergyPreference =
+      ev.currentTarget.closest(".row").source;
+
+    if (
+      !(await showConfirmationDialog(this, {
+        title: "Are you sure you want to delete this source?",
+      }))
+    ) {
+      return;
+    }
+
+    try {
+      await this._savePreferences({
+        ...this.preferences,
+        energy_sources: this.preferences.energy_sources.filter(
+          (source) => source !== sourceToDelete
+        ),
+      });
+    } catch (err) {
+      showAlertDialog(this, { title: `Failed to save config: ${err.message}` });
+    }
+  }
+
+  private async _savePreferences(preferences: EnergyPreferences) {
+    const result = await saveEnergyPreferences(this.hass, preferences);
+    fireEvent(this, "value-changed", { value: result });
+  }
+
+  static get styles(): CSSResultGroup {
+    return [haStyle, energyCardStyles];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-energy-gas-settings": EnergyGasSettings;
+  }
+}
diff --git a/src/panels/config/energy/components/ha-energy-grid-settings.ts b/src/panels/config/energy/components/ha-energy-grid-settings.ts
index 2146c9f7f4..6f59fe6a18 100644
--- a/src/panels/config/energy/components/ha-energy-grid-settings.ts
+++ b/src/panels/config/energy/components/ha-energy-grid-settings.ts
@@ -10,9 +10,7 @@ import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeStateName } from "../../../../common/entity/compute_state_name";
-import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-card";
-import "../../../../components/ha-settings-row";
 import {
   ConfigEntry,
   deleteConfigEntry,
@@ -21,7 +19,9 @@ import {
 import {
   emptyGridSourceEnergyPreference,
   EnergyPreferences,
+  EnergyPreferencesValidation,
   energySourcesByType,
+  EnergyValidationIssue,
   FlowFromGridSourceEnergyPreference,
   FlowToGridSourceEnergyPreference,
   GridSourceTypeEnergyPreference,
@@ -34,11 +34,13 @@ import {
 } from "../../../../dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
+import { brandsUrl } from "../../../../util/brands-url";
 import { documentationUrl } from "../../../../util/documentation-url";
 import {
   showEnergySettingsGridFlowFromDialog,
   showEnergySettingsGridFlowToDialog,
 } from "../dialogs/show-dialogs-energy";
+import "./ha-energy-validation-result";
 import { energyCardStyles } from "./styles";
 
 @customElement("ha-energy-grid-settings")
@@ -48,6 +50,9 @@ export class EnergyGridSettings extends LitElement {
   @property({ attribute: false })
   public preferences!: EnergyPreferences;
 
+  @property({ attribute: false })
+  public validationResult?: EnergyPreferencesValidation;
+
   @state() private _configEntries?: ConfigEntry[];
 
   protected firstUpdated() {
@@ -55,11 +60,23 @@ export class EnergyGridSettings extends LitElement {
   }
 
   protected render(): TemplateResult {
-    const types = energySourcesByType(this.preferences);
+    const gridIdx = this.preferences.energy_sources.findIndex(
+      (source) => source.type === "grid"
+    );
 
-    const gridSource = types.grid
-      ? types.grid[0]
-      : emptyGridSourceEnergyPreference();
+    let gridSource: GridSourceTypeEnergyPreference;
+    let gridValidation: EnergyValidationIssue[] | undefined;
+
+    if (gridIdx === -1) {
+      gridSource = emptyGridSourceEnergyPreference();
+    } else {
+      gridSource = this.preferences.energy_sources[
+        gridIdx
+      ] as GridSourceTypeEnergyPreference;
+      if (this.validationResult) {
+        gridValidation = this.validationResult.energy_sources[gridIdx];
+      }
+    }
 
     return html`
       <ha-card>
@@ -83,6 +100,15 @@ export class EnergyGridSettings extends LitElement {
               )}</a
             >
           </p>
+          ${gridValidation
+            ? html`
+                <ha-energy-validation-result
+                  .hass=${this.hass}
+                  .issues=${gridValidation}
+                ></ha-energy-validation-result>
+              `
+            : ""}
+
           <h3>Grid consumption</h3>
           ${gridSource.flow_from.map((flow) => {
             const entityState = this.hass.states[flow.stat_energy_from];
@@ -152,7 +178,11 @@ export class EnergyGridSettings extends LitElement {
             (entry) => html`<div class="row" .entry=${entry}>
               <img
                 referrerpolicy="no-referrer"
-                src="https://brands.home-assistant.io/co2signal/icon.png"
+                src=${brandsUrl({
+                  domain: "co2signal",
+                  type: "icon",
+                  darkOptimized: this.hass.selectedTheme?.dark,
+                })}
               />
               <span class="content">${entry.title}</span>
               <a href=${`/config/integrations#config_entry=${entry.entry_id}`}>
@@ -170,7 +200,11 @@ export class EnergyGridSettings extends LitElement {
                 <div class="row border-bottom">
                   <img
                     referrerpolicy="no-referrer"
-                    src="https://brands.home-assistant.io/co2signal/icon.png"
+                    src=${brandsUrl({
+                      domain: "co2signal",
+                      type: "icon",
+                      darkOptimized: this.hass.selectedTheme?.dark,
+                    })}
                   />
                   <mwc-button @click=${this._addCO2Sensor}>
                     Add CO2 signal integration
@@ -203,7 +237,7 @@ export class EnergyGridSettings extends LitElement {
     if (
       !(await showConfirmationDialog(this, {
         title:
-          "Are you sure you wan't to delete this integration? It will remove the entities it provides",
+          "Are you sure you want to delete this integration? It will remove the entities it provides",
       }))
     ) {
       return;
@@ -340,7 +374,7 @@ export class EnergyGridSettings extends LitElement {
 
     if (
       !(await showConfirmationDialog(this, {
-        title: "Are you sure you wan't to delete this source?",
+        title: "Are you sure you want to delete this source?",
       }))
     ) {
       return;
@@ -370,7 +404,7 @@ export class EnergyGridSettings extends LitElement {
 
     if (
       !(await showConfirmationDialog(this, {
-        title: "Are you sure you wan't to delete this source?",
+        title: "Are you sure you want to delete this source?",
       }))
     ) {
       return;
diff --git a/src/panels/config/energy/components/ha-energy-solar-settings.ts b/src/panels/config/energy/components/ha-energy-solar-settings.ts
index 5af7e71a16..5dc093e9d2 100644
--- a/src/panels/config/energy/components/ha-energy-solar-settings.ts
+++ b/src/panels/config/energy/components/ha-energy-solar-settings.ts
@@ -4,12 +4,12 @@ import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeStateName } from "../../../../common/entity/compute_state_name";
-import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-card";
-import "../../../../components/ha-settings-row";
 import {
+  EnergyInfo,
   EnergyPreferences,
-  energySourcesByType,
+  EnergyPreferencesValidation,
+  EnergyValidationIssue,
   saveEnergyPreferences,
   SolarSourceTypeEnergyPreference,
 } from "../../../../data/energy";
@@ -21,6 +21,7 @@ import { haStyle } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
 import { documentationUrl } from "../../../../util/documentation-url";
 import { showEnergySettingsSolarDialog } from "../dialogs/show-dialogs-energy";
+import "./ha-energy-validation-result";
 import { energyCardStyles } from "./styles";
 
 @customElement("ha-energy-solar-settings")
@@ -30,10 +31,26 @@ export class EnergySolarSettings extends LitElement {
   @property({ attribute: false })
   public preferences!: EnergyPreferences;
 
-  protected render(): TemplateResult {
-    const types = energySourcesByType(this.preferences);
+  @property({ attribute: false })
+  public validationResult?: EnergyPreferencesValidation;
 
-    const solarSources = types.solar || [];
+  @property({ attribute: false })
+  public info?: EnergyInfo;
+
+  protected render(): TemplateResult {
+    const solarSources: SolarSourceTypeEnergyPreference[] = [];
+    const solarValidation: EnergyValidationIssue[][] = [];
+
+    this.preferences.energy_sources.forEach((source, idx) => {
+      if (source.type !== "solar") {
+        return;
+      }
+      solarSources.push(source);
+
+      if (this.validationResult) {
+        solarValidation.push(this.validationResult.energy_sources[idx]);
+      }
+    });
 
     return html`
       <ha-card>
@@ -57,6 +74,16 @@ export class EnergySolarSettings extends LitElement {
               )}</a
             >
           </p>
+          ${solarValidation.map(
+            (result) =>
+              html`
+                <ha-energy-validation-result
+                  .hass=${this.hass}
+                  .issues=${result}
+                ></ha-energy-validation-result>
+              `
+          )}
+
           <h3>Solar production</h3>
           ${solarSources.map((source) => {
             const entityState = this.hass.states[source.stat_energy_from];
@@ -72,21 +99,29 @@ export class EnergySolarSettings extends LitElement {
                     ? computeStateName(entityState)
                     : source.stat_energy_from}</span
                 >
-                <mwc-icon-button @click=${this._editSource}>
-                  <ha-svg-icon .path=${mdiPencil}></ha-svg-icon>
-                </mwc-icon-button>
+                ${this.info
+                  ? html`
+                      <mwc-icon-button @click=${this._editSource}>
+                        <ha-svg-icon .path=${mdiPencil}></ha-svg-icon>
+                      </mwc-icon-button>
+                    `
+                  : ""}
                 <mwc-icon-button @click=${this._deleteSource}>
                   <ha-svg-icon .path=${mdiDelete}></ha-svg-icon>
                 </mwc-icon-button>
               </div>
             `;
           })}
-          <div class="row border-bottom">
-            <ha-svg-icon .path=${mdiSolarPower}></ha-svg-icon>
-            <mwc-button @click=${this._addSource}
-              >Add solar production</mwc-button
-            >
-          </div>
+          ${this.info
+            ? html`
+                <div class="row border-bottom">
+                  <ha-svg-icon .path=${mdiSolarPower}></ha-svg-icon>
+                  <mwc-button @click=${this._addSource}>
+                    Add solar production
+                  </mwc-button>
+                </div>
+              `
+            : ""}
         </div>
       </ha-card>
     `;
@@ -94,6 +129,7 @@ export class EnergySolarSettings extends LitElement {
 
   private _addSource() {
     showEnergySettingsSolarDialog(this, {
+      info: this.info!,
       saveCallback: async (source) => {
         await this._savePreferences({
           ...this.preferences,
@@ -107,6 +143,7 @@ export class EnergySolarSettings extends LitElement {
     const origSource: SolarSourceTypeEnergyPreference =
       ev.currentTarget.closest(".row").source;
     showEnergySettingsSolarDialog(this, {
+      info: this.info!,
       source: { ...origSource },
       saveCallback: async (newSource) => {
         await this._savePreferences({
@@ -125,7 +162,7 @@ export class EnergySolarSettings extends LitElement {
 
     if (
       !(await showConfirmationDialog(this, {
-        title: "Are you sure you wan't to delete this source?",
+        title: "Are you sure you want to delete this source?",
       }))
     ) {
       return;
diff --git a/src/panels/config/energy/components/ha-energy-validation-result.ts b/src/panels/config/energy/components/ha-energy-validation-result.ts
new file mode 100644
index 0000000000..88e26b42a3
--- /dev/null
+++ b/src/panels/config/energy/components/ha-energy-validation-result.ts
@@ -0,0 +1,82 @@
+import { css, html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
+import { groupBy } from "../../../../common/util/group-by";
+import "../../../../components/ha-alert";
+import { EnergyValidationIssue } from "../../../../data/energy";
+import { HomeAssistant } from "../../../../types";
+
+@customElement("ha-energy-validation-result")
+class EnergyValidationMessage extends LitElement {
+  @property({ attribute: false })
+  public hass!: HomeAssistant;
+
+  @property()
+  public issues!: EnergyValidationIssue[];
+
+  public render() {
+    if (this.issues.length === 0) {
+      return html``;
+    }
+
+    const grouped = groupBy(this.issues, (issue) => issue.type);
+
+    return Object.entries(grouped).map(
+      ([issueType, gIssues]) => html`
+          <ha-alert
+            alert-type="warning"
+            .title=${
+              this.hass.localize(
+                `ui.panel.config.energy.validation.issues.${issueType}.title`
+              ) || issueType
+            }
+          >
+            ${this.hass.localize(
+              `ui.panel.config.energy.validation.issues.${issueType}.description`,
+              issueType === "entity_unexpected_unit_price"
+                ? { currency: this.hass.config.currency }
+                : undefined
+            )}
+            ${
+              issueType === "recorder_untracked"
+                ? html`(<a
+                      href="https://www.home-assistant.io/integrations/recorder#configure-filter"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      >${this.hass.localize(
+                        "ui.panel.config.common.learn_more"
+                      )}</a
+                    >)`
+                : ""
+            }
+            <ul>
+              ${gIssues.map(
+                (issue) =>
+                  html`<li>
+                    ${issue.identifier}${issue.value
+                      ? html` (${issue.value})`
+                      : ""}
+                  </li>`
+              )}
+            </ul>
+          </ha-alert>
+        </div>
+      `
+    );
+  }
+
+  static styles = css`
+    ul {
+      padding-left: 24px;
+      margin: 4px 0;
+    }
+    a {
+      color: var(--primary-color);
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-energy-validation-result": EnergyValidationMessage;
+  }
+}
diff --git a/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts
new file mode 100644
index 0000000000..20eda2eead
--- /dev/null
+++ b/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts
@@ -0,0 +1,132 @@
+import { mdiBatteryHigh } from "@mdi/js";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { fireEvent } from "../../../../common/dom/fire_event";
+import "../../../../components/ha-dialog";
+import {
+  BatterySourceTypeEnergyPreference,
+  emptyBatteryEnergyPreference,
+} from "../../../../data/energy";
+import { HassDialog } from "../../../../dialogs/make-dialog-manager";
+import { haStyle, haStyleDialog } from "../../../../resources/styles";
+import { HomeAssistant } from "../../../../types";
+import { EnergySettingsBatteryDialogParams } from "./show-dialogs-energy";
+import "@material/mwc-button/mwc-button";
+import "../../../../components/entity/ha-statistic-picker";
+
+const energyUnits = ["kWh"];
+
+@customElement("dialog-energy-battery-settings")
+export class DialogEnergyBatterySettings
+  extends LitElement
+  implements HassDialog<EnergySettingsBatteryDialogParams>
+{
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @state() private _params?: EnergySettingsBatteryDialogParams;
+
+  @state() private _source?: BatterySourceTypeEnergyPreference;
+
+  @state() private _error?: string;
+
+  public async showDialog(
+    params: EnergySettingsBatteryDialogParams
+  ): Promise<void> {
+    this._params = params;
+    this._source = params.source
+      ? { ...params.source }
+      : (this._source = emptyBatteryEnergyPreference());
+  }
+
+  public closeDialog(): void {
+    this._params = undefined;
+    this._source = undefined;
+    this._error = undefined;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
+  protected render(): TemplateResult {
+    if (!this._params || !this._source) {
+      return html``;
+    }
+
+    return html`
+      <ha-dialog
+        open
+        .heading=${html`<ha-svg-icon
+            .path=${mdiBatteryHigh}
+            style="--mdc-icon-size: 32px;"
+          ></ha-svg-icon>
+          Configure battery system`}
+        @closed=${this.closeDialog}
+      >
+        ${this._error ? html`<p class="error">${this._error}</p>` : ""}
+
+        <ha-statistic-picker
+          .hass=${this.hass}
+          .includeUnitOfMeasurement=${energyUnits}
+          .value=${this._source.stat_energy_to}
+          .label=${`Energy going in to the battery (kWh)`}
+          entities-only
+          @value-changed=${this._statisticToChanged}
+        ></ha-statistic-picker>
+
+        <ha-statistic-picker
+          .hass=${this.hass}
+          .includeUnitOfMeasurement=${energyUnits}
+          .value=${this._source.stat_energy_from}
+          .label=${`Energy coming out of the battery (kWh)`}
+          entities-only
+          @value-changed=${this._statisticFromChanged}
+        ></ha-statistic-picker>
+
+        <mwc-button @click=${this.closeDialog} slot="secondaryAction">
+          ${this.hass.localize("ui.common.cancel")}
+        </mwc-button>
+        <mwc-button
+          @click=${this._save}
+          .disabled=${!this._source.stat_energy_from ||
+          !this._source.stat_energy_to}
+          slot="primaryAction"
+        >
+          ${this.hass.localize("ui.common.save")}
+        </mwc-button>
+      </ha-dialog>
+    `;
+  }
+
+  private _statisticToChanged(ev: CustomEvent<{ value: string }>) {
+    this._source = { ...this._source!, stat_energy_to: ev.detail.value };
+  }
+
+  private _statisticFromChanged(ev: CustomEvent<{ value: string }>) {
+    this._source = { ...this._source!, stat_energy_from: ev.detail.value };
+  }
+
+  private async _save() {
+    try {
+      await this._params!.saveCallback(this._source!);
+      this.closeDialog();
+    } catch (e) {
+      this._error = e.message;
+    }
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      haStyleDialog,
+      css`
+        ha-dialog {
+          --mdc-dialog-max-width: 430px;
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "dialog-energy-battery-settings": DialogEnergyBatterySettings;
+  }
+}
diff --git a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
new file mode 100644
index 0000000000..e711615c41
--- /dev/null
+++ b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
@@ -0,0 +1,277 @@
+import { mdiFire } from "@mdi/js";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { fireEvent } from "../../../../common/dom/fire_event";
+import "../../../../components/ha-dialog";
+import {
+  emptyGasEnergyPreference,
+  GasSourceTypeEnergyPreference,
+} from "../../../../data/energy";
+import { HassDialog } from "../../../../dialogs/make-dialog-manager";
+import { haStyle, haStyleDialog } from "../../../../resources/styles";
+import { HomeAssistant } from "../../../../types";
+import { EnergySettingsGasDialogParams } from "./show-dialogs-energy";
+import "@material/mwc-button/mwc-button";
+import "../../../../components/entity/ha-statistic-picker";
+import "../../../../components/entity/ha-entity-picker";
+import "../../../../components/ha-radio";
+import "../../../../components/ha-formfield";
+import type { HaRadio } from "../../../../components/ha-radio";
+
+const energyUnits = ["m³"];
+
+@customElement("dialog-energy-gas-settings")
+export class DialogEnergyGasSettings
+  extends LitElement
+  implements HassDialog<EnergySettingsGasDialogParams>
+{
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @state() private _params?: EnergySettingsGasDialogParams;
+
+  @state() private _source?: GasSourceTypeEnergyPreference;
+
+  @state() private _costs?: "no-costs" | "number" | "entity" | "statistic";
+
+  @state() private _error?: string;
+
+  public async showDialog(
+    params: EnergySettingsGasDialogParams
+  ): Promise<void> {
+    this._params = params;
+    this._source = params.source
+      ? { ...params.source }
+      : (this._source = emptyGasEnergyPreference());
+    this._costs = this._source.entity_energy_price
+      ? "entity"
+      : this._source.number_energy_price
+      ? "number"
+      : this._source.stat_cost
+      ? "statistic"
+      : "no-costs";
+  }
+
+  public closeDialog(): void {
+    this._params = undefined;
+    this._source = undefined;
+    this._error = undefined;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
+  protected render(): TemplateResult {
+    if (!this._params || !this._source) {
+      return html``;
+    }
+
+    return html`
+      <ha-dialog
+        open
+        .heading=${html`<ha-svg-icon
+            .path=${mdiFire}
+            style="--mdc-icon-size: 32px;"
+          ></ha-svg-icon>
+          Configure Gas consumption`}
+        @closed=${this.closeDialog}
+      >
+        ${this._error ? html`<p class="error">${this._error}</p>` : ""}
+
+        <ha-statistic-picker
+          .hass=${this.hass}
+          .includeUnitOfMeasurement=${energyUnits}
+          .value=${this._source.stat_energy_from}
+          .label=${`Gas usage (m³)`}
+          entities-only
+          @value-changed=${this._statisticChanged}
+        ></ha-statistic-picker>
+
+        <p>
+          ${this.hass.localize(`ui.panel.config.energy.gas.dialog.cost_para`)}
+        </p>
+
+        <ha-formfield
+          .label=${this.hass.localize(
+            `ui.panel.config.energy.gas.dialog.no_cost`
+          )}
+        >
+          <ha-radio
+            value="no-costs"
+            name="costs"
+            .checked=${this._costs === "no-costs"}
+            @change=${this._handleCostChanged}
+          ></ha-radio>
+        </ha-formfield>
+        <ha-formfield
+          .label=${this.hass.localize(
+            `ui.panel.config.energy.gas.dialog.cost_stat`
+          )}
+        >
+          <ha-radio
+            value="statistic"
+            name="costs"
+            .checked=${this._costs === "statistic"}
+            @change=${this._handleCostChanged}
+          ></ha-radio>
+        </ha-formfield>
+        ${this._costs === "statistic"
+          ? html`<ha-statistic-picker
+              class="price-options"
+              .hass=${this.hass}
+              statistic-types="sum"
+              .value=${this._source.stat_cost}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.gas.dialog.cost_stat_input`
+              )}
+              @value-changed=${this._priceStatChanged}
+            ></ha-statistic-picker>`
+          : ""}
+        <ha-formfield
+          .label=${this.hass.localize(
+            `ui.panel.config.energy.gas.dialog.cost_entity`
+          )}
+        >
+          <ha-radio
+            value="entity"
+            name="costs"
+            .checked=${this._costs === "entity"}
+            @change=${this._handleCostChanged}
+          ></ha-radio>
+        </ha-formfield>
+        ${this._costs === "entity"
+          ? html`<ha-entity-picker
+              class="price-options"
+              .hass=${this.hass}
+              include-domains='["sensor", "input_number"]'
+              .value=${this._source.entity_energy_price}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.gas.dialog.cost_entity_input`
+              )}
+              @value-changed=${this._priceEntityChanged}
+            ></ha-entity-picker>`
+          : ""}
+        <ha-formfield
+          .label=${this.hass.localize(
+            `ui.panel.config.energy.gas.dialog.cost_number`
+          )}
+        >
+          <ha-radio
+            value="number"
+            name="costs"
+            .checked=${this._costs === "number"}
+            @change=${this._handleCostChanged}
+          ></ha-radio>
+        </ha-formfield>
+        ${this._costs === "number"
+          ? html`<paper-input
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.gas.dialog.cost_number_input`
+              )}
+              no-label-float
+              class="price-options"
+              step=".01"
+              type="number"
+              .value=${this._source.number_energy_price}
+              @value-changed=${this._numberPriceChanged}
+            >
+              <span slot="suffix"
+                >${this.hass.localize(
+                  `ui.panel.config.energy.gas.dialog.cost_number_suffix`,
+                  { currency: this.hass.config.currency }
+                )}</span
+              >
+            </paper-input>`
+          : ""}
+
+        <mwc-button @click=${this.closeDialog} slot="secondaryAction">
+          ${this.hass.localize("ui.common.cancel")}
+        </mwc-button>
+        <mwc-button
+          @click=${this._save}
+          .disabled=${!this._source.stat_energy_from}
+          slot="primaryAction"
+        >
+          ${this.hass.localize("ui.common.save")}
+        </mwc-button>
+      </ha-dialog>
+    `;
+  }
+
+  private _handleCostChanged(ev: CustomEvent) {
+    const input = ev.currentTarget as HaRadio;
+    this._costs = input.value as any;
+  }
+
+  private _numberPriceChanged(ev: CustomEvent) {
+    this._source = {
+      ...this._source!,
+      number_energy_price: Number(ev.detail.value),
+      entity_energy_price: null,
+      stat_cost: null,
+    };
+  }
+
+  private _priceStatChanged(ev: CustomEvent) {
+    this._source = {
+      ...this._source!,
+      entity_energy_price: null,
+      number_energy_price: null,
+      stat_cost: ev.detail.value,
+    };
+  }
+
+  private _priceEntityChanged(ev: CustomEvent) {
+    this._source = {
+      ...this._source!,
+      entity_energy_price: ev.detail.value,
+      number_energy_price: null,
+      stat_cost: null,
+    };
+  }
+
+  private _statisticChanged(ev: CustomEvent<{ value: string }>) {
+    this._source = {
+      ...this._source!,
+      stat_energy_from: ev.detail.value,
+      entity_energy_from: ev.detail.value,
+    };
+  }
+
+  private async _save() {
+    try {
+      if (this._costs === "no-costs") {
+        this._source!.entity_energy_price = null;
+        this._source!.number_energy_price = null;
+        this._source!.stat_cost = null;
+      }
+      await this._params!.saveCallback(this._source!);
+      this.closeDialog();
+    } catch (e) {
+      this._error = e.message;
+    }
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      haStyleDialog,
+      css`
+        ha-dialog {
+          --mdc-dialog-max-width: 430px;
+        }
+        ha-formfield {
+          display: block;
+        }
+        .price-options {
+          display: block;
+          padding-left: 52px;
+          margin-top: -16px;
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "dialog-energy-gas-settings": DialogEnergyGasSettings;
+  }
+}
diff --git a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
index f84ab11624..c875641c33 100644
--- a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
+++ b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
@@ -17,10 +17,10 @@ import "../../../../components/ha-radio";
 import "../../../../components/ha-checkbox";
 import type { HaCheckbox } from "../../../../components/ha-checkbox";
 import "../../../../components/ha-formfield";
-import "../../../../components/entity/ha-entity-picker";
 import type { HaRadio } from "../../../../components/ha-radio";
 import { showConfigFlowDialog } from "../../../../dialogs/config-flow/show-dialog-config-flow";
 import { ConfigEntry, getConfigEntries } from "../../../../data/config_entries";
+import { brandsUrl } from "../../../../util/brands-url";
 
 const energyUnits = ["kWh"];
 
@@ -44,8 +44,8 @@ export class DialogEnergySolarSettings
   public async showDialog(
     params: EnergySettingsSolarDialogParams
   ): Promise<void> {
-    this._fetchForecastSolarConfigEntries();
     this._params = params;
+    this._fetchSolarForecastConfigEntries();
     this._source = params.source
       ? { ...params.source }
       : (this._source = emptySolarEnergyPreference());
@@ -117,7 +117,11 @@ export class DialogEnergySolarSettings
                     <img
                       referrerpolicy="no-referrer"
                       style="height: 24px; margin-right: 16px;"
-                      src="https://brands.home-assistant.io/forecast_solar/icon.png"
+                      src=${brandsUrl({
+                        domain: entry.domain,
+                        type: "icon",
+                        darkOptimized: this.hass.selectedTheme?.dark,
+                      })}
                     />${entry.title}
                   </div>`}
                 >
@@ -151,9 +155,10 @@ export class DialogEnergySolarSettings
     `;
   }
 
-  private async _fetchForecastSolarConfigEntries() {
-    this._configEntries = (await getConfigEntries(this.hass)).filter(
-      (entry) => entry.domain === "forecast_solar"
+  private async _fetchSolarForecastConfigEntries() {
+    const domains = this._params!.info.solar_forecast_domains;
+    this._configEntries = (await getConfigEntries(this.hass)).filter((entry) =>
+      domains.includes(entry.domain)
     );
   }
 
@@ -188,7 +193,7 @@ export class DialogEnergySolarSettings
             this._source!.config_entry_solar_forecast = [];
           }
           this._source!.config_entry_solar_forecast.push(params.entryId);
-          this._fetchForecastSolarConfigEntries();
+          this._fetchSolarForecastConfigEntries();
         }
       },
     });
diff --git a/src/panels/config/energy/dialogs/show-dialogs-energy.ts b/src/panels/config/energy/dialogs/show-dialogs-energy.ts
index f471cce7a7..28d6d79c62 100644
--- a/src/panels/config/energy/dialogs/show-dialogs-energy.ts
+++ b/src/panels/config/energy/dialogs/show-dialogs-energy.ts
@@ -1,8 +1,11 @@
 import { fireEvent } from "../../../../common/dom/fire_event";
 import {
+  BatterySourceTypeEnergyPreference,
   DeviceConsumptionEnergyPreference,
+  EnergyInfo,
   FlowFromGridSourceEnergyPreference,
   FlowToGridSourceEnergyPreference,
+  GasSourceTypeEnergyPreference,
   SolarSourceTypeEnergyPreference,
 } from "../../../../data/energy";
 
@@ -29,10 +32,21 @@ export interface EnergySettingsGridFlowToDialogParams {
 }
 
 export interface EnergySettingsSolarDialogParams {
+  info: EnergyInfo;
   source?: SolarSourceTypeEnergyPreference;
   saveCallback: (source: SolarSourceTypeEnergyPreference) => Promise<void>;
 }
 
+export interface EnergySettingsBatteryDialogParams {
+  source?: BatterySourceTypeEnergyPreference;
+  saveCallback: (source: BatterySourceTypeEnergyPreference) => Promise<void>;
+}
+
+export interface EnergySettingsGasDialogParams {
+  source?: GasSourceTypeEnergyPreference;
+  saveCallback: (source: GasSourceTypeEnergyPreference) => Promise<void>;
+}
+
 export interface EnergySettingsDeviceDialogParams {
   saveCallback: (device: DeviceConsumptionEnergyPreference) => Promise<void>;
 }
@@ -48,6 +62,17 @@ export const showEnergySettingsDeviceDialog = (
   });
 };
 
+export const showEnergySettingsBatteryDialog = (
+  element: HTMLElement,
+  dialogParams: EnergySettingsBatteryDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "dialog-energy-battery-settings",
+    dialogImport: () => import("./dialog-energy-battery-settings"),
+    dialogParams: dialogParams,
+  });
+};
+
 export const showEnergySettingsSolarDialog = (
   element: HTMLElement,
   dialogParams: EnergySettingsSolarDialogParams
@@ -59,6 +84,17 @@ export const showEnergySettingsSolarDialog = (
   });
 };
 
+export const showEnergySettingsGasDialog = (
+  element: HTMLElement,
+  dialogParams: EnergySettingsGasDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "dialog-energy-gas-settings",
+    dialogImport: () => import("./dialog-energy-gas-settings"),
+    dialogParams: dialogParams,
+  });
+};
+
 export const showEnergySettingsGridFlowFromDialog = (
   element: HTMLElement,
   dialogParams: EnergySettingsGridFlowFromDialogParams
diff --git a/src/panels/config/energy/ha-config-energy.ts b/src/panels/config/energy/ha-config-energy.ts
index fab928a23d..c1b6a28c3a 100644
--- a/src/panels/config/energy/ha-config-energy.ts
+++ b/src/panels/config/energy/ha-config-energy.ts
@@ -1,7 +1,14 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../components/ha-svg-icon";
-import { EnergyPreferences, getEnergyPreferences } from "../../../data/energy";
+import {
+  EnergyPreferencesValidation,
+  getEnergyPreferenceValidation,
+  EnergyInfo,
+  EnergyPreferences,
+  getEnergyInfo,
+  getEnergyPreferences,
+} from "../../../data/energy";
 import "../../../layouts/hass-loading-screen";
 import "../../../layouts/hass-tabs-subpage";
 import { haStyle } from "../../../resources/styles";
@@ -10,6 +17,8 @@ import { configSections } from "../ha-panel-config";
 import "./components/ha-energy-device-settings";
 import "./components/ha-energy-grid-settings";
 import "./components/ha-energy-solar-settings";
+import "./components/ha-energy-battery-settings";
+import "./components/ha-energy-gas-settings";
 
 const INITIAL_CONFIG: EnergyPreferences = {
   energy_sources: [],
@@ -30,8 +39,12 @@ class HaConfigEnergy extends LitElement {
 
   @state() private _searchParms = new URLSearchParams(window.location.search);
 
+  @state() private _info?: EnergyInfo;
+
   @state() private _preferences?: EnergyPreferences;
 
+  @state() private _validationResult?: EnergyPreferencesValidation;
+
   @state() private _error?: string;
 
   protected firstUpdated() {
@@ -74,16 +87,31 @@ class HaConfigEnergy extends LitElement {
           <ha-energy-grid-settings
             .hass=${this.hass}
             .preferences=${this._preferences!}
+            .validationResult=${this._validationResult!}
             @value-changed=${this._prefsChanged}
           ></ha-energy-grid-settings>
           <ha-energy-solar-settings
             .hass=${this.hass}
             .preferences=${this._preferences!}
+            .validationResult=${this._validationResult!}
+            .info=${this._info}
             @value-changed=${this._prefsChanged}
           ></ha-energy-solar-settings>
+          <ha-energy-battery-settings
+            .hass=${this.hass}
+            .preferences=${this._preferences!}
+            .validationResult=${this._validationResult!}
+            @value-changed=${this._prefsChanged}
+          ></ha-energy-battery-settings>
+          <ha-energy-gas-settings
+            .hass=${this.hass}
+            .preferences=${this._preferences!}
+            @value-changed=${this._prefsChanged}
+          ></ha-energy-gas-settings>
           <ha-energy-device-settings
             .hass=${this.hass}
             .preferences=${this._preferences!}
+            .validationResult=${this._validationResult!}
             @value-changed=${this._prefsChanged}
           ></ha-energy-device-settings>
         </div>
@@ -92,6 +120,10 @@ class HaConfigEnergy extends LitElement {
   }
 
   private async _fetchConfig() {
+    this._error = undefined;
+
+    const validationPromise = getEnergyPreferenceValidation(this.hass);
+    const energyInfoPromise = await getEnergyInfo(this.hass);
     try {
       this._preferences = await getEnergyPreferences(this.hass);
     } catch (e) {
@@ -101,10 +133,23 @@ class HaConfigEnergy extends LitElement {
         this._error = e.message;
       }
     }
+    try {
+      this._validationResult = await validationPromise;
+    } catch (e) {
+      this._error = e.message;
+    }
+    this._info = await energyInfoPromise;
   }
 
-  private _prefsChanged(ev: CustomEvent) {
+  private async _prefsChanged(ev: CustomEvent) {
     this._preferences = ev.detail.value;
+    this._validationResult = undefined;
+    try {
+      this._validationResult = await getEnergyPreferenceValidation(this.hass);
+    } catch (e) {
+      this._error = e.message;
+    }
+    this._info = await getEnergyInfo(this.hass);
   }
 
   static get styles(): CSSResultGroup {
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index 23e7d887b6..80f3783f20 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -164,7 +164,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
   );
 
   private _columns = memoize(
-    (narrow, _language): DataTableColumnContainer => ({
+    (narrow, _language, showDisabled): DataTableColumnContainer => ({
       icon: {
         title: "",
         type: "icon",
@@ -221,6 +221,19 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
         filterable: true,
         width: "15%",
       },
+      disabled_by: {
+        title: this.hass.localize(
+          "ui.panel.config.entities.picker.headers.disabled_by"
+        ),
+        sortable: true,
+        hidden: narrow || !showDisabled,
+        filterable: true,
+        width: "15%",
+        template: (disabled_by) =>
+          this.hass.localize(
+            `ui.panel.config.devices.disabled_by.${disabled_by}`
+          ) || disabled_by,
+      },
       status: {
         title: this.hass.localize(
           "ui.panel.config.entities.picker.headers.status"
@@ -466,7 +479,11 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
           : "/config"}
         .route=${this.route}
         .tabs=${configSections.integrations}
-        .columns=${this._columns(this.narrow, this.hass.language)}
+        .columns=${this._columns(
+          this.narrow,
+          this.hass.language,
+          this._showDisabled
+        )}
         .data=${filteredEntities}
         .activeFilters=${activeFilters}
         .numHidden=${this._numHiddenEntities}
diff --git a/src/panels/config/info/integrations-card.ts b/src/panels/config/info/integrations-card.ts
index 9432a5c086..68bd6625e9 100644
--- a/src/panels/config/info/integrations-card.ts
+++ b/src/panels/config/info/integrations-card.ts
@@ -94,7 +94,12 @@ class IntegrationsCard extends LitElement {
                     <td>
                       <img
                         loading="lazy"
-                        src=${brandsUrl(domain, "icon", true)}
+                        src=${brandsUrl({
+                          domain: domain,
+                          type: "icon",
+                          useFallback: true,
+                          darkOptimized: this.hass.selectedTheme?.dark,
+                        })}
                         referrerpolicy="no-referrer"
                       />
                     </td>
diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts
index e584ae152a..f3d0275728 100644
--- a/src/panels/config/integrations/ha-config-integrations.ts
+++ b/src/panels/config/integrations/ha-config-integrations.ts
@@ -26,6 +26,7 @@ import "../../../components/ha-button-menu";
 import "../../../components/ha-checkbox";
 import "../../../components/ha-fab";
 import "../../../components/ha-svg-icon";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { ConfigEntry, getConfigEntries } from "../../../data/config_entries";
 import {
   getConfigFlowInProgressCollection,
@@ -47,6 +48,7 @@ import {
   fetchIntegrationManifests,
   IntegrationManifest,
 } from "../../../data/integration";
+import { scanUSBDevices } from "../../../data/usb";
 import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
 import "../../../layouts/hass-loading-screen";
@@ -249,6 +251,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
     if (this.route.path === "/add") {
       this._handleAdd(localizePromise);
     }
+    this._scanUSBDevices();
   }
 
   protected updated(changed: PropertyValues) {
@@ -500,6 +503,13 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
     });
   }
 
+  private async _scanUSBDevices() {
+    if (!isComponentLoaded(this.hass, "usb")) {
+      return;
+    }
+    await scanUSBDevices(this.hass);
+  }
+
   private async _fetchManifests() {
     const fetched = await fetchIntegrationManifests(this.hass);
     // Make a copy so we can keep track of previously loaded manifests
diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts
index 4ac6414562..6449e9e7e6 100644
--- a/src/panels/config/integrations/ha-integration-card.ts
+++ b/src/panels/config/integrations/ha-integration-card.ts
@@ -549,7 +549,8 @@ export class HaIntegrationCard extends LitElement {
 
     const confirmed = await showConfirmationDialog(this, {
       text: this.hass.localize(
-        "ui.panel.config.integrations.config_entry.delete_confirm"
+        "ui.panel.config.integrations.config_entry.delete_confirm",
+        { title: configEntry.title }
       ),
     });
 
diff --git a/src/panels/config/integrations/ha-integration-header.ts b/src/panels/config/integrations/ha-integration-header.ts
index de6932d1a5..9f35837e14 100644
--- a/src/panels/config/integrations/ha-integration-header.ts
+++ b/src/panels/config/integrations/ha-integration-header.ts
@@ -34,7 +34,10 @@ export class HaIntegrationHeader extends LitElement {
 
     if (this.label) {
       primary = this.label;
-      secondary = primary === domainName ? undefined : domainName;
+      secondary =
+        primary.toLowerCase() === domainName.toLowerCase()
+          ? undefined
+          : domainName;
     } else {
       primary = domainName;
     }
@@ -78,7 +81,11 @@ export class HaIntegrationHeader extends LitElement {
       <slot name="above-header"></slot>
       <div class="header">
         <img
-          src=${brandsUrl(this.domain, "icon")}
+          src=${brandsUrl({
+            domain: this.domain,
+            type: "icon",
+            darkOptimized: this.hass.selectedTheme?.dark,
+          })}
           referrerpolicy="no-referrer"
           @error=${this._onImageError}
           @load=${this._onImageLoad}
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts b/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts
index 318744d30b..31df96cffe 100644
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts
+++ b/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts
@@ -127,8 +127,8 @@ export class ZwaveMigration extends LitElement {
                           </ol>
                           <p>
                             <b>
-                              Please take a backup or a snapshot of your
-                              environment before proceeding.
+                              Please take a backup of your environment before
+                              proceeding.
                             </b>
                           </p>
                         </div>
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
index 5903bdc044..7e04b5b354 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
@@ -15,7 +15,7 @@ import {
   NodeStatus,
   setDataCollectionPreference,
   ZWaveJSNetwork,
-  ZWaveJSNode,
+  ZWaveJSNodeStatus,
 } from "../../../../../data/zwave_js";
 import {
   ConfigEntry,
@@ -53,7 +53,7 @@ class ZWaveJSConfigDashboard extends LitElement {
 
   @state() private _network?: ZWaveJSNetwork;
 
-  @state() private _nodes?: ZWaveJSNode[];
+  @state() private _nodes?: ZWaveJSNodeStatus[];
 
   @state() private _status = "unknown";
 
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
index edaae8eb09..f060383728 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
@@ -34,8 +34,10 @@ import {
 } from "../../../../../data/device_registry";
 import {
   fetchNodeConfigParameters,
+  fetchNodeMetadata,
   setNodeConfigParameter,
   ZWaveJSNodeConfigParams,
+  ZwaveJSNodeMetadata,
   ZWaveJSSetConfigParamResult,
 } from "../../../../../data/zwave_js";
 import "../../../../../layouts/hass-tabs-subpage";
@@ -89,6 +91,8 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
   @property({ type: Array })
   private _deviceRegistryEntries?: DeviceRegistryEntry[];
 
+  @state() private _nodeMetadata?: ZwaveJSNodeMetadata;
+
   @state() private _config?: ZWaveJSNodeConfigParams;
 
   @state() private _results: Record<string, ZWaveJSSetConfigParamResult> = {};
@@ -162,7 +166,11 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
                 ${this.hass.localize(
                   "ui.panel.config.zwave_js.node_config.attribution",
                   "device_database",
-                  html`<a href="https://devices.zwave-js.io/" target="_blank"
+                  html`<a
+                    rel="noreferrer noopener"
+                    href="${this._nodeMetadata?.device_database_url ||
+                    "https://devices.zwave-js.io"}"
+                    target="_blank"
                     >${this.hass.localize(
                       "ui.panel.config.zwave_js.node_config.zwave_js_device_database"
                     )}</a
@@ -421,11 +429,10 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
       return;
     }
 
-    this._config = await fetchNodeConfigParameters(
-      this.hass,
-      this.configEntryId,
-      nodeId!
-    );
+    [this._nodeMetadata, this._config] = await Promise.all([
+      fetchNodeMetadata(this.hass, this.configEntryId, nodeId!),
+      fetchNodeConfigParameters(this.hass, this.configEntryId, nodeId!),
+    ]);
   }
 
   static get styles(): CSSResultGroup {
diff --git a/src/panels/config/script/ha-script-trace.ts b/src/panels/config/script/ha-script-trace.ts
index 520e7707e4..ca0a916b92 100644
--- a/src/panels/config/script/ha-script-trace.ts
+++ b/src/panels/config/script/ha-script-trace.ts
@@ -6,12 +6,11 @@ import {
   mdiRefresh,
 } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { repeat } from "lit/directives/repeat";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { formatDateTimeWithSeconds } from "../../../common/datetime/format_date_time";
-import type { NodeInfo } from "../../../components/trace/hat-graph";
 import "../../../components/trace/hat-script-graph";
 import { getLogbookDataForContext, LogbookEntry } from "../../../data/logbook";
 import { ScriptEntity } from "../../../data/script";
@@ -31,6 +30,10 @@ import "../../../components/trace/ha-trace-config";
 import "../../../components/trace/ha-trace-logbook";
 import "../../../components/trace/ha-trace-path-details";
 import "../../../components/trace/ha-trace-timeline";
+import type {
+  HatScriptGraph,
+  NodeInfo,
+} from "../../../components/trace/hat-script-graph";
 
 @customElement("ha-script-trace")
 export class HaScriptTrace extends LitElement {
@@ -63,12 +66,14 @@ export class HaScriptTrace extends LitElement {
     | "logbook"
     | "blueprint" = "details";
 
+  @query("hat-script-graph") private _graph?: HatScriptGraph;
+
   protected render(): TemplateResult {
     const stateObj = this.scriptEntityId
       ? this.hass.states[this.scriptEntityId]
       : undefined;
 
-    const graph = this.shadowRoot!.querySelector("hat-script-graph");
+    const graph = this._graph;
     const trackedNodes = graph?.trackedNodes;
     const renderedNodes = graph?.renderedNodes;
 
@@ -274,10 +279,10 @@ export class HaScriptTrace extends LitElement {
     this._loadTraces(params.get("run_id") || undefined);
   }
 
-  protected updated(changedProps) {
-    super.updated(changedProps);
+  public willUpdate(changedProps) {
+    super.willUpdate(changedProps);
 
-    // Only reset if automationId has changed and we had one before.
+    // Only reset if scriptEntityId has changed and we had one before.
     if (changedProps.get("scriptEntityId")) {
       this._traces = undefined;
       this._runId = undefined;
@@ -291,7 +296,6 @@ export class HaScriptTrace extends LitElement {
     if (changedProps.has("_runId") && this._runId) {
       this._trace = undefined;
       this._logbookEntries = undefined;
-      this.shadowRoot!.querySelector("select")!.value = this._runId;
       this._loadTrace();
     }
   }
@@ -417,14 +421,13 @@ export class HaScriptTrace extends LitElement {
     this._logbookEntries = traceInfo.logbookEntries;
   }
 
-  private _showTab(ev) {
+  private _showTab(ev: Event) {
     this._view = (ev.target as any).view;
   }
 
-  private _timelinePathPicked(ev) {
+  private _timelinePathPicked(ev: CustomEvent) {
     const path = ev.detail.value;
-    const nodes =
-      this.shadowRoot!.querySelector("hat-script-graph")!.trackedNodes;
+    const nodes = this._graph!.trackedNodes;
     if (nodes[path]) {
       this._selected = nodes[path];
     }
diff --git a/src/panels/energy/cards/energy-setup-wizard-card.ts b/src/panels/energy/cards/energy-setup-wizard-card.ts
index aa5178ac5f..8368e1d09a 100644
--- a/src/panels/energy/cards/energy-setup-wizard-card.ts
+++ b/src/panels/energy/cards/energy-setup-wizard-card.ts
@@ -8,6 +8,8 @@ import { LovelaceCard, Lovelace } from "../../lovelace/types";
 import "@material/mwc-button/mwc-button";
 import "../../config/energy/components/ha-energy-grid-settings";
 import "../../config/energy/components/ha-energy-solar-settings";
+import "../../config/energy/components/ha-energy-battery-settings";
+import "../../config/energy/components/ha-energy-gas-settings";
 import "../../config/energy/components/ha-energy-device-settings";
 import { haStyle } from "../../../resources/styles";
 import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
@@ -41,20 +43,32 @@ export class EnergySetupWizard extends LitElement implements LovelaceCard {
 
   protected render(): TemplateResult {
     return html`
-      <p>Step ${this._step + 1} of 3</p>
+      <p>Step ${this._step + 1} of 5</p>
       ${this._step === 0
-        ? html` <ha-energy-grid-settings
+        ? html`<ha-energy-grid-settings
             .hass=${this.hass}
             .preferences=${this._preferences}
             @value-changed=${this._prefsChanged}
           ></ha-energy-grid-settings>`
         : this._step === 1
-        ? html` <ha-energy-solar-settings
+        ? html`<ha-energy-solar-settings
             .hass=${this.hass}
             .preferences=${this._preferences}
             @value-changed=${this._prefsChanged}
           ></ha-energy-solar-settings>`
-        : html` <ha-energy-device-settings
+        : this._step === 2
+        ? html`<ha-energy-battery-settings
+            .hass=${this.hass}
+            .preferences=${this._preferences}
+            @value-changed=${this._prefsChanged}
+          ></ha-energy-battery-settings>`
+        : this._step === 3
+        ? html`<ha-energy-gas-settings
+            .hass=${this.hass}
+            .preferences=${this._preferences}
+            @value-changed=${this._prefsChanged}
+          ></ha-energy-gas-settings>`
+        : html`<ha-energy-device-settings
             .hass=${this.hass}
             .preferences=${this._preferences}
             @value-changed=${this._prefsChanged}
@@ -65,7 +79,7 @@ export class EnergySetupWizard extends LitElement implements LovelaceCard {
               >${this.hass.localize("ui.panel.energy.setup.back")}</mwc-button
             >`
           : html`<div></div>`}
-        ${this._step < 2
+        ${this._step < 4
           ? html`<mwc-button unelevated @click=${this._next}
               >${this.hass.localize("ui.panel.energy.setup.next")}</mwc-button
             >`
@@ -88,7 +102,7 @@ export class EnergySetupWizard extends LitElement implements LovelaceCard {
   }
 
   private _next() {
-    if (this._step === 2) {
+    if (this._step === 4) {
       return;
     }
     this._step++;
diff --git a/src/panels/energy/strategies/energy-strategy.ts b/src/panels/energy/strategies/energy-strategy.ts
index 49cbd113d0..60485da740 100644
--- a/src/panels/energy/strategies/energy-strategy.ts
+++ b/src/panels/energy/strategies/energy-strategy.ts
@@ -50,6 +50,7 @@ export class EnergyStrategy {
     const hasSolar = prefs.energy_sources.some(
       (source) => source.type === "solar"
     );
+    const hasGas = prefs.energy_sources.some((source) => source.type === "gas");
 
     if (info.narrow) {
       view.cards!.push({
@@ -77,6 +78,15 @@ export class EnergyStrategy {
       });
     }
 
+    // Only include if we have a gas source.
+    if (hasGas) {
+      view.cards!.push({
+        title: "Gas consumption",
+        type: "energy-gas-graph",
+        collection_key: "energy_dashboard",
+      });
+    }
+
     // Only include if we have a grid.
     if (hasGrid) {
       view.cards!.push({
diff --git a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
index bd8e13afce..2f8c98c20e 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
@@ -124,16 +124,17 @@ class HuiEnergyCarbonGaugeCard
 
     return html`
       <ha-card>
-        <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
-        <paper-tooltip animation-delay="0" for="info" position="left">
-          <span>
-            This card represents how much of the energy consumed by your home
-            was generated using non-fossil fuels like solar, wind and nuclear.
-          </span>
-        </paper-tooltip>
-
         ${value !== undefined
-          ? html` <ha-gauge
+          ? html`
+              <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
+              <paper-tooltip animation-delay="0" for="info" position="left">
+                <span>
+                  This card represents how much of the energy consumed by your
+                  home was generated using non-fossil fuels like solar, wind and
+                  nuclear.
+                </span>
+              </paper-tooltip>
+              <ha-gauge
                 min="0"
                 max="100"
                 .value=${value}
@@ -143,7 +144,8 @@ class HuiEnergyCarbonGaugeCard
                   "--gauge-color": this._computeSeverity(value),
                 })}
               ></ha-gauge>
-              <div class="name">Non-fossil energy consumed</div>`
+              <div class="name">Non-fossil energy consumed</div>
+            `
           : html`Consumed non-fossil energy couldn't be calculated`}
       </ha-card>
     `;
@@ -176,7 +178,6 @@ class HuiEnergyCarbonGaugeCard
       }
 
       ha-gauge {
-        --gauge-color: var(--label-badge-blue);
         width: 100%;
         max-width: 250px;
       }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
index 3fafe1ad12..797118fafc 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
@@ -8,7 +8,7 @@ import { getRelativePosition } from "chart.js/helpers";
 import { addHours } from "date-fns";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import memoizeOne from "memoize-one";
 import { getColorByIndex } from "../../../../common/color/colors";
@@ -19,6 +19,7 @@ import {
   numberFormatToLocale,
 } from "../../../../common/string/format_number";
 import "../../../../components/chart/ha-chart-base";
+import type HaChartBase from "../../../../components/chart/ha-chart-base";
 import "../../../../components/ha-card";
 import { EnergyData, getEnergyDataCollection } from "../../../../data/energy";
 import {
@@ -45,6 +46,8 @@ export class HuiEnergyDevicesGraphCard
 
   @state() private _chartData: ChartData = { datasets: [] };
 
+  @query("ha-chart-base") private _chart?: HaChartBase;
+
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       getEnergyDataCollection(this.hass, {
@@ -207,6 +210,8 @@ export class HuiEnergyDevicesGraphCard
     this._chartData = {
       datasets,
     };
+    await this.updateComplete;
+    this._chart?.updateChart("none");
   }
 
   static get styles(): CSSResultGroup {
diff --git a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
index 78b13d914c..6990690623 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
@@ -1,6 +1,10 @@
 import {
+  mdiArrowDown,
   mdiArrowLeft,
   mdiArrowRight,
+  mdiArrowUp,
+  mdiBatteryHigh,
+  mdiFire,
   mdiHome,
   mdiLeaf,
   mdiSolarPower,
@@ -75,14 +79,25 @@ class HuiEnergyDistrubutionCard
     const hasConsumption = true;
 
     const hasSolarProduction = types.solar !== undefined;
+    const hasBattery = types.battery !== undefined;
+    const hasGas = types.gas !== undefined;
     const hasReturnToGrid = hasConsumption && types.grid![0].flow_to.length > 0;
 
-    const totalGridConsumption =
+    const totalFromGrid =
       calculateStatisticsSumGrowth(
         this._data.stats,
         types.grid![0].flow_from.map((flow) => flow.stat_energy_from)
       ) ?? 0;
 
+    let gasUsage: number | null = null;
+    if (hasGas) {
+      gasUsage =
+        calculateStatisticsSumGrowth(
+          this._data.stats,
+          types.gas!.map((source) => source.stat_energy_from)
+        ) ?? 0;
+    }
+
     let totalSolarProduction: number | null = null;
 
     if (hasSolarProduction) {
@@ -93,30 +108,97 @@ class HuiEnergyDistrubutionCard
         ) || 0;
     }
 
-    let productionReturnedToGrid: number | null = null;
+    let totalBatteryIn: number | null = null;
+    let totalBatteryOut: number | null = null;
+
+    if (hasBattery) {
+      totalBatteryIn =
+        calculateStatisticsSumGrowth(
+          this._data.stats,
+          types.battery!.map((source) => source.stat_energy_to)
+        ) || 0;
+      totalBatteryOut =
+        calculateStatisticsSumGrowth(
+          this._data.stats,
+          types.battery!.map((source) => source.stat_energy_from)
+        ) || 0;
+    }
+
+    let returnedToGrid: number | null = null;
 
     if (hasReturnToGrid) {
-      productionReturnedToGrid =
+      returnedToGrid =
         calculateStatisticsSumGrowth(
           this._data.stats,
           types.grid![0].flow_to.map((flow) => flow.stat_energy_to)
         ) || 0;
     }
 
-    const solarConsumption = Math.max(
-      0,
-      (totalSolarProduction || 0) - (productionReturnedToGrid || 0)
-    );
+    let solarConsumption: number | null = null;
+    if (hasSolarProduction) {
+      solarConsumption =
+        (totalSolarProduction || 0) -
+        (returnedToGrid || 0) -
+        (totalBatteryIn || 0);
+    }
 
-    const totalHomeConsumption = totalGridConsumption + solarConsumption;
+    let batteryFromGrid: null | number = null;
+    let batteryToGrid: null | number = null;
+    if (solarConsumption !== null && solarConsumption < 0) {
+      // What we returned to the grid and what went in to the battery is more than produced,
+      // so we have used grid energy to fill the battery
+      // or returned battery energy to the grid
+      if (hasBattery) {
+        batteryFromGrid = solarConsumption * -1;
+        if (batteryFromGrid > totalFromGrid) {
+          batteryToGrid = Math.min(0, batteryFromGrid - totalFromGrid);
+          batteryFromGrid = totalFromGrid;
+        }
+      }
+      solarConsumption = 0;
+    }
+
+    let solarToBattery: null | number = null;
+    if (hasSolarProduction && hasBattery) {
+      if (!batteryToGrid) {
+        batteryToGrid = Math.max(
+          0,
+          (returnedToGrid || 0) -
+            (totalSolarProduction || 0) -
+            (totalBatteryIn || 0) -
+            (batteryFromGrid || 0)
+        );
+      }
+      solarToBattery = totalBatteryIn! - (batteryFromGrid || 0);
+    } else if (!hasSolarProduction && hasBattery) {
+      batteryToGrid = returnedToGrid;
+    }
+
+    let batteryConsumption: number | null = null;
+    if (hasBattery) {
+      batteryConsumption = (totalBatteryOut || 0) - (batteryToGrid || 0);
+    }
+
+    const gridConsumption = Math.max(0, totalFromGrid - (batteryFromGrid || 0));
+
+    const totalHomeConsumption = Math.max(
+      0,
+      gridConsumption + (solarConsumption || 0) + (batteryConsumption || 0)
+    );
 
     let homeSolarCircumference: number | undefined;
     if (hasSolarProduction) {
       homeSolarCircumference =
-        CIRCLE_CIRCUMFERENCE * (solarConsumption / totalHomeConsumption);
+        CIRCLE_CIRCUMFERENCE * (solarConsumption! / totalHomeConsumption);
     }
 
-    let lowCarbonConsumption: number | undefined;
+    let homeBatteryCircumference: number | undefined;
+    if (batteryConsumption) {
+      homeBatteryCircumference =
+        CIRCLE_CIRCUMFERENCE * (batteryConsumption / totalHomeConsumption);
+    }
+
+    let lowCarbonEnergy: number | undefined;
 
     let homeLowCarbonCircumference: number | undefined;
     let homeHighCarbonCircumference: number | undefined;
@@ -129,7 +211,7 @@ class HuiEnergyDistrubutionCard
       this._data.co2SignalEntity in this._data.stats
     ) {
       // Calculate high carbon consumption
-      const highCarbonConsumption = calculateStatisticsSumGrowthWithPercentage(
+      const highCarbonEnergy = calculateStatisticsSumGrowthWithPercentage(
         this._data.stats[this._data.co2SignalEntity],
         types
           .grid![0].flow_from.map(
@@ -144,8 +226,17 @@ class HuiEnergyDistrubutionCard
         electricityMapUrl += `/zone/${co2State.attributes.country_code}`;
       }
 
-      if (highCarbonConsumption !== null) {
-        lowCarbonConsumption = totalGridConsumption - highCarbonConsumption;
+      if (highCarbonEnergy !== null) {
+        lowCarbonEnergy = totalFromGrid - highCarbonEnergy;
+
+        let highCarbonConsumption: number;
+        if (gridConsumption !== totalFromGrid) {
+          // Only get the part that was used for consumption and not the battery
+          highCarbonConsumption =
+            highCarbonEnergy * (gridConsumption / totalFromGrid);
+        } else {
+          highCarbonConsumption = highCarbonEnergy;
+        }
 
         homeHighCarbonCircumference =
           CIRCLE_CIRCUMFERENCE * (highCarbonConsumption / totalHomeConsumption);
@@ -153,16 +244,26 @@ class HuiEnergyDistrubutionCard
         homeLowCarbonCircumference =
           CIRCLE_CIRCUMFERENCE -
           (homeSolarCircumference || 0) -
+          (homeBatteryCircumference || 0) -
           homeHighCarbonCircumference;
       }
     }
 
+    const totalLines =
+      gridConsumption +
+      (solarConsumption || 0) +
+      (returnedToGrid ? returnedToGrid - (batteryToGrid || 0) : 0) +
+      (solarToBattery || 0) +
+      (batteryConsumption || 0) +
+      (batteryFromGrid || 0) +
+      (batteryToGrid || 0);
+
     return html`
       <ha-card .header=${this._config.title}>
         <div class="card-content">
-          ${lowCarbonConsumption !== undefined || hasSolarProduction
+          ${lowCarbonEnergy !== undefined || hasSolarProduction || hasGas
             ? html`<div class="row">
-                ${lowCarbonConsumption === undefined
+                ${lowCarbonEnergy === undefined
                   ? html`<div class="spacer"></div>`
                   : html`<div class="circle-container low-carbon">
                       <span class="label">Non-fossil</span>
@@ -173,12 +274,10 @@ class HuiEnergyDistrubutionCard
                         rel="noopener no referrer"
                       >
                         <ha-svg-icon .path="${mdiLeaf}"></ha-svg-icon>
-                        ${lowCarbonConsumption
-                          ? formatNumber(
-                              lowCarbonConsumption,
-                              this.hass.locale,
-                              { maximumFractionDigits: 1 }
-                            )
+                        ${lowCarbonEnergy
+                          ? formatNumber(lowCarbonEnergy, this.hass.locale, {
+                              maximumFractionDigits: 1,
+                            })
                           : "-"}
                         kWh
                       </a>
@@ -199,41 +298,68 @@ class HuiEnergyDistrubutionCard
                         kWh
                       </div>
                     </div>`
+                  : hasGas
+                  ? html`<div class="spacer"></div>`
                   : ""}
-                <div class="spacer"></div>
+                ${hasGas
+                  ? html`<div class="circle-container gas">
+                      <span class="label">Gas</span>
+                      <div class="circle">
+                        <ha-svg-icon .path="${mdiFire}"></ha-svg-icon>
+                        ${formatNumber(gasUsage || 0, this.hass.locale, {
+                          maximumFractionDigits: 1,
+                        })}
+                        m³
+                      </div>
+                      <svg width="80" height="30">
+                        <path d="M40 0 v30" id="gas" />
+                        ${gasUsage
+                          ? svg`<circle
+                    r="1"
+                    class="gas"
+                    vector-effect="non-scaling-stroke"
+                  >
+                    <animateMotion
+                      dur="2s"
+                      repeatCount="indefinite"
+                      calcMode="linear"
+                    >
+                      <mpath xlink:href="#gas" />
+                    </animateMotion>
+                  </circle>`
+                          : ""}
+                      </svg>
+                    </div>`
+                  : html`<div class="spacer"></div>`}
               </div>`
             : ""}
           <div class="row">
             <div class="circle-container grid">
               <div class="circle">
                 <ha-svg-icon .path="${mdiTransmissionTower}"></ha-svg-icon>
+                ${returnedToGrid !== null
+                  ? html`<span class="return">
+                      <ha-svg-icon
+                        class="small"
+                        .path=${mdiArrowLeft}
+                      ></ha-svg-icon
+                      >${formatNumber(returnedToGrid, this.hass.locale, {
+                        maximumFractionDigits: 1,
+                      })}
+                      kWh
+                    </span>`
+                  : ""}
                 <span class="consumption">
                   ${hasReturnToGrid
                     ? html`<ha-svg-icon
                         class="small"
                         .path=${mdiArrowRight}
                       ></ha-svg-icon>`
-                    : ""}${formatNumber(
-                    totalGridConsumption,
-                    this.hass.locale,
-                    { maximumFractionDigits: 1 }
-                  )}
+                    : ""}${formatNumber(totalFromGrid, this.hass.locale, {
+                    maximumFractionDigits: 1,
+                  })}
                   kWh
                 </span>
-                ${productionReturnedToGrid !== null
-                  ? html`<span class="return">
-                      <ha-svg-icon
-                        class="small"
-                        .path=${mdiArrowLeft}
-                      ></ha-svg-icon
-                      >${formatNumber(
-                        productionReturnedToGrid,
-                        this.hass.locale,
-                        { maximumFractionDigits: 1 }
-                      )}
-                      kWh
-                    </span>`
-                  : ""}
               </div>
               <span class="label">Grid</span>
             </div>
@@ -268,6 +394,23 @@ class HuiEnergyDistrubutionCard
                             }"
                           />`
                         : ""}
+                      ${homeBatteryCircumference
+                        ? svg`<circle
+                            class="battery"
+                            cx="40"
+                            cy="40"
+                            r="38"
+                            stroke-dasharray="${homeBatteryCircumference} ${
+                            CIRCLE_CIRCUMFERENCE - homeBatteryCircumference
+                          }"
+                            stroke-dashoffset="-${
+                              CIRCLE_CIRCUMFERENCE -
+                              homeBatteryCircumference -
+                              (homeSolarCircumference || 0)
+                            }"
+                            shape-rendering="geometricPrecision"
+                          />`
+                        : ""}
                       ${homeLowCarbonCircumference
                         ? svg`<circle
                             class="low-carbon"
@@ -280,6 +423,7 @@ class HuiEnergyDistrubutionCard
                             stroke-dashoffset="-${
                               CIRCLE_CIRCUMFERENCE -
                               homeLowCarbonCircumference -
+                              (homeBatteryCircumference || 0) -
                               (homeSolarCircumference || 0)
                             }"
                             shape-rendering="geometricPrecision"
@@ -292,10 +436,12 @@ class HuiEnergyDistrubutionCard
                         r="38"
                         stroke-dasharray="${homeHighCarbonCircumference ??
                         CIRCLE_CIRCUMFERENCE -
-                          homeSolarCircumference!} ${homeHighCarbonCircumference !==
-                        undefined
+                          homeSolarCircumference! -
+                          (homeBatteryCircumference ||
+                            0)} ${homeHighCarbonCircumference !== undefined
                           ? CIRCLE_CIRCUMFERENCE - homeHighCarbonCircumference
-                          : homeSolarCircumference}"
+                          : homeSolarCircumference! +
+                            (homeBatteryCircumference || 0)}"
                         stroke-dashoffset="0"
                         shape-rendering="geometricPrecision"
                       />
@@ -305,7 +451,39 @@ class HuiEnergyDistrubutionCard
               <span class="label">Home</span>
             </div>
           </div>
-          <div class="lines">
+          ${hasBattery
+            ? html`<div class="row">
+                <div class="spacer"></div>
+                <div class="circle-container battery">
+                  <div class="circle">
+                    <ha-svg-icon .path="${mdiBatteryHigh}"></ha-svg-icon>
+                    <span class="battery-in">
+                      <ha-svg-icon
+                        class="small"
+                        .path=${mdiArrowDown}
+                      ></ha-svg-icon
+                      >${formatNumber(totalBatteryIn || 0, this.hass.locale, {
+                        maximumFractionDigits: 1,
+                      })}
+                      kWh</span
+                    >
+                    <span class="battery-out">
+                      <ha-svg-icon
+                        class="small"
+                        .path=${mdiArrowUp}
+                      ></ha-svg-icon>
+                      ${formatNumber(totalBatteryOut || 0, this.hass.locale, {
+                        maximumFractionDigits: 1,
+                      })}
+                      kWh</span
+                    >
+                  </div>
+                  <span class="label">Battery</span>
+                </div>
+                <div class="spacer"></div>
+              </div>`
+            : ""}
+          <div class="lines ${classMap({ battery: hasBattery })}">
             <svg
               viewBox="0 0 100 100"
               xmlns="http://www.w3.org/2000/svg"
@@ -315,7 +493,9 @@ class HuiEnergyDistrubutionCard
                 ? svg`<path
                     id="return"
                     class="return"
-                    d="M47,0 v15 c0,40 -10,35 -30,35 h-20"
+                    d="M${hasBattery ? 45 : 47},0 v15 c0,${
+                    hasBattery ? "35 -10,30 -30,30" : "40 -10,35 -30,35"
+                  } h-20"
                     vector-effect="non-scaling-stroke"
                   ></path> `
                 : ""}
@@ -323,19 +503,45 @@ class HuiEnergyDistrubutionCard
                 ? svg`<path
                     id="solar"
                     class="solar"
-                    d="M${
-                      hasReturnToGrid ? 53 : 50
-                    },0 v15 c0,40 10,35 30,35 h20"
+                    d="M${hasBattery ? 55 : 53},0 v15 c0,${
+                    hasBattery ? "35 10,30 30,30" : "40 10,35 30,35"
+                  } h20"
+                    vector-effect="non-scaling-stroke"
+                  ></path>`
+                : ""}
+              ${hasBattery
+                ? svg`<path
+                    id="battery-house"
+                    class="battery-house"
+                    d="M55,100 v-15 c0,-35 10,-30 30,-30 h20"
+                    vector-effect="non-scaling-stroke"
+                  ></path>
+                  <path
+                    id="battery-grid"
+                    class=${classMap({
+                      "battery-from-grid": Boolean(batteryFromGrid),
+                      "battery-to-grid": Boolean(batteryToGrid),
+                    })}
+                    d="M45,100 v-15 c0,-35 -10,-30 -30,-30 h-20"
+                    vector-effect="non-scaling-stroke"
+                  ></path>
+                  `
+                : ""}
+              ${hasBattery && hasSolarProduction
+                ? svg`<path
+                    id="battery-solar"
+                    class="battery-solar"
+                    d="M50,0 V100"
                     vector-effect="non-scaling-stroke"
                   ></path>`
                 : ""}
               <path
                 class="grid"
                 id="grid"
-                d="M0,${hasSolarProduction ? 56 : 53} H100"
+                d="M0,${hasBattery ? 50 : hasSolarProduction ? 56 : 53} H100"
                 vector-effect="non-scaling-stroke"
               ></path>
-              ${productionReturnedToGrid && hasSolarProduction
+              ${returnedToGrid && hasSolarProduction
                 ? svg`<circle
                     r="1"
                     class="return"
@@ -344,61 +550,107 @@ class HuiEnergyDistrubutionCard
                     <animateMotion
                       dur="${
                         6 -
-                        (productionReturnedToGrid /
-                          (totalGridConsumption +
-                            (totalSolarProduction || 0))) *
-                          5
+                        ((returnedToGrid - (batteryToGrid || 0)) / totalLines) *
+                          6
                       }s"
                       repeatCount="indefinite"
-                      rotate="auto"
+                      calcMode="linear"
                     >
                       <mpath xlink:href="#return" />
                     </animateMotion>
                   </circle>`
                 : ""}
-              ${totalSolarProduction
+              ${solarConsumption
                 ? svg`<circle
                     r="1"
                     class="solar"
                     vector-effect="non-scaling-stroke"
                   >
                     <animateMotion
-                      dur="${
-                        6 -
-                        ((totalSolarProduction -
-                          (productionReturnedToGrid || 0)) /
-                          (totalGridConsumption +
-                            (totalSolarProduction || 0))) *
-                          5
-                      }s"
+                      dur="${6 - (solarConsumption / totalLines) * 5}s"
                       repeatCount="indefinite"
-                      rotate="auto"
+                      calcMode="linear"
                     >
                       <mpath xlink:href="#solar" />
                     </animateMotion>
                   </circle>`
                 : ""}
-              ${totalGridConsumption
+              ${gridConsumption
                 ? svg`<circle
                     r="1"
                     class="grid"
                     vector-effect="non-scaling-stroke"
                   >
                     <animateMotion
-                      dur="${
-                        6 -
-                        (totalGridConsumption /
-                          (totalGridConsumption +
-                            (totalSolarProduction || 0))) *
-                          5
-                      }s"
+                      dur="${6 - (gridConsumption / totalLines) * 5}s"
                       repeatCount="indefinite"
-                      rotate="auto"
+                      calcMode="linear"
                     >
                       <mpath xlink:href="#grid" />
                     </animateMotion>
                   </circle>`
                 : ""}
+              ${solarToBattery
+                ? svg`<circle
+                    r="1"
+                    class="battery-solar"
+                    vector-effect="non-scaling-stroke"
+                  >
+                    <animateMotion
+                      dur="${6 - (solarToBattery / totalLines) * 5}s"
+                      repeatCount="indefinite"
+                      calcMode="linear"
+                    >
+                      <mpath xlink:href="#battery-solar" />
+                    </animateMotion>
+                  </circle>`
+                : ""}
+              ${batteryConsumption
+                ? svg`<circle
+                    r="1"
+                    class="battery-house"
+                    vector-effect="non-scaling-stroke"
+                  >
+                    <animateMotion
+                      dur="${6 - (batteryConsumption / totalLines) * 5}s"
+                      repeatCount="indefinite"
+                      calcMode="linear"
+                    >
+                      <mpath xlink:href="#battery-house" />
+                    </animateMotion>
+                  </circle>`
+                : ""}
+              ${batteryFromGrid
+                ? svg`<circle
+                    r="1"
+                    class="battery-from-grid"
+                    vector-effect="non-scaling-stroke"
+                  >
+                    <animateMotion
+                      dur="${6 - (batteryFromGrid / totalLines) * 5}s"
+                      repeatCount="indefinite"
+                      keyPoints="1;0" keyTimes="0;1"
+                      calcMode="linear"
+                    >
+                      <mpath xlink:href="#battery-grid" />
+                    </animateMotion>
+                  </circle>`
+                : ""}
+              ${batteryToGrid
+                ? svg`<circle
+                    r="1"
+                    class="battery-to-grid"
+                    vector-effect="non-scaling-stroke"
+                  >
+                    <animateMotion
+                      dur="${6 - (batteryToGrid / totalLines) * 5}s"
+                      repeatCount="indefinite"
+                      calcMode="linear"
+                    >
+                      <mpath xlink:href="#battery-grid" />
+                    </animateMotion>
+                  </circle>`
+                : ""}
             </svg>
           </div>
         </div>
@@ -433,6 +685,10 @@ class HuiEnergyDistrubutionCard
       padding: 0 16px 16px;
       box-sizing: border-box;
     }
+    .lines.battery {
+      bottom: 100px;
+      height: 156px;
+    }
     .lines svg {
       width: calc(100% - 160px);
       height: 100%;
@@ -453,9 +709,17 @@ class HuiEnergyDistrubutionCard
       margin-right: 4px;
     }
     .circle-container.solar {
+      margin: 0 4px;
+      height: 130px;
+    }
+    .circle-container.gas {
       margin-left: 4px;
       height: 130px;
     }
+    .circle-container.battery {
+      height: 110px;
+      justify-content: flex-end;
+    }
     .spacer {
       width: 84px;
     }
@@ -499,6 +763,17 @@ class HuiEnergyDistrubutionCard
       width: 100%;
       height: 100%;
     }
+    .gas path,
+    .gas circle {
+      stroke: var(--energy-gas-color);
+    }
+    circle.gas {
+      stroke-width: 4;
+      fill: var(--energy-gas-color);
+    }
+    .gas .circle {
+      border-color: var(--energy-gas-color);
+    }
     .low-carbon line {
       stroke: var(--energy-non-fossil-color);
     }
@@ -523,11 +798,48 @@ class HuiEnergyDistrubutionCard
       stroke-width: 4;
       fill: var(--energy-solar-color);
     }
-    path.return,
-    circle.return {
+    .battery .circle {
+      border-color: var(--energy-battery-in-color);
+    }
+    circle.battery,
+    path.battery {
+      stroke: var(--energy-battery-out-color);
+    }
+    path.battery-house,
+    circle.battery-house {
+      stroke: var(--energy-battery-out-color);
+    }
+    circle.battery-house {
+      stroke-width: 4;
+      fill: var(--energy-battery-out-color);
+    }
+    path.battery-solar,
+    circle.battery-solar {
+      stroke: var(--energy-battery-in-color);
+    }
+    circle.battery-solar {
+      stroke-width: 4;
+      fill: var(--energy-battery-in-color);
+    }
+    .battery-in {
+      color: var(--energy-battery-in-color);
+    }
+    .battery-out {
+      color: var(--energy-battery-out-color);
+    }
+    path.battery-from-grid {
+      stroke: var(--energy-grid-consumption-color);
+    }
+    path.battery-to-grid {
       stroke: var(--energy-grid-return-color);
     }
-    circle.return {
+    path.return,
+    circle.return,
+    circle.battery-to-grid {
+      stroke: var(--energy-grid-return-color);
+    }
+    circle.return,
+    circle.battery-to-grid {
       stroke-width: 4;
       fill: var(--energy-grid-return-color);
     }
@@ -541,10 +853,12 @@ class HuiEnergyDistrubutionCard
       color: var(--energy-grid-consumption-color);
     }
     circle.grid,
+    circle.battery-from-grid,
     path.grid {
       stroke: var(--energy-grid-consumption-color);
     }
-    circle.grid {
+    circle.grid,
+    circle.battery-from-grid {
       stroke-width: 4;
       fill: var(--energy-grid-consumption-color);
     }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
new file mode 100644
index 0000000000..306b5c89fa
--- /dev/null
+++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
@@ -0,0 +1,343 @@
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
+import memoizeOne from "memoize-one";
+import { classMap } from "lit/directives/class-map";
+import "../../../../components/ha-card";
+import {
+  ChartData,
+  ChartDataset,
+  ChartOptions,
+  ScatterDataPoint,
+} from "chart.js";
+import { differenceInDays, endOfToday, isToday, startOfToday } from "date-fns";
+import { HomeAssistant } from "../../../../types";
+import { LovelaceCard } from "../../types";
+import { EnergyGasGraphCardConfig } from "../types";
+import {
+  hex2rgb,
+  lab2rgb,
+  rgb2hex,
+  rgb2lab,
+} from "../../../../common/color/convert-color";
+import { labDarken } from "../../../../common/color/lab";
+import {
+  EnergyData,
+  getEnergyDataCollection,
+  GasSourceTypeEnergyPreference,
+} from "../../../../data/energy";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
+import "../../../../components/chart/ha-chart-base";
+import {
+  formatNumber,
+  numberFormatToLocale,
+} from "../../../../common/string/format_number";
+import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
+import { FrontendLocaleData } from "../../../../data/translation";
+import {
+  reduceSumStatisticsByMonth,
+  reduceSumStatisticsByDay,
+} from "../../../../data/history";
+
+@customElement("hui-energy-gas-graph-card")
+export class HuiEnergyGasGraphCard
+  extends SubscribeMixin(LitElement)
+  implements LovelaceCard
+{
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @state() private _config?: EnergyGasGraphCardConfig;
+
+  @state() private _chartData: ChartData = {
+    datasets: [],
+  };
+
+  @state() private _start = startOfToday();
+
+  @state() private _end = endOfToday();
+
+  public hassSubscribe(): UnsubscribeFunc[] {
+    return [
+      getEnergyDataCollection(this.hass, {
+        key: this._config?.collection_key,
+      }).subscribe((data) => this._getStatistics(data)),
+    ];
+  }
+
+  public getCardSize(): Promise<number> | number {
+    return 3;
+  }
+
+  public setConfig(config: EnergyGasGraphCardConfig): void {
+    this._config = config;
+  }
+
+  protected render(): TemplateResult {
+    if (!this.hass || !this._config) {
+      return html``;
+    }
+
+    return html`
+      <ha-card>
+        ${this._config.title
+          ? html`<h1 class="card-header">${this._config.title}</h1>`
+          : ""}
+        <div
+          class="content ${classMap({
+            "has-header": !!this._config.title,
+          })}"
+        >
+          <ha-chart-base
+            .data=${this._chartData}
+            .options=${this._createOptions(
+              this._start,
+              this._end,
+              this.hass.locale
+            )}
+            chart-type="bar"
+          ></ha-chart-base>
+          ${!this._chartData.datasets.length
+            ? html`<div class="no-data">
+                ${isToday(this._start)
+                  ? "There is no data to show. It can take up to 2 hours for new data to arrive after you configure your energy dashboard."
+                  : "There is no data for this period."}
+              </div>`
+            : ""}
+        </div>
+      </ha-card>
+    `;
+  }
+
+  private _createOptions = memoizeOne(
+    (start: Date, end: Date, locale: FrontendLocaleData): ChartOptions => {
+      const dayDifference = differenceInDays(end, start);
+      return {
+        parsing: false,
+        animation: false,
+        scales: {
+          x: {
+            type: "time",
+            suggestedMin: start.getTime(),
+            suggestedMax: end.getTime(),
+            adapters: {
+              date: {
+                locale: locale,
+              },
+            },
+            ticks: {
+              maxRotation: 0,
+              sampleSize: 5,
+              autoSkipPadding: 20,
+              major: {
+                enabled: true,
+              },
+              font: (context) =>
+                context.tick && context.tick.major
+                  ? ({ weight: "bold" } as any)
+                  : {},
+            },
+            time: {
+              tooltipFormat:
+                dayDifference > 35
+                  ? "monthyear"
+                  : dayDifference > 7
+                  ? "date"
+                  : dayDifference > 2
+                  ? "weekday"
+                  : dayDifference > 0
+                  ? "datetime"
+                  : "hour",
+              minUnit:
+                dayDifference > 35
+                  ? "month"
+                  : dayDifference > 2
+                  ? "day"
+                  : "hour",
+            },
+            offset: true,
+          },
+          y: {
+            type: "linear",
+            title: {
+              display: true,
+              text: "m³",
+            },
+            ticks: {
+              beginAtZero: true,
+            },
+          },
+        },
+        plugins: {
+          tooltip: {
+            mode: "nearest",
+            callbacks: {
+              label: (context) =>
+                `${context.dataset.label}: ${formatNumber(
+                  context.parsed.y,
+                  locale
+                )} m³`,
+            },
+          },
+          filler: {
+            propagate: false,
+          },
+          legend: {
+            display: false,
+            labels: {
+              usePointStyle: true,
+            },
+          },
+        },
+        hover: {
+          mode: "nearest",
+        },
+        elements: {
+          bar: { borderWidth: 1.5, borderRadius: 4 },
+          point: {
+            hitRadius: 5,
+          },
+        },
+        // @ts-expect-error
+        locale: numberFormatToLocale(locale),
+      };
+    }
+  );
+
+  private async _getStatistics(energyData: EnergyData): Promise<void> {
+    const gasSources: GasSourceTypeEnergyPreference[] =
+      energyData.prefs.energy_sources.filter(
+        (source) => source.type === "gas"
+      ) as GasSourceTypeEnergyPreference[];
+
+    const statisticsData = Object.values(energyData.stats);
+    const datasets: ChartDataset<"bar">[] = [];
+    let endTime: Date;
+
+    endTime = new Date(
+      Math.max(
+        ...statisticsData.map((stats) =>
+          stats.length ? new Date(stats[stats.length - 1].start).getTime() : 0
+        )
+      )
+    );
+
+    if (!endTime || endTime > new Date()) {
+      endTime = new Date();
+    }
+
+    const computedStyles = getComputedStyle(this);
+    const gasColor = computedStyles
+      .getPropertyValue("--energy-gas-color")
+      .trim();
+
+    const dayDifference = differenceInDays(
+      energyData.end || new Date(),
+      energyData.start
+    );
+
+    gasSources.forEach((source, idx) => {
+      const data: ChartDataset<"bar" | "line">[] = [];
+      const entity = this.hass.states[source.stat_energy_from];
+
+      const borderColor =
+        idx > 0
+          ? rgb2hex(lab2rgb(labDarken(rgb2lab(hex2rgb(gasColor)), idx)))
+          : gasColor;
+
+      let prevValue: number | null = null;
+      let prevStart: string | null = null;
+
+      const gasConsumptionData: ScatterDataPoint[] = [];
+
+      // Process gas consumption data.
+      if (source.stat_energy_from in energyData.stats) {
+        const stats =
+          dayDifference > 35
+            ? reduceSumStatisticsByMonth(
+                energyData.stats[source.stat_energy_from]
+              )
+            : dayDifference > 2
+            ? reduceSumStatisticsByDay(
+                energyData.stats[source.stat_energy_from]
+              )
+            : energyData.stats[source.stat_energy_from];
+
+        for (const point of stats) {
+          if (point.sum === null) {
+            continue;
+          }
+          if (prevValue === null) {
+            prevValue = point.sum;
+            continue;
+          }
+          if (prevStart === point.start) {
+            continue;
+          }
+          const value = point.sum - prevValue;
+          const date = new Date(point.start);
+          gasConsumptionData.push({
+            x: date.getTime(),
+            y: value,
+          });
+          prevStart = point.start;
+          prevValue = point.sum;
+        }
+      }
+
+      if (gasConsumptionData.length) {
+        data.push({
+          label: entity ? computeStateName(entity) : source.stat_energy_from,
+          borderColor,
+          backgroundColor: borderColor + "7F",
+          data: gasConsumptionData,
+        });
+      }
+
+      // Concat two arrays
+      Array.prototype.push.apply(datasets, data);
+    });
+
+    this._start = energyData.start;
+    this._end = energyData.end || endOfToday();
+
+    this._chartData = {
+      datasets,
+    };
+  }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      ha-card {
+        height: 100%;
+      }
+      .card-header {
+        padding-bottom: 0;
+      }
+      .content {
+        padding: 16px;
+      }
+      .has-header {
+        padding-top: 0;
+      }
+      .no-data {
+        position: absolute;
+        height: 100%;
+        top: 0;
+        left: 0;
+        right: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 20%;
+        margin-left: 32px;
+        box-sizing: border-box;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-energy-gas-graph-card": HuiEnergyGasGraphCard;
+  }
+}
diff --git a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts
index 76fa398d34..a2df7e1b83 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts
@@ -18,11 +18,12 @@ import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../../../../types";
 import type { LovelaceCard } from "../../types";
 import type { EnergyGridGaugeCardConfig } from "../types";
+import { severityMap } from "../hui-gauge-card";
 
 const LEVELS: LevelDefinition[] = [
-  { level: -1, stroke: "var(--label-badge-red)" },
-  { level: -0.2, stroke: "var(--label-badge-yellow)" },
-  { level: 0, stroke: "var(--label-badge-green)" },
+  { level: -1, stroke: severityMap.red },
+  { level: -0.2, stroke: severityMap.yellow },
+  { level: 0, stroke: severityMap.green },
 ];
 
 @customElement("hui-energy-grid-neutrality-gauge-card")
@@ -96,18 +97,20 @@ class HuiEnergyGridGaugeCard
 
     return html`
       <ha-card>
-        <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
-        <paper-tooltip animation-delay="0" for="info" position="left">
-          <span>
-            This card represents your energy dependency.
-            <br /><br />
-            If it's green, it means you produced more energy than that you
-            consumed from the grid. If it's in the red, it means that you relied
-            on the grid for part of your home's energy consumption.
-          </span>
-        </paper-tooltip>
         ${value !== undefined
-          ? html`<ha-gauge
+          ? html`
+              <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
+              <paper-tooltip animation-delay="0" for="info" position="left">
+                <span>
+                  This card represents your energy dependency.
+                  <br /><br />
+                  If it's green, it means you produced more energy than that you
+                  consumed from the grid. If it's in the red, it means that you
+                  relied on the grid for part of your home's energy consumption.
+                </span>
+              </paper-tooltip>
+
+              <ha-gauge
                 min="-1"
                 max="1"
                 .value=${value}
@@ -123,9 +126,10 @@ class HuiEnergyGridGaugeCard
               ></ha-gauge>
               <div class="name">
                 ${returnedToGrid! >= consumedFromGrid!
-                  ? "Netto returned to the grid"
-                  : "Netto consumed from the grid"}
-              </div>`
+                  ? "Net returned to the grid"
+                  : "Net consumed from the grid"}
+              </div>
+            `
           : "Grid neutrality could not be calculated"}
       </ha-card>
     `;
diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts
index 1a0cbaed2b..fdb2f5d3b0 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts
@@ -86,19 +86,20 @@ class HuiEnergySolarGaugeCard
 
     return html`
       <ha-card>
-        <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
-        <paper-tooltip animation-delay="0" for="info" position="left">
-          <span>
-            This card represents how much of the solar energy was used by your
-            home and was not returned to the grid.
-            <br /><br />
-            If you frequently produce more than you consume, try to conserve
-            this energy by installing a battery or buying an electric car to
-            charge.
-          </span>
-        </paper-tooltip>
         ${value !== undefined
-          ? html`<ha-gauge
+          ? html`
+              <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
+              <paper-tooltip animation-delay="0" for="info" position="left">
+                <span>
+                  This card represents how much of the solar energy was used by
+                  your home and was not returned to the grid.
+                  <br /><br />
+                  If you frequently produce more than you consume, try to
+                  conserve this energy by installing a battery or buying an
+                  electric car to charge.
+                </span>
+              </paper-tooltip>
+              <ha-gauge
                 min="0"
                 max="100"
                 .value=${value}
@@ -108,7 +109,8 @@ class HuiEnergySolarGaugeCard
                   "--gauge-color": this._computeSeverity(value),
                 })}
               ></ha-gauge>
-              <div class="name">Self consumed solar energy</div>`
+              <div class="name">Self consumed solar energy</div>
+            `
           : totalSolarProduction === 0
           ? "You have not produced any solar energy"
           : "Self consumed solar energy couldn't be calculated"}
@@ -140,7 +142,6 @@ class HuiEnergySolarGaugeCard
       }
 
       ha-gauge {
-        --gauge-color: var(--label-badge-blue);
         width: 100%;
         max-width: 250px;
       }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
index 4c89451e97..965b1db4c0 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
@@ -10,7 +10,7 @@ import {
   ChartOptions,
   ScatterDataPoint,
 } from "chart.js";
-import { endOfToday, isToday, startOfToday } from "date-fns";
+import { differenceInDays, endOfToday, isToday, startOfToday } from "date-fns";
 import { HomeAssistant } from "../../../../types";
 import { LovelaceCard } from "../../types";
 import { EnergySolarGraphCardConfig } from "../types";
@@ -23,14 +23,11 @@ import {
 import { labDarken } from "../../../../common/color/lab";
 import {
   EnergyData,
+  EnergySolarForecasts,
   getEnergyDataCollection,
+  getEnergySolarForecasts,
   SolarSourceTypeEnergyPreference,
 } from "../../../../data/energy";
-import { isComponentLoaded } from "../../../../common/config/is_component_loaded";
-import {
-  ForecastSolarForecast,
-  getForecastSolarForecasts,
-} from "../../../../data/forecast_solar";
 import { computeStateName } from "../../../../common/entity/compute_state_name";
 import "../../../../components/chart/ha-chart-base";
 import {
@@ -39,6 +36,10 @@ import {
 } from "../../../../common/string/format_number";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { FrontendLocaleData } from "../../../../data/translation";
+import {
+  reduceSumStatisticsByMonth,
+  reduceSumStatisticsByDay,
+} from "../../../../data/history";
 
 @customElement("hui-energy-solar-graph-card")
 export class HuiEnergySolarGraphCard
@@ -110,84 +111,102 @@ export class HuiEnergySolarGraphCard
   }
 
   private _createOptions = memoizeOne(
-    (start: Date, end: Date, locale: FrontendLocaleData): ChartOptions => ({
-      parsing: false,
-      animation: false,
-      scales: {
-        x: {
-          type: "time",
-          suggestedMin: start.getTime(),
-          suggestedMax: end.getTime(),
-          adapters: {
-            date: {
-              locale: locale,
+    (start: Date, end: Date, locale: FrontendLocaleData): ChartOptions => {
+      const dayDifference = differenceInDays(end, start);
+      return {
+        parsing: false,
+        animation: false,
+        scales: {
+          x: {
+            type: "time",
+            suggestedMin: start.getTime(),
+            suggestedMax: end.getTime(),
+            adapters: {
+              date: {
+                locale: locale,
+              },
+            },
+            ticks: {
+              maxRotation: 0,
+              sampleSize: 5,
+              autoSkipPadding: 20,
+              major: {
+                enabled: true,
+              },
+              font: (context) =>
+                context.tick && context.tick.major
+                  ? ({ weight: "bold" } as any)
+                  : {},
+            },
+            time: {
+              tooltipFormat:
+                dayDifference > 35
+                  ? "monthyear"
+                  : dayDifference > 7
+                  ? "date"
+                  : dayDifference > 2
+                  ? "weekday"
+                  : dayDifference > 0
+                  ? "datetime"
+                  : "hour",
+              minUnit:
+                dayDifference > 35
+                  ? "month"
+                  : dayDifference > 2
+                  ? "day"
+                  : "hour",
+            },
+            offset: true,
+          },
+          y: {
+            type: "linear",
+            title: {
+              display: true,
+              text: "kWh",
+            },
+            ticks: {
+              beginAtZero: true,
             },
           },
-          ticks: {
-            maxRotation: 0,
-            sampleSize: 5,
-            autoSkipPadding: 20,
-            major: {
-              enabled: true,
+        },
+        plugins: {
+          tooltip: {
+            mode: "nearest",
+            callbacks: {
+              label: (context) =>
+                `${context.dataset.label}: ${formatNumber(
+                  context.parsed.y,
+                  locale
+                )} kWh`,
             },
-            font: (context) =>
-              context.tick && context.tick.major
-                ? ({ weight: "bold" } as any)
-                : {},
           },
-          time: {
-            tooltipFormat: "datetime",
+          filler: {
+            propagate: false,
           },
-          offset: true,
-        },
-        y: {
-          type: "linear",
-          title: {
-            display: true,
-            text: "kWh",
-          },
-          ticks: {
-            beginAtZero: true,
+          legend: {
+            display: false,
+            labels: {
+              usePointStyle: true,
+            },
           },
         },
-      },
-      plugins: {
-        tooltip: {
+        hover: {
           mode: "nearest",
-          callbacks: {
-            label: (context) =>
-              `${context.dataset.label}: ${formatNumber(
-                context.parsed.y,
-                locale
-              )} kWh`,
+        },
+        elements: {
+          line: {
+            tension: 0.3,
+            borderWidth: 1.5,
+          },
+          bar: { borderWidth: 1.5, borderRadius: 4 },
+          point: {
+            hitRadius: 5,
           },
         },
-        filler: {
-          propagate: false,
-        },
-        legend: {
-          display: false,
-          labels: {
-            usePointStyle: true,
-          },
-        },
-      },
-      hover: {
-        mode: "nearest",
-      },
-      elements: {
-        line: {
-          tension: 0.3,
-          borderWidth: 1.5,
-        },
-        bar: { borderWidth: 1.5, borderRadius: 4 },
-        point: {
-          hitRadius: 5,
-        },
-      },
-      // @ts-expect-error
-      locale: numberFormatToLocale(locale),
-    })
+        // @ts-expect-error
+        locale: numberFormatToLocale(locale),
+      };
+    }
   );
 
   private async _getStatistics(energyData: EnergyData): Promise<void> {
@@ -196,12 +215,15 @@ export class HuiEnergySolarGraphCard
         (source) => source.type === "solar"
       ) as SolarSourceTypeEnergyPreference[];
 
-    let forecasts: Record<string, ForecastSolarForecast>;
+    let forecasts: EnergySolarForecasts | undefined;
     if (
-      isComponentLoaded(this.hass, "forecast_solar") &&
-      solarSources.some((source) => source.config_entry_solar_forecast)
+      solarSources.some((source) => source.config_entry_solar_forecast?.length)
     ) {
-      forecasts = await getForecastSolarForecasts(this.hass);
+      try {
+        forecasts = await getEnergySolarForecasts(this.hass);
+      } catch (_e) {
+        // ignore
+      }
     }
 
     const statisticsData = Object.values(energyData.stats);
@@ -225,6 +247,11 @@ export class HuiEnergySolarGraphCard
       .getPropertyValue("--energy-solar-color")
       .trim();
 
+    const dayDifference = differenceInDays(
+      energyData.end || new Date(),
+      energyData.start
+    );
+
     solarSources.forEach((source, idx) => {
       const data: ChartDataset<"bar" | "line">[] = [];
       const entity = this.hass.states[source.stat_energy_from];
@@ -240,9 +267,20 @@ export class HuiEnergySolarGraphCard
       const solarProductionData: ScatterDataPoint[] = [];
 
       // Process solar production data.
-      if (energyData.stats[source.stat_energy_from]) {
-        for (const point of energyData.stats[source.stat_energy_from]) {
-          if (!point.sum) {
+      if (source.stat_energy_from in energyData.stats) {
+        const stats =
+          dayDifference > 35
+            ? reduceSumStatisticsByMonth(
+                energyData.stats[source.stat_energy_from]
+              )
+            : dayDifference > 2
+            ? reduceSumStatisticsByDay(
+                energyData.stats[source.stat_energy_from]
+              )
+            : energyData.stats[source.stat_energy_from];
+
+        for (const point of stats) {
+          if (point.sum === null) {
             continue;
           }
           if (prevValue === null) {
@@ -290,7 +328,14 @@ export class HuiEnergySolarGraphCard
               ) {
                 return;
               }
-              dateObj.setMinutes(0, 0, 0);
+              if (dayDifference > 35) {
+                dateObj.setDate(1);
+              }
+              if (dayDifference > 2) {
+                dateObj.setHours(0, 0, 0, 0);
+              } else {
+                dateObj.setMinutes(0, 0, 0);
+              }
               const time = dateObj.getTime();
               if (time in forecastsData) {
                 forecastsData[time] += value;
@@ -357,10 +402,10 @@ export class HuiEnergySolarGraphCard
       }
       .no-data {
         position: absolute;
-        width: 100%;
         height: 100%;
         top: 0;
         left: 0;
+        right: 0;
         display: flex;
         justify-content: center;
         align-items: center;
diff --git a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
index 7df70cce72..46b4adf9c8 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
@@ -72,8 +72,11 @@ export class HuiEnergySourcesTableCard
     }
 
     let totalGrid = 0;
+    let totalGridCost = 0;
     let totalSolar = 0;
-    let totalCost = 0;
+    let totalBattery = 0;
+    let totalGas = 0;
+    let totalGasCost = 0;
 
     const types = energySourcesByType(this._data.prefs);
 
@@ -81,12 +84,21 @@ export class HuiEnergySourcesTableCard
     const solarColor = computedStyles
       .getPropertyValue("--energy-solar-color")
       .trim();
+    const batteryFromColor = computedStyles
+      .getPropertyValue("--energy-battery-out-color")
+      .trim();
+    const batteryToColor = computedStyles
+      .getPropertyValue("--energy-battery-in-color")
+      .trim();
     const returnColor = computedStyles
       .getPropertyValue("--energy-grid-return-color")
       .trim();
     const consumptionColor = computedStyles
       .getPropertyValue("--energy-grid-consumption-color")
       .trim();
+    const gasColor = computedStyles
+      .getPropertyValue("--energy-gas-color")
+      .trim();
 
     const showCosts =
       types.grid?.[0].flow_from.some(
@@ -98,6 +110,10 @@ export class HuiEnergySourcesTableCard
           flow.stat_compensation ||
           flow.entity_energy_price ||
           flow.number_energy_price
+      ) ||
+      types.gas?.some(
+        (flow) =>
+          flow.stat_cost || flow.entity_energy_price || flow.number_energy_price
       );
 
     return html` <ha-card>
@@ -106,7 +122,7 @@ export class HuiEnergySourcesTableCard
         : ""}
       <div class="mdc-data-table">
         <div class="mdc-data-table__table-container">
-          <table class="mdc-data-table__table" aria-label="Dessert calories">
+          <table class="mdc-data-table__table" aria-label="Energy sources">
             <thead>
               <tr class="mdc-data-table__header-row">
                 <th class="mdc-data-table__header-cell"></th>
@@ -190,6 +206,99 @@ export class HuiEnergySourcesTableCard
                       : ""}
                   </tr>`
                 : ""}
+              ${types.battery?.map((source, idx) => {
+                const entityFrom = this.hass.states[source.stat_energy_from];
+                const entityTo = this.hass.states[source.stat_energy_to];
+                const energyFrom =
+                  calculateStatisticSumGrowth(
+                    this._data!.stats[source.stat_energy_from]
+                  ) || 0;
+                const energyTo =
+                  calculateStatisticSumGrowth(
+                    this._data!.stats[source.stat_energy_to]
+                  ) || 0;
+                totalBattery += energyFrom - energyTo;
+                const fromColor =
+                  idx > 0
+                    ? rgb2hex(
+                        lab2rgb(
+                          labDarken(rgb2lab(hex2rgb(batteryFromColor)), idx)
+                        )
+                      )
+                    : batteryFromColor;
+                const toColor =
+                  idx > 0
+                    ? rgb2hex(
+                        lab2rgb(
+                          labDarken(rgb2lab(hex2rgb(batteryToColor)), idx)
+                        )
+                      )
+                    : batteryToColor;
+                return html`<tr class="mdc-data-table__row">
+                    <td class="mdc-data-table__cell cell-bullet">
+                      <div
+                        class="bullet"
+                        style=${styleMap({
+                          borderColor: fromColor,
+                          backgroundColor: fromColor + "7F",
+                        })}
+                      ></div>
+                    </td>
+                    <th class="mdc-data-table__cell" scope="row">
+                      ${entityFrom
+                        ? computeStateName(entityFrom)
+                        : source.stat_energy_from}
+                    </th>
+                    <td
+                      class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                    >
+                      ${formatNumber(energyFrom, this.hass.locale)} kWh
+                    </td>
+                    ${showCosts
+                      ? html`<td class="mdc-data-table__cell"></td>`
+                      : ""}
+                  </tr>
+                  <tr class="mdc-data-table__row">
+                    <td class="mdc-data-table__cell cell-bullet">
+                      <div
+                        class="bullet"
+                        style=${styleMap({
+                          borderColor: toColor,
+                          backgroundColor: toColor + "7F",
+                        })}
+                      ></div>
+                    </td>
+                    <th class="mdc-data-table__cell" scope="row">
+                      ${entityTo
+                        ? computeStateName(entityTo)
+                        : source.stat_energy_from}
+                    </th>
+                    <td
+                      class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                    >
+                      ${formatNumber(energyTo * -1, this.hass.locale)} kWh
+                    </td>
+                    ${showCosts
+                      ? html`<td class="mdc-data-table__cell"></td>`
+                      : ""}
+                  </tr>`;
+              })}
+              ${types.battery
+                ? html`<tr class="mdc-data-table__row total">
+                    <td class="mdc-data-table__cell"></td>
+                    <th class="mdc-data-table__cell" scope="row">
+                      Battery total
+                    </th>
+                    <td
+                      class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                    >
+                      ${formatNumber(totalBattery, this.hass.locale)} kWh
+                    </td>
+                    ${showCosts
+                      ? html`<td class="mdc-data-table__cell"></td>`
+                      : ""}
+                  </tr>`
+                : ""}
               ${types.grid?.map(
                 (source) => html`${source.flow_from.map((flow, idx) => {
                   const entity = this.hass.states[flow.stat_energy_from];
@@ -207,7 +316,7 @@ export class HuiEnergySourcesTableCard
                       ) || 0
                     : null;
                   if (cost !== null) {
-                    totalCost += cost;
+                    totalGridCost += cost;
                   }
                   const color =
                     idx > 0
@@ -267,7 +376,7 @@ export class HuiEnergySourcesTableCard
                       ) || 0) * -1
                     : null;
                   if (cost !== null) {
-                    totalCost += cost;
+                    totalGridCost += cost;
                   }
                   const color =
                     idx > 0
@@ -321,7 +430,7 @@ export class HuiEnergySourcesTableCard
                       ? html`<td
                           class="mdc-data-table__cell mdc-data-table__cell--numeric"
                         >
-                          ${formatNumber(totalCost, this.hass.locale, {
+                          ${formatNumber(totalGridCost, this.hass.locale, {
                             style: "currency",
                             currency: this.hass.config.currency!,
                           })}
@@ -329,6 +438,105 @@ export class HuiEnergySourcesTableCard
                       : ""}
                   </tr>`
                 : ""}
+              ${types.gas?.map((source, idx) => {
+                const entity = this.hass.states[source.stat_energy_from];
+                const energy =
+                  calculateStatisticSumGrowth(
+                    this._data!.stats[source.stat_energy_from]
+                  ) || 0;
+                totalGas += energy;
+                const cost_stat =
+                  source.stat_cost ||
+                  this._data!.info.cost_sensors[source.stat_energy_from];
+                const cost = cost_stat
+                  ? calculateStatisticSumGrowth(this._data!.stats[cost_stat]) ||
+                    0
+                  : null;
+                if (cost !== null) {
+                  totalGasCost += cost;
+                }
+                const color =
+                  idx > 0
+                    ? rgb2hex(
+                        lab2rgb(labDarken(rgb2lab(hex2rgb(gasColor)), idx))
+                      )
+                    : gasColor;
+                return html`<tr class="mdc-data-table__row">
+                  <td class="mdc-data-table__cell cell-bullet">
+                    <div
+                      class="bullet"
+                      style=${styleMap({
+                        borderColor: color,
+                        backgroundColor: color + "7F",
+                      })}
+                    ></div>
+                  </td>
+                  <th class="mdc-data-table__cell" scope="row">
+                    ${entity
+                      ? computeStateName(entity)
+                      : source.stat_energy_from}
+                  </th>
+                  <td
+                    class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                  >
+                    ${formatNumber(energy, this.hass.locale)} m³
+                  </td>
+                  ${showCosts
+                    ? html`<td
+                        class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                      >
+                        ${cost !== null
+                          ? formatNumber(cost, this.hass.locale, {
+                              style: "currency",
+                              currency: this.hass.config.currency!,
+                            })
+                          : ""}
+                      </td>`
+                    : ""}
+                </tr>`;
+              })}
+              ${types.gas
+                ? html`<tr class="mdc-data-table__row total">
+                    <td class="mdc-data-table__cell"></td>
+                    <th class="mdc-data-table__cell" scope="row">Gas total</th>
+                    <td
+                      class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                    >
+                      ${formatNumber(totalGas, this.hass.locale)} m³
+                    </td>
+                    ${showCosts
+                      ? html`<td
+                          class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                        >
+                          ${formatNumber(totalGasCost, this.hass.locale, {
+                            style: "currency",
+                            currency: this.hass.config.currency!,
+                          })}
+                        </td>`
+                      : ""}
+                  </tr>`
+                : ""}
+              ${totalGasCost && totalGridCost
+                ? html`<tr class="mdc-data-table__row total">
+                    <td class="mdc-data-table__cell"></td>
+                    <th class="mdc-data-table__cell" scope="row">
+                      Total costs
+                    </th>
+                    <td class="mdc-data-table__cell"></td>
+                    <td
+                      class="mdc-data-table__cell mdc-data-table__cell--numeric"
+                    >
+                      ${formatNumber(
+                        totalGasCost + totalGridCost,
+                        this.hass.locale,
+                        {
+                          style: "currency",
+                          currency: this.hass.config.currency!,
+                        }
+                      )}
+                    </td>
+                  </tr>`
+                : ""}
             </tbody>
           </table>
         </div>
diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
index 01abe63467..bc807a2e04 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
@@ -1,5 +1,5 @@
 import { ChartData, ChartDataset, ChartOptions } from "chart.js";
-import { startOfToday, endOfToday, isToday } from "date-fns";
+import { startOfToday, endOfToday, isToday, differenceInDays } from "date-fns";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -21,6 +21,10 @@ import {
 import "../../../../components/chart/ha-chart-base";
 import "../../../../components/ha-card";
 import { EnergyData, getEnergyDataCollection } from "../../../../data/energy";
+import {
+  reduceSumStatisticsByDay,
+  reduceSumStatisticsByMonth,
+} from "../../../../data/history";
 import { FrontendLocaleData } from "../../../../data/translation";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../../../types";
@@ -97,106 +101,130 @@ export class HuiEnergyUsageGraphCard
   }
 
   private _createOptions = memoizeOne(
-    (start: Date, end: Date, locale: FrontendLocaleData): ChartOptions => ({
-      parsing: false,
-      animation: false,
-      scales: {
-        x: {
-          type: "time",
-          suggestedMin: start.getTime(),
-          suggestedMax: end.getTime(),
-          adapters: {
-            date: {
-              locale: locale,
+    (start: Date, end: Date, locale: FrontendLocaleData): ChartOptions => {
+      const dayDifference = differenceInDays(end, start);
+      return {
+        parsing: false,
+        animation: false,
+        scales: {
+          x: {
+            type: "time",
+            suggestedMin: start.getTime(),
+            suggestedMax: end.getTime(),
+            adapters: {
+              date: {
+                locale: locale,
+              },
+            },
+            ticks: {
+              maxRotation: 0,
+              sampleSize: 5,
+              autoSkipPadding: 20,
+              major: {
+                enabled: true,
+              },
+              font: (context) =>
+                context.tick && context.tick.major
+                  ? ({ weight: "bold" } as any)
+                  : {},
+            },
+            time: {
+              tooltipFormat:
+                dayDifference > 35
+                  ? "monthyear"
+                  : dayDifference > 7
+                  ? "date"
+                  : dayDifference > 2
+                  ? "weekday"
+                  : dayDifference > 0
+                  ? "datetime"
+                  : "hour",
+              minUnit:
+                dayDifference > 35
+                  ? "month"
+                  : dayDifference > 2
+                  ? "day"
+                  : "hour",
+            },
+            offset: true,
+          },
+          y: {
+            stacked: true,
+            type: "linear",
+            title: {
+              display: true,
+              text: "kWh",
+            },
+            ticks: {
+              beginAtZero: true,
+              callback: (value) => formatNumber(Math.abs(value), locale),
             },
           },
-          ticks: {
-            maxRotation: 0,
-            sampleSize: 5,
-            autoSkipPadding: 20,
-            major: {
-              enabled: true,
-            },
-            font: (context) =>
-              context.tick && context.tick.major
-                ? ({ weight: "bold" } as any)
-                : {},
-          },
-          time: {
-            tooltipFormat: "datetime",
-          },
-          offset: true,
         },
-        y: {
-          stacked: true,
-          type: "linear",
-          title: {
-            display: true,
-            text: "kWh",
-          },
-          ticks: {
-            beginAtZero: true,
-            callback: (value) => formatNumber(Math.abs(value), locale),
-          },
-        },
-      },
-      plugins: {
-        tooltip: {
-          mode: "x",
-          intersect: true,
-          position: "nearest",
-          filter: (val) => val.formattedValue !== "0",
-          callbacks: {
-            label: (context) =>
-              `${context.dataset.label}: ${formatNumber(
-                Math.abs(context.parsed.y),
-                locale
-              )} kWh`,
-            footer: (contexts) => {
-              let totalConsumed = 0;
-              let totalReturned = 0;
-              for (const context of contexts) {
-                const value = (context.dataset.data[context.dataIndex] as any)
-                  .y;
-                if (value > 0) {
-                  totalConsumed += value;
-                } else {
-                  totalReturned += Math.abs(value);
+        plugins: {
+          tooltip: {
+            mode: "x",
+            intersect: true,
+            position: "nearest",
+            filter: (val) => val.formattedValue !== "0",
+            callbacks: {
+              label: (context) =>
+                `${context.dataset.label}: ${formatNumber(
+                  Math.abs(context.parsed.y),
+                  locale
+                )} kWh`,
+              footer: (contexts) => {
+                let totalConsumed = 0;
+                let totalReturned = 0;
+                for (const context of contexts) {
+                  const value = (context.dataset.data[context.dataIndex] as any)
+                    .y;
+                  if (value > 0) {
+                    totalConsumed += value;
+                  } else {
+                    totalReturned += Math.abs(value);
+                  }
                 }
-              }
-              return [
-                totalConsumed
-                  ? `Total consumed: ${formatNumber(totalConsumed, locale)} kWh`
-                  : "",
-                totalReturned
-                  ? `Total returned: ${formatNumber(totalReturned, locale)} kWh`
-                  : "",
-              ].filter(Boolean);
+                return [
+                  totalConsumed
+                    ? `Total consumed: ${formatNumber(
+                        totalConsumed,
+                        locale
+                      )} kWh`
+                    : "",
+                  totalReturned
+                    ? `Total returned: ${formatNumber(
+                        totalReturned,
+                        locale
+                      )} kWh`
+                    : "",
+                ].filter(Boolean);
+              },
+            },
+          },
+          filler: {
+            propagate: false,
+          },
+          legend: {
+            display: false,
+            labels: {
+              usePointStyle: true,
             },
           },
         },
-        filler: {
-          propagate: false,
+        hover: {
+          mode: "nearest",
         },
-        legend: {
-          display: false,
-          labels: {
-            usePointStyle: true,
+        elements: {
+          bar: { borderWidth: 1.5, borderRadius: 4 },
+          point: {
+            hitRadius: 5,
           },
         },
-      },
-      hover: {
-        mode: "nearest",
-      },
-      elements: {
-        bar: { borderWidth: 1.5, borderRadius: 4 },
-        point: {
-          hitRadius: 5,
-        },
-      },
-      // @ts-expect-error
-      locale: numberFormatToLocale(locale),
-    })
+        // @ts-expect-error
+        locale: numberFormatToLocale(locale),
+      };
+    }
   );
 
   private async _getStatistics(energyData: EnergyData): Promise<void> {
@@ -204,6 +232,8 @@ export class HuiEnergyUsageGraphCard
       to_grid?: string[];
       from_grid?: string[];
       solar?: string[];
+      to_battery?: string[];
+      from_battery?: string[];
     } = {};
 
     for (const source of energyData.prefs.energy_sources) {
@@ -216,6 +246,21 @@ export class HuiEnergyUsageGraphCard
         continue;
       }
 
+      if (source.type === "battery") {
+        if (statistics.to_battery) {
+          statistics.to_battery.push(source.stat_energy_to);
+          statistics.from_battery!.push(source.stat_energy_from);
+        } else {
+          statistics.to_battery = [source.stat_energy_to];
+          statistics.from_battery = [source.stat_energy_from];
+        }
+        continue;
+      }
+
+      if (source.type !== "grid") {
+        continue;
+      }
+
       // grid source
       for (const flowFrom of source.flow_from) {
         if (statistics.from_grid) {
@@ -233,7 +278,13 @@ export class HuiEnergyUsageGraphCard
       }
     }
 
+    const dayDifference = differenceInDays(
+      energyData.end || new Date(),
+      energyData.start
+    );
+
     const statisticsData = Object.values(energyData.stats);
+
     const datasets: ChartDataset<"bar">[] = [];
     let endTime: Date;
 
@@ -260,21 +311,47 @@ export class HuiEnergyUsageGraphCard
     }
 
     const combinedData: {
-      [key: string]: { [statId: string]: { [start: string]: number } };
+      to_grid?: { [statId: string]: { [start: string]: number } };
+      to_battery?: { [statId: string]: { [start: string]: number } };
+      from_grid?: { [statId: string]: { [start: string]: number } };
+      used_grid?: { [statId: string]: { [start: string]: number } };
+      used_solar?: { [statId: string]: { [start: string]: number } };
+      used_battery?: { [statId: string]: { [start: string]: number } };
+    } = {};
+
+    const summedData: {
+      to_grid?: { [start: string]: number };
+      from_grid?: { [start: string]: number };
+      to_battery?: { [start: string]: number };
+      from_battery?: { [start: string]: number };
+      solar?: { [start: string]: number };
     } = {};
-    const summedData: { [key: string]: { [start: string]: number } } = {};
 
     const computedStyles = getComputedStyle(this);
     const colors = {
       to_grid: computedStyles
         .getPropertyValue("--energy-grid-return-color")
         .trim(),
+      to_battery: computedStyles
+        .getPropertyValue("--energy-battery-in-color")
+        .trim(),
       from_grid: computedStyles
         .getPropertyValue("--energy-grid-consumption-color")
         .trim(),
+      used_grid: computedStyles
+        .getPropertyValue("--energy-grid-consumption-color")
+        .trim(),
       used_solar: computedStyles
         .getPropertyValue("--energy-solar-color")
         .trim(),
+      used_battery: computedStyles
+        .getPropertyValue("--energy-battery-out-color")
+        .trim(),
+    };
+    const labels = {
+      used_grid: "Combined from grid",
+      used_solar: "Consumed solar",
+      used_battery: "Consumed battery",
     };
 
     const backgroundColor = computedStyles
@@ -282,22 +359,34 @@ export class HuiEnergyUsageGraphCard
       .trim();
 
     Object.entries(statistics).forEach(([key, statIds]) => {
-      const sum = ["solar", "to_grid"].includes(key);
-      const add = key !== "solar";
+      const sum = [
+        "solar",
+        "to_grid",
+        "from_grid",
+        "to_battery",
+        "from_battery",
+      ].includes(key);
+      const add = !["solar", "from_battery"].includes(key);
       const totalStats: { [start: string]: number } = {};
       const sets: { [statId: string]: { [start: string]: number } } = {};
       statIds!.forEach((id) => {
-        const stats = energyData.stats[id];
+        const stats =
+          dayDifference > 35
+            ? reduceSumStatisticsByMonth(energyData.stats[id])
+            : dayDifference > 2
+            ? reduceSumStatisticsByDay(energyData.stats[id])
+            : energyData.stats[id];
         if (!stats) {
           return;
         }
+
         const set = {};
         let prevValue: number;
         stats.forEach((stat) => {
-          if (!stat.sum) {
+          if (stat.sum === null) {
             return;
           }
-          if (!prevValue) {
+          if (prevValue === undefined) {
             prevValue = stat.sum;
             return;
           }
@@ -322,15 +411,72 @@ export class HuiEnergyUsageGraphCard
       }
     });
 
-    if (summedData.to_grid && summedData.solar) {
+    const grid_to_battery = {};
+    const battery_to_grid = {};
+    if ((summedData.to_grid || summedData.to_battery) && summedData.solar) {
       const used_solar = {};
       for (const start of Object.keys(summedData.solar)) {
-        used_solar[start] = Math.max(
-          (summedData.solar[start] || 0) - (summedData.to_grid[start] || 0),
-          0
-        );
+        used_solar[start] =
+          (summedData.solar[start] || 0) -
+          (summedData.to_grid?.[start] || 0) -
+          (summedData.to_battery?.[start] || 0);
+        if (used_solar[start] < 0) {
+          if (summedData.to_battery) {
+            grid_to_battery[start] = used_solar[start] * -1;
+            if (grid_to_battery[start] > (summedData.from_grid?.[start] || 0)) {
+              battery_to_grid[start] = Math.min(
+                0,
+                grid_to_battery[start] - (summedData.from_grid?.[start] || 0)
+              );
+              grid_to_battery[start] = summedData.from_grid?.[start];
+            }
+          }
+          used_solar[start] = 0;
+        }
       }
-      combinedData.used_solar = { used_solar: used_solar };
+      combinedData.used_solar = { used_solar };
+    }
+
+    if (summedData.from_battery) {
+      if (summedData.to_grid) {
+        const used_battery = {};
+        for (const start of Object.keys(summedData.from_battery)) {
+          used_battery[start] =
+            (summedData.from_battery![start] || 0) -
+            (battery_to_grid[start] || 0);
+        }
+        combinedData.used_battery = { used_battery };
+      } else {
+        combinedData.used_battery = { used_battery: summedData.from_battery };
+      }
+    }
+
+    if (combinedData.from_grid && summedData.to_battery) {
+      const used_grid = {};
+      for (const start of Object.keys(grid_to_battery)) {
+        let noOfSources = 0;
+        let source: string;
+        for (const [key, stats] of Object.entries(combinedData.from_grid)) {
+          if (stats[start]) {
+            source = key;
+            noOfSources++;
+          }
+          if (noOfSources > 1) {
+            break;
+          }
+        }
+        if (noOfSources === 1) {
+          combinedData.from_grid[source!][start] -= grid_to_battery[start] || 0;
+        } else {
+          let total_from_grid = 0;
+          Object.values(combinedData.from_grid).forEach((stats) => {
+            total_from_grid += stats[start] || 0;
+            delete stats[start];
+          });
+          used_grid[start] = total_from_grid - (grid_to_battery[start] || 0);
+        }
+      }
+      combinedData.used_grid = { used_grid };
     }
 
     let allKeys: string[] = [];
@@ -354,12 +500,17 @@ export class HuiEnergyUsageGraphCard
 
         data.push({
           label:
-            type === "used_solar"
-              ? "Consumed solar"
+            type in labels
+              ? labels[type]
               : entity
               ? computeStateName(entity)
               : statId,
-          order: type === "used_solar" ? 0 : idx + 1,
+          order:
+            type === "used_solar"
+              ? 0
+              : type === "to_battery"
+              ? Object.keys(combinedData).length
+              : idx + 1,
           borderColor,
           backgroundColor: hexBlend(borderColor, backgroundColor, 50),
           stack: "stack",
@@ -373,7 +524,10 @@ export class HuiEnergyUsageGraphCard
           // @ts-expect-error
           data[0].data.push({
             x: date.getTime(),
-            y: value && type === "to_grid" ? -1 * value : value,
+            y:
+              value && ["to_grid", "to_battery"].includes(type)
+                ? -1 * value
+                : value,
           });
         }
 
@@ -403,10 +557,10 @@ export class HuiEnergyUsageGraphCard
       }
       .no-data {
         position: absolute;
-        width: 100%;
         height: 100%;
         top: 0;
         left: 0;
+        right: 0;
         display: flex;
         justify-content: center;
         align-items: center;
diff --git a/src/panels/lovelace/cards/hui-calendar-card.ts b/src/panels/lovelace/cards/hui-calendar-card.ts
index 13b5bcc8b3..84436c04b4 100644
--- a/src/panels/lovelace/cards/hui-calendar-card.ts
+++ b/src/panels/lovelace/cards/hui-calendar-card.ts
@@ -7,7 +7,7 @@ import {
   TemplateResult,
 } from "lit";
 import { customElement, property, state, query } from "lit/decorators";
-import { HA_COLOR_PALETTE } from "../../../common/const";
+import { getColorByIndex } from "../../../common/color/colors";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { HASSDomEvent } from "../../../common/dom/fire_event";
 import { debounce } from "../../../common/util/debounce";
@@ -86,7 +86,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
 
     this._calendars = config!.entities.map((entity, idx) => ({
       entity_id: entity,
-      backgroundColor: `#${HA_COLOR_PALETTE[idx % HA_COLOR_PALETTE.length]}`,
+      backgroundColor: getColorByIndex(idx),
     }));
 
     if (this._config?.entities !== config.entities) {
diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts
index 969ad566c7..72f45442d8 100644
--- a/src/panels/lovelace/cards/hui-error-card.ts
+++ b/src/panels/lovelace/cards/hui-error-card.ts
@@ -1,6 +1,7 @@
 import { dump } from "js-yaml";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators";
+import "../../../components/ha-alert";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCard } from "../types";
 import { ErrorCardConfig } from "./types";
@@ -34,25 +35,17 @@ export class HuiErrorCard extends LitElement implements LovelaceCard {
       }
     }
 
-    return html`
-      ${this._config.error}${dumped ? html`<pre>${dumped}</pre>` : ""}
-    `;
+    return html`<ha-alert alert-type="error" .title=${this._config.error}>
+      ${dumped ? html`<pre>${dumped}</pre>` : ""}
+    </ha-alert>`;
   }
 
   static get styles(): CSSResultGroup {
     return css`
-      :host {
-        display: block;
-        background-color: var(--error-color);
-        color: var(--color-on-error, white);
-        padding: 8px;
-        font-weight: 500;
-        user-select: text;
-        cursor: default;
-      }
       pre {
         font-family: var(--code-font-family, monospace);
         text-overflow: ellipsis;
+        user-select: text;
         overflow: hidden;
       }
     `;
diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index f8ff918de2..e07b75f42a 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -24,10 +24,10 @@ import type { LovelaceCard, LovelaceCardEditor } from "../types";
 import type { GaugeCardConfig } from "./types";
 
 export const severityMap = {
-  red: "var(--label-badge-red)",
-  green: "var(--label-badge-green)",
-  yellow: "var(--label-badge-yellow)",
-  normal: "var(--label-badge-blue)",
+  red: "var(--error-color)",
+  green: "var(--success-color)",
+  yellow: "var(--warning-color)",
+  normal: "var(--info-color)",
 };
 
 @customElement("hui-gauge-card")
@@ -170,7 +170,10 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
     }
   }
 
-  private _computeSeverity(numberValue: number): string {
+  private _computeSeverity(numberValue: number): string | undefined {
+    if (this._config!.needle) {
+      return undefined;
+    }
     const sections = this._config!.severity;
 
     if (!sections) {
@@ -240,7 +243,6 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
       }
 
       ha-gauge {
-        --gauge-color: var(--label-badge-blue);
         width: 100%;
         max-width: 250px;
       }
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 87265c6d81..d308df7b4e 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -192,6 +192,7 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
         padding: 0 16px 4px;
         flex-wrap: wrap;
         box-sizing: border-box;
+        align-items: center;
         align-content: center;
       }
       .entities.no-header {
@@ -224,9 +225,31 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
       .name {
         min-height: var(--paper-font-body1_-_line-height, 20px);
       }
+      .warning {
+        cursor: default;
+        position: relative;
+        padding: 8px;
+        width: calc(var(--glance-column-width, 20%) - 4px);
+        margin: 0 2px;
+      }
+      .warning::before {
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        opacity: 0.12;
+        pointer-events: none;
+        content: "";
+        border-radius: 4px;
+        background-color: var(--warning-color);
+      }
       state-badge {
         margin: 8px 0;
       }
+      hui-warning-element {
+        padding: 8px;
+      }
     `;
   }
 
@@ -234,11 +257,24 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
     const stateObj = this.hass!.states[entityConf.entity];
 
     if (!stateObj) {
-      return html`
-        <hui-warning-element
-          .label=${createEntityNotFoundWarning(this.hass!, entityConf.entity)}
-        ></hui-warning-element>
-      `;
+      return html`<div class="entity warning">
+        ${this._config!.show_name
+          ? html`
+              <div class="name">
+                ${createEntityNotFoundWarning(this.hass!, entityConf.entity)}
+              </div>
+            `
+          : ""}
+        ${this._config!.show_icon
+          ? html` <hui-warning-element
+              .label=${createEntityNotFoundWarning(
+                this.hass!,
+                entityConf.entity
+              )}
+            ></hui-warning-element>`
+          : ""}
+        <div>${this._config!.show_state ? entityConf.entity : ""}</div>
+      </div>`;
     }
 
     return html`
diff --git a/src/panels/lovelace/cards/hui-humidifier-card.ts b/src/panels/lovelace/cards/hui-humidifier-card.ts
index c1513b34f4..1c418a259b 100644
--- a/src/panels/lovelace/cards/hui-humidifier-card.ts
+++ b/src/panels/lovelace/cards/hui-humidifier-card.ts
@@ -330,8 +330,8 @@ export class HuiHumidifierCard extends LitElement implements LovelaceCard {
       }
 
       round-slider {
-        --round-slider-path-color: var(--disabled-text-color);
-        --round-slider-bar-color: var(--mode-color);
+        --round-slider-path-color: var(--slider-track-color);
+        --round-slider-bar-color: var(--primary-color);
         padding-bottom: 10%;
       }
 
@@ -377,16 +377,6 @@ export class HuiHumidifierCard extends LitElement implements LovelaceCard {
         font-size: var(--name-font-size);
       }
 
-      #modes > * {
-        color: var(--disabled-text-color);
-        cursor: pointer;
-        display: inline-block;
-      }
-
-      #modes .selected-icon {
-        color: var(--mode-color);
-      }
-
       text {
         fill: var(--primary-text-color);
       }
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 0cdca46706..3883815fa6 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -297,7 +297,7 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
       }
 
       round-slider {
-        --round-slider-path-color: var(--disabled-text-color);
+        --round-slider-path-color: var(--slider-track-color);
         --round-slider-bar-color: var(--primary-color);
         padding-bottom: 10%;
       }
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index e5c7281edd..4a29f5679f 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -337,6 +337,9 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
       ha-icon-button.state-on {
         color: var(--ha-picture-icon-button-on-color, white);
       }
+      hui-warning-element {
+        padding: 0 8px;
+      }
       .state {
         display: block;
         font-size: 12px;
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index 19ba06708a..66241944d4 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -513,7 +513,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
       }
 
       round-slider {
-        --round-slider-path-color: var(--disabled-text-color);
+        --round-slider-path-color: var(--slider-track-color);
         --round-slider-bar-color: var(--mode-color);
         padding-bottom: 10%;
       }
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index 285f7798f6..ffc25948da 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -113,6 +113,12 @@ export interface EnergySolarGraphCardConfig extends LovelaceCardConfig {
   collection_key?: string;
 }
 
+export interface EnergyGasGraphCardConfig extends LovelaceCardConfig {
+  type: "energy-gas-graph";
+  title?: string;
+  collection_key?: string;
+}
+
 export interface EnergyDevicesGraphCardConfig extends LovelaceCardConfig {
   type: "energy-devices-graph";
   title?: string;
diff --git a/src/panels/lovelace/components/hui-energy-period-selector.ts b/src/panels/lovelace/components/hui-energy-period-selector.ts
index fa82e1d3ca..5af6eca46e 100644
--- a/src/panels/lovelace/components/hui-energy-period-selector.ts
+++ b/src/panels/lovelace/components/hui-energy-period-selector.ts
@@ -1,15 +1,45 @@
 import { mdiChevronLeft, mdiChevronRight } from "@mdi/js";
-import { endOfToday, addDays, endOfDay, isToday, startOfToday } from "date-fns";
+import {
+  endOfToday,
+  addDays,
+  endOfDay,
+  startOfToday,
+  endOfWeek,
+  endOfMonth,
+  startOfDay,
+  startOfWeek,
+  startOfMonth,
+  addMonths,
+  addWeeks,
+  startOfYear,
+  addYears,
+  endOfYear,
+  isWithinInterval,
+  differenceInDays,
+} from "date-fns";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { formatDate } from "../../../common/datetime/format_date";
+import {
+  formatDate,
+  formatDateMonthYear,
+  formatDateShort,
+  formatDateYear,
+} from "../../../common/datetime/format_date";
 import { EnergyData, getEnergyDataCollection } from "../../../data/energy";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
-import { HomeAssistant } from "../../../types";
+import { HomeAssistant, ToggleButton } from "../../../types";
 import "@material/mwc-icon-button/mwc-icon-button";
 import "../../../components/ha-svg-icon";
 import "@material/mwc-button/mwc-button";
+import "../../../components/ha-button-toggle-group";
+
+const viewButtons: ToggleButton[] = [
+  { label: "Day", value: "day" },
+  { label: "Week", value: "week" },
+  { label: "Month", value: "month" },
+  { label: "Year", value: "year" },
+];
 
 @customElement("hui-energy-period-selector")
 export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
@@ -21,6 +51,13 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
 
   @state() _endDate?: Date;
 
+  @state() private _period?: "day" | "week" | "month" | "year";
+
+  public connectedCallback() {
+    super.connectedCallback();
+    this.toggleAttribute("narrow", this.offsetWidth < 600);
+  }
+
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       getEnergyDataCollection(this.hass, {
@@ -37,41 +74,110 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
     return html`
       <div class="row">
         <div class="label">
-          ${formatDate(this._startDate, this.hass.locale)}
+          ${this._period === "day"
+            ? formatDate(this._startDate, this.hass.locale)
+            : this._period === "month"
+            ? formatDateMonthYear(this._startDate, this.hass.locale)
+            : this._period === "year"
+            ? formatDateYear(this._startDate, this.hass.locale)
+            : `${formatDateShort(
+                this._startDate,
+                this.hass.locale
+              )} - ${formatDateShort(
+                this._endDate || new Date(),
+                this.hass.locale
+              )}`}
+          <mwc-icon-button label="Previous" @click=${this._pickPrevious}>
+            <ha-svg-icon .path=${mdiChevronLeft}></ha-svg-icon>
+          </mwc-icon-button>
+          <mwc-icon-button label="Next" @click=${this._pickNext}>
+            <ha-svg-icon .path=${mdiChevronRight}></ha-svg-icon>
+          </mwc-icon-button>
+          <mwc-button dense outlined @click=${this._pickToday}>
+            Today
+          </mwc-button>
+        </div>
+        <div class="period">
+          <ha-button-toggle-group
+            .buttons=${viewButtons}
+            .active=${this._period}
+            dense
+            @value-changed=${this._handleView}
+          ></ha-button-toggle-group>
         </div>
-
-        <mwc-icon-button label="Previous Day" @click=${this._pickPreviousDay}>
-          <ha-svg-icon .path=${mdiChevronLeft}></ha-svg-icon>
-        </mwc-icon-button>
-        <mwc-icon-button label="Next Day" @click=${this._pickNextDay}>
-          <ha-svg-icon .path=${mdiChevronRight}></ha-svg-icon>
-        </mwc-icon-button>
-
-        <mwc-button
-          dense
-          outlined
-          .disabled=${isToday(this._startDate)}
-          @click=${this._pickToday}
-          >Today</mwc-button
-        >
       </div>
     `;
   }
 
+  private _handleView(ev: CustomEvent): void {
+    this._period = ev.detail.value;
+    const today = startOfToday();
+    const start =
+      !this._startDate ||
+      isWithinInterval(today, {
+        start: this._startDate,
+        end: this._endDate || endOfToday(),
+      })
+        ? today
+        : this._startDate;
+
+    this._setDate(
+      this._period === "day"
+        ? startOfDay(start)
+        : this._period === "week"
+        ? startOfWeek(start, { weekStartsOn: 1 })
+        : this._period === "month"
+        ? startOfMonth(start)
+        : startOfYear(start)
+    );
+  }
+
   private _pickToday() {
-    this._setDate(startOfToday());
+    this._setDate(
+      this._period === "day"
+        ? startOfToday()
+        : this._period === "week"
+        ? startOfWeek(new Date(), { weekStartsOn: 1 })
+        : this._period === "month"
+        ? startOfMonth(new Date())
+        : startOfYear(new Date())
+    );
   }
 
-  private _pickPreviousDay() {
-    this._setDate(addDays(this._startDate!, -1));
+  private _pickPrevious() {
+    const newStart =
+      this._period === "day"
+        ? addDays(this._startDate!, -1)
+        : this._period === "week"
+        ? addWeeks(this._startDate!, -1)
+        : this._period === "month"
+        ? addMonths(this._startDate!, -1)
+        : addYears(this._startDate!, -1);
+    this._setDate(newStart);
   }
 
-  private _pickNextDay() {
-    this._setDate(addDays(this._startDate!, +1));
+  private _pickNext() {
+    const newStart =
+      this._period === "day"
+        ? addDays(this._startDate!, 1)
+        : this._period === "week"
+        ? addWeeks(this._startDate!, 1)
+        : this._period === "month"
+        ? addMonths(this._startDate!, 1)
+        : addYears(this._startDate!, 1);
+    this._setDate(newStart);
   }
 
   private _setDate(startDate: Date) {
-    const endDate = endOfDay(startDate);
+    const endDate =
+      this._period === "day"
+        ? endOfDay(startDate)
+        : this._period === "week"
+        ? endOfWeek(startDate, { weekStartsOn: 1 })
+        : this._period === "month"
+        ? endOfMonth(startDate)
+        : endOfYear(startDate);
+
     const energyCollection = getEnergyDataCollection(this.hass, {
       key: this.collectionKey,
     });
@@ -82,30 +188,54 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
   private _updateDates(energyData: EnergyData): void {
     this._startDate = energyData.start;
     this._endDate = energyData.end || endOfToday();
+    const dayDifference = differenceInDays(this._endDate, this._startDate);
+    this._period =
+      dayDifference < 1
+        ? "day"
+        : dayDifference === 6
+        ? "week"
+        : dayDifference > 26 && dayDifference < 31 // 28, 29, 30 or 31 days in a month
+        ? "month"
+        : dayDifference === 364 || dayDifference === 365 // Leap year
+        ? "year"
+        : undefined;
   }
 
   static get styles(): CSSResultGroup {
     return css`
       .row {
         display: flex;
-        align-items: center;
         justify-content: flex-end;
       }
+      :host([narrow]) .row {
+        flex-direction: column-reverse;
+      }
+      :host([narrow]) .period {
+        margin-bottom: 8px;
+      }
       .label {
-        padding: 0 8px;
-        text-align: center;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
         font-size: 20px;
       }
+      .period {
+        display: flex;
+        justify-content: flex-end;
+      }
+      :host {
+        --mdc-button-outline-color: currentColor;
+        --primary-color: currentColor;
+        --mdc-theme-primary: currentColor;
+        --mdc-button-disabled-outline-color: var(--disabled-text-color);
+        --mdc-button-disabled-ink-color: var(--disabled-text-color);
+        --mdc-icon-button-ripple-opacity: 0.2;
+      }
       mwc-icon-button {
         --mdc-icon-button-size: 28px;
       }
-      mwc-button {
+      ha-button-toggle-group {
         padding-left: 8px;
-        --mdc-theme-primary: currentColor;
-        --mdc-button-outline-color: currentColor;
-
-        --mdc-button-disabled-outline-color: var(--disabled-text-color);
-        --mdc-button-disabled-ink-color: var(--disabled-text-color);
       }
     `;
   }
diff --git a/src/panels/lovelace/components/hui-image.ts b/src/panels/lovelace/components/hui-image.ts
index 70f15fea22..067a420c86 100644
--- a/src/panels/lovelace/components/hui-image.ts
+++ b/src/panels/lovelace/components/hui-image.ts
@@ -6,7 +6,7 @@ import {
   PropertyValues,
   TemplateResult,
 } from "lit";
-import { customElement, property, state, query } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { STATES_OFF } from "../../../common/const";
@@ -15,10 +15,20 @@ import "../../../components/ha-camera-stream";
 import { CameraEntity, fetchThumbnailUrlWithCache } from "../../../data/camera";
 import { UNAVAILABLE } from "../../../data/entity";
 import { HomeAssistant } from "../../../types";
+import "../../../components/ha-circular-progress";
 
 const UPDATE_INTERVAL = 10000;
 const DEFAULT_FILTER = "grayscale(100%)";
 
+const MAX_IMAGE_WIDTH = 640;
+const ASPECT_RATIO_DEFAULT = 9 / 16;
+
+enum LoadState {
+  Loading = 1,
+  Loaded = 2,
+  Error = 3,
+}
+
 export interface StateSpecificConfig {
   [state: string]: string;
 }
@@ -31,7 +41,7 @@ export class HuiImage extends LitElement {
 
   @property() public image?: string;
 
-  @property() public stateImage?: StateSpecificConfig;
+  @property({ attribute: false }) public stateImage?: StateSpecificConfig;
 
   @property() public cameraImage?: string;
 
@@ -41,39 +51,86 @@ export class HuiImage extends LitElement {
 
   @property() public filter?: string;
 
-  @property() public stateFilter?: StateSpecificConfig;
+  @property({ attribute: false }) public stateFilter?: StateSpecificConfig;
 
   @property() public darkModeImage?: string;
 
   @property() public darkModeFilter?: string;
 
-  @state() private _loadError?: boolean;
+  @state() private _imageVisible? = false;
+
+  @state() private _loadState?: LoadState;
 
   @state() private _cameraImageSrc?: string;
 
-  @query("img") private _image!: HTMLImageElement;
+  @state() private _loadedImageSrc?: string;
+
+  private _intersectionObserver?: IntersectionObserver;
 
   private _lastImageHeight?: number;
 
   private _cameraUpdater?: number;
 
+  private _ratio: {
+    w: number;
+    h: number;
+  } | null = null;
+
   public connectedCallback(): void {
     super.connectedCallback();
+    if (this._loadState === undefined) {
+      this._loadState = LoadState.Loading;
+    }
     if (this.cameraImage && this.cameraView !== "live") {
-      this._startUpdateCameraInterval();
+      this._startIntersectionObserverOrUpdates();
     }
   }
 
   public disconnectedCallback(): void {
     super.disconnectedCallback();
     this._stopUpdateCameraInterval();
+    this._stopIntersectionObserver();
+    this._imageVisible = undefined;
+  }
+
+  protected handleIntersectionCallback(entries: IntersectionObserverEntry[]) {
+    this._imageVisible = entries[0].isIntersecting;
+  }
+
+  public willUpdate(changedProps: PropertyValues): void {
+    if (changedProps.has("hass")) {
+      const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+
+      if (this._shouldStartCameraUpdates(oldHass)) {
+        this._startIntersectionObserverOrUpdates();
+      } else if (!this.hass!.connected) {
+        this._stopUpdateCameraInterval();
+        this._stopIntersectionObserver();
+      }
+    }
+    if (changedProps.has("_imageVisible")) {
+      if (this._imageVisible) {
+        if (this._shouldStartCameraUpdates()) {
+          this._startUpdateCameraInterval();
+        }
+      } else {
+        this._stopUpdateCameraInterval();
+      }
+    }
+    if (changedProps.has("aspectRatio")) {
+      this._ratio = this.aspectRatio
+        ? parseAspectRatio(this.aspectRatio)
+        : null;
+    }
   }
 
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
     }
-    const ratio = this.aspectRatio ? parseAspectRatio(this.aspectRatio) : null;
+    const useRatio = Boolean(
+      this._ratio && this._ratio.w > 0 && this._ratio.h > 0
+    );
     const stateObj = this.entity ? this.hass.states[this.entity] : undefined;
     const entityState = stateObj ? stateObj.state : UNAVAILABLE;
 
@@ -127,14 +184,21 @@ export class HuiImage extends LitElement {
     return html`
       <div
         style=${styleMap({
-          paddingBottom:
-            ratio && ratio.w > 0 && ratio.h > 0
-              ? `${((100 * ratio.h) / ratio.w).toFixed(2)}%`
-              : "",
-        })}
-        class=${classMap({
-          ratio: Boolean(ratio && ratio.w > 0 && ratio.h > 0),
+          paddingBottom: useRatio
+            ? `${((100 * this._ratio!.h) / this._ratio!.w).toFixed(2)}%`
+            : undefined,
+          backgroundImage:
+            useRatio && this._loadedImageSrc
+              ? `url(${this._loadedImageSrc})`
+              : undefined,
+          filter:
+            this._loadState === LoadState.Loaded || this.cameraView === "live"
+              ? filter
+              : undefined,
         })}
+        class="container ${classMap({
+          ratio: useRatio,
+        })}"
       >
         ${this.cameraImage && this.cameraView === "live"
           ? html`
@@ -144,6 +208,8 @@ export class HuiImage extends LitElement {
                 .stateObj=${cameraObj}
               ></ha-camera-stream>
             `
+          : imageSrc === undefined
+          ? html``
           : html`
               <img
                 id="image"
@@ -151,47 +217,79 @@ export class HuiImage extends LitElement {
                 @error=${this._onImageError}
                 @load=${this._onImageLoad}
                 style=${styleMap({
-                  filter,
-                  display: this._loadError ? "none" : "block",
+                  display:
+                    useRatio || this._loadState === LoadState.Loaded
+                      ? "block"
+                      : "none",
                 })}
               />
             `}
-        ${this._loadError
+        ${this._loadState === LoadState.Error
           ? html`<div
               id="brokenImage"
               style=${styleMap({
-                height: `${this._lastImageHeight || "100"}px`,
+                height: !useRatio
+                  ? `${this._lastImageHeight || "100"}px`
+                  : undefined,
               })}
             ></div>`
+          : this.cameraView !== "live" &&
+            (imageSrc === undefined || this._loadState === LoadState.Loading)
+          ? html`<div
+              class="progress-container"
+              style=${styleMap({
+                height: !useRatio
+                  ? `${this._lastImageHeight || "100"}px`
+                  : undefined,
+              })}
+            >
+              <ha-circular-progress
+                class="render-spinner"
+                active
+                size="small"
+              ></ha-circular-progress>
+            </div>`
           : ""}
       </div>
     `;
   }
 
-  protected updated(changedProps: PropertyValues): void {
-    if (changedProps.has("hass")) {
-      const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-      if (!oldHass || oldHass.connected !== this.hass!.connected) {
-        if (this.hass!.connected && this.cameraView !== "live") {
-          this._updateCameraImageSrc();
-          this._startUpdateCameraInterval();
-        } else if (!this.hass!.connected) {
-          this._stopUpdateCameraInterval();
-          this._cameraImageSrc = undefined;
-          this._loadError = true;
-        }
+  protected _shouldStartCameraUpdates(oldHass?: HomeAssistant): boolean {
+    return !!(
+      (!oldHass || oldHass.connected !== this.hass!.connected) &&
+      this.hass!.connected &&
+      this.cameraView !== "live"
+    );
+  }
+
+  private _startIntersectionObserverOrUpdates(): void {
+    if ("IntersectionObserver" in window) {
+      if (!this._intersectionObserver) {
+        this._intersectionObserver = new IntersectionObserver(
+          this.handleIntersectionCallback.bind(this)
+        );
       }
-    } else if (changedProps.has("cameraImage") && this.cameraView !== "live") {
-      this._updateCameraImageSrc();
+      this._intersectionObserver.observe(this);
+    } else {
+      // No support for IntersectionObserver
+      // assume all images are visible
+      this._imageVisible = true;
       this._startUpdateCameraInterval();
     }
   }
 
+  private _stopIntersectionObserver(): void {
+    if (this._intersectionObserver) {
+      this._intersectionObserver.disconnect();
+    }
+  }
+
   private _startUpdateCameraInterval(): void {
     this._stopUpdateCameraInterval();
+    this._updateCameraImageSrc();
     if (this.cameraImage && this.isConnected) {
       this._cameraUpdater = window.setInterval(
-        () => this._updateCameraImageSrc(),
+        () => this._updateCameraImageSrcAtInterval(),
         UPDATE_INTERVAL
       );
     }
@@ -205,13 +303,26 @@ export class HuiImage extends LitElement {
   }
 
   private _onImageError(): void {
-    this._loadError = true;
+    this._loadState = LoadState.Error;
   }
 
-  private async _onImageLoad(): Promise<void> {
-    this._loadError = false;
+  private async _onImageLoad(ev: Event): Promise<void> {
+    this._loadState = LoadState.Loaded;
+    const imgEl = ev.target as HTMLImageElement;
+    if (this._ratio && this._ratio.w > 0 && this._ratio.h > 0) {
+      this._loadedImageSrc = imgEl.src;
+    }
     await this.updateComplete;
-    this._lastImageHeight = this._image.offsetHeight;
+    this._lastImageHeight = imgEl.offsetHeight;
+  }
+
+  private async _updateCameraImageSrcAtInterval(): Promise<void> {
+    // If we hit the interval and it was still loading
+    // it means we timed out so we should show the error.
+    if (this._loadState === LoadState.Loading) {
+      this._onImageError();
+    }
+    return this._updateCameraImageSrc();
   }
 
   private async _updateCameraImageSrc(): Promise<void> {
@@ -228,25 +339,62 @@ export class HuiImage extends LitElement {
       return;
     }
 
+    const element_width = this.clientWidth || MAX_IMAGE_WIDTH;
+    let width = Math.ceil(element_width * devicePixelRatio);
+    let height: number;
+    // If the image has not rendered yet we have no height
+    if (!this._lastImageHeight) {
+      if (this._ratio && this._ratio.w > 0 && this._ratio.h > 0) {
+        height = Math.ceil(width * (this._ratio.h / this._ratio.w));
+      } else {
+        // If we don't have a ratio and we don't have a height
+        // we ask for 200% of what we need because the aspect
+        // ratio might result in a smaller image
+        width *= 2;
+        height = Math.ceil(width * ASPECT_RATIO_DEFAULT);
+      }
+    } else {
+      height = Math.ceil(this._lastImageHeight * devicePixelRatio);
+    }
     this._cameraImageSrc = await fetchThumbnailUrlWithCache(
       this.hass,
-      this.cameraImage
+      this.cameraImage,
+      width,
+      height
     );
+    if (this._cameraImageSrc === undefined) {
+      this._onImageError();
+    }
   }
 
   static get styles(): CSSResultGroup {
     return css`
+      :host {
+        display: block;
+      }
+
+      .container {
+        transition: filter 0.2s linear;
+      }
+
       img {
         display: block;
         height: auto;
-        transition: filter 0.2s linear;
         width: 100%;
       }
 
+      .progress-container {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
       .ratio {
         position: relative;
         width: 100%;
         height: 0;
+        background-position: center;
+        background-size: cover;
       }
 
       .ratio img,
@@ -258,6 +406,10 @@ export class HuiImage extends LitElement {
         height: 100%;
       }
 
+      .ratio img {
+        visibility: hidden;
+      }
+
       #brokenImage {
         background: grey url("/static/images/image-broken.svg") center/36px
           no-repeat;
diff --git a/src/panels/lovelace/components/hui-warning-element.ts b/src/panels/lovelace/components/hui-warning-element.ts
index 85a99c0217..a8a163b891 100644
--- a/src/panels/lovelace/components/hui-warning-element.ts
+++ b/src/panels/lovelace/components/hui-warning-element.ts
@@ -1,19 +1,22 @@
+import { mdiAlertOutline } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
-import "../../../components/ha-icon";
+import "../../../components/ha-svg-icon";
 
 @customElement("hui-warning-element")
 export class HuiWarningElement extends LitElement {
   @property() public label?: string;
 
   protected render(): TemplateResult {
-    return html` <ha-icon icon="hass:alert" .title=${this.label}></ha-icon> `;
+    return html`
+      <ha-svg-icon .path=${mdiAlertOutline} .title=${this.label}></ha-svg-icon>
+    `;
   }
 
   static get styles(): CSSResultGroup {
     return css`
-      ha-icon {
-        color: #fce588;
+      ha-svg-icon {
+        color: var(--warning-color);
       }
     `;
   }
diff --git a/src/panels/lovelace/components/hui-warning.ts b/src/panels/lovelace/components/hui-warning.ts
index 183c75497a..20f59819c2 100644
--- a/src/panels/lovelace/components/hui-warning.ts
+++ b/src/panels/lovelace/components/hui-warning.ts
@@ -1,6 +1,7 @@
 import { STATE_NOT_RUNNING } from "home-assistant-js-websocket";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { html, LitElement, TemplateResult } from "lit";
 import { customElement } from "lit/decorators";
+import "../../../components/ha-alert";
 import { HomeAssistant } from "../../../types";
 
 export const createEntityNotFoundWarning = (
@@ -18,19 +19,7 @@ export const createEntityNotFoundWarning = (
 @customElement("hui-warning")
 export class HuiWarning extends LitElement {
   protected render(): TemplateResult {
-    return html` <slot></slot> `;
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      :host {
-        display: block;
-        color: black;
-        background-color: #fce588;
-        padding: 8px;
-        word-break: break-word;
-      }
-    `;
+    return html`<ha-alert alert-type="warning"><slot></slot></ha-alert> `;
   }
 }
 
diff --git a/src/panels/lovelace/create-element/create-card-element.ts b/src/panels/lovelace/create-element/create-card-element.ts
index 151f8b3638..6c8c470e35 100644
--- a/src/panels/lovelace/create-element/create-card-element.ts
+++ b/src/panels/lovelace/create-element/create-card-element.ts
@@ -39,6 +39,7 @@ const LAZY_LOAD_TYPES = {
     import("../cards/energy/hui-energy-usage-graph-card"),
   "energy-solar-graph": () =>
     import("../cards/energy/hui-energy-solar-graph-card"),
+  "energy-gas-graph": () => import("../cards/energy/hui-energy-gas-graph-card"),
   "energy-devices-graph": () =>
     import("../cards/energy/hui-energy-devices-graph-card"),
   "energy-sources-table": () =>
diff --git a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
index 973bcfaa2f..7f2a1c00dc 100644
--- a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
@@ -3,7 +3,7 @@ import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { array, assert, object, optional, string } from "superstruct";
+import { array, assert, assign, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/ha-icon";
@@ -11,16 +11,19 @@ import { HomeAssistant } from "../../../../types";
 import { AlarmPanelCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  states: optional(array()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    states: optional(array()),
+    theme: optional(string()),
+  })
+);
 
 const includeDomains = ["alarm_control_panel"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
index 1947d7bb9a..48439e3d3e 100644
--- a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
@@ -1,7 +1,7 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, boolean, object, optional, string } from "superstruct";
+import { assert, boolean, object, optional, string, assign } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stateIcon } from "../../../../common/entity/state_icon";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
@@ -18,20 +18,23 @@ import { LovelaceCardEditor } from "../../types";
 import { actionConfigStruct } from "../structs/action-struct";
 import { EditorTarget } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  show_name: optional(boolean()),
-  icon: optional(string()),
-  show_icon: optional(boolean()),
-  icon_height: optional(string()),
-  tap_action: optional(actionConfigStruct),
-  hold_action: optional(actionConfigStruct),
-  theme: optional(string()),
-  show_state: optional(boolean()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    show_name: optional(boolean()),
+    icon: optional(string()),
+    show_icon: optional(boolean()),
+    icon_height: optional(string()),
+    tap_action: optional(actionConfigStruct),
+    hold_action: optional(actionConfigStruct),
+    theme: optional(string()),
+    show_state: optional(boolean()),
+  })
+);
 
 const actions = [
   "more-info",
diff --git a/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
index 75407bb633..5be36b9d66 100644
--- a/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
@@ -3,6 +3,7 @@ import { customElement, property, state } from "lit/decorators";
 import {
   array,
   assert,
+  assign,
   boolean,
   object,
   optional,
@@ -18,14 +19,17 @@ import "../../components/hui-theme-select-editor";
 import type { LovelaceCardEditor } from "../../types";
 import type { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(union([string(), boolean()])),
-  initial_view: optional(string()),
-  theme: optional(string()),
-  entities: array(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(union([string(), boolean()])),
+    initial_view: optional(string()),
+    theme: optional(string()),
+    entities: array(string()),
+  })
+);
 
 const views = ["dayGridMonth", "dayGridDay", "listWeek"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
index 345b224c93..7f43f545e1 100644
--- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
@@ -3,7 +3,15 @@ import "@material/mwc-tab/mwc-tab";
 import type { MDCTabBarActivatedEvent } from "@material/tab-bar";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state, query } from "lit/decorators";
-import { any, array, assert, object, optional, string } from "superstruct";
+import {
+  any,
+  array,
+  assert,
+  assign,
+  object,
+  optional,
+  string,
+} from "superstruct";
 import { fireEvent, HASSDomEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import { LovelaceCardConfig, LovelaceConfig } from "../../../../data/lovelace";
@@ -15,6 +23,7 @@ import type { HuiCardElementEditor } from "../card-editor/hui-card-element-edito
 import "../card-editor/hui-card-picker";
 import "../hui-element-editor";
 import type { ConfigChangedEvent } from "../hui-element-editor";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { GUIModeChangedEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
@@ -23,11 +32,13 @@ const conditionStruct = object({
   state: optional(string()),
   state_not: optional(string()),
 });
-const cardConfigStruct = object({
-  type: string(),
-  card: any(),
-  conditions: optional(array(conditionStruct)),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    card: any(),
+    conditions: optional(array(conditionStruct)),
+  })
+);
 
 @customElement("hui-conditional-card-editor")
 export class HuiConditionalCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index e29fd4d03e..0d6910602d 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -9,6 +9,7 @@ import {
   array,
   assert,
   boolean,
+  assign,
   literal,
   number,
   object,
@@ -44,10 +45,13 @@ import {
   SubElementEditorConfig,
 } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
 const buttonEntitiesRowConfigStruct = object({
   type: literal("button"),
-  name: string(),
+  entity: optional(string()),
+  name: optional(string()),
+  icon: optional(string()),
   action_name: optional(string()),
   tap_action: actionConfigStruct,
   hold_action: optional(actionConfigStruct),
@@ -107,9 +111,14 @@ const buttonsEntitiesRowConfigStruct = object({
     union([
       object({
         entity: string(),
+        name: optional(string()),
         icon: optional(string()),
         image: optional(string()),
-        name: optional(string()),
+        show_name: optional(boolean()),
+        show_icon: optional(boolean()),
+        tap_action: optional(actionConfigStruct),
+        hold_action: optional(actionConfigStruct),
+        double_tap_action: optional(actionConfigStruct),
       }),
       string(),
     ])
@@ -151,18 +160,20 @@ const entitiesRowConfigStruct = union([
   customRowConfigStruct,
 ]);
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(union([string(), boolean()])),
-  entity: optional(entityId()),
-  theme: optional(string()),
-  icon: optional(string()),
-  show_header_toggle: optional(boolean()),
-  state_color: optional(boolean()),
-  entities: array(entitiesRowConfigStruct),
-  header: optional(headerFooterConfigStructs),
-  footer: optional(headerFooterConfigStructs),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(union([string(), boolean()])),
+    entity: optional(entityId()),
+    theme: optional(string()),
+    icon: optional(string()),
+    show_header_toggle: optional(boolean()),
+    state_color: optional(boolean()),
+    entities: array(entitiesRowConfigStruct),
+    header: optional(headerFooterConfigStructs),
+    footer: optional(headerFooterConfigStructs),
+  })
+);
 
 @customElement("hui-entities-card-editor")
 export class HuiEntitiesCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
index 2cf14f0e42..55a033ef11 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
@@ -1,7 +1,7 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, object, optional, string, assign } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stateIcon } from "../../../../common/entity/state_icon";
 import "../../../../components/entity/ha-entity-attribute-picker";
@@ -15,17 +15,20 @@ import { headerFooterConfigStructs } from "../../header-footer/structs";
 import { LovelaceCardEditor } from "../../types";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  icon: optional(string()),
-  attribute: optional(string()),
-  unit: optional(string()),
-  theme: optional(string()),
-  footer: optional(headerFooterConfigStructs),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    icon: optional(string()),
+    attribute: optional(string()),
+    unit: optional(string()),
+    theme: optional(string()),
+    footer: optional(headerFooterConfigStructs),
+  })
+);
 
 @customElement("hui-entity-card-editor")
 export class HuiEntityCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts
index 3776dee7b0..902e438247 100644
--- a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts
@@ -1,7 +1,15 @@
 import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, boolean, number, object, optional, string } from "superstruct";
+import {
+  assert,
+  assign,
+  boolean,
+  number,
+  object,
+  optional,
+  string,
+} from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
 import "../../../../components/ha-formfield";
@@ -11,20 +19,23 @@ import { GaugeCardConfig, SeverityConfig } from "../../cards/types";
 import "../../components/hui-entity-editor";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  name: optional(string()),
-  entity: optional(string()),
-  unit: optional(string()),
-  min: optional(number()),
-  max: optional(number()),
-  severity: optional(object()),
-  theme: optional(string()),
-  needle: optional(boolean()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    name: optional(string()),
+    entity: optional(string()),
+    unit: optional(string()),
+    min: optional(number()),
+    max: optional(number()),
+    severity: optional(object()),
+    theme: optional(string()),
+    needle: optional(boolean()),
+  })
+);
 
 const includeDomains = ["counter", "input_number", "number", "sensor"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
index 91b6554666..22b068abbe 100644
--- a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
@@ -12,6 +12,7 @@ import {
   optional,
   string,
   union,
+  assign,
 } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
@@ -29,18 +30,21 @@ import { processEditorEntities } from "../process-editor-entities";
 import { entitiesConfigStruct } from "../structs/entities-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(union([string(), number()])),
-  theme: optional(string()),
-  columns: optional(number()),
-  show_name: optional(boolean()),
-  show_state: optional(boolean()),
-  show_icon: optional(boolean()),
-  state_color: optional(boolean()),
-  entities: array(entitiesConfigStruct),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(union([string(), number()])),
+    theme: optional(string()),
+    columns: optional(number()),
+    show_name: optional(boolean()),
+    show_state: optional(boolean()),
+    show_icon: optional(boolean()),
+    state_color: optional(boolean()),
+    entities: array(entitiesConfigStruct),
+  })
+);
 
 @customElement("hui-glance-card-editor")
 export class HuiGlanceCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts
index 4d7f8262f4..1d45bce946 100644
--- a/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts
@@ -4,6 +4,7 @@ import {
   any,
   array,
   assert,
+  assign,
   boolean,
   number,
   object,
@@ -13,15 +14,18 @@ import {
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
 import { GridCardConfig } from "../../cards/types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { HuiStackCardEditor } from "./hui-stack-card-editor";
 
-const cardConfigStruct = object({
-  type: string(),
-  cards: array(any()),
-  title: optional(string()),
-  square: optional(boolean()),
-  columns: optional(number()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    cards: array(any()),
+    title: optional(string()),
+    square: optional(boolean()),
+    columns: optional(number()),
+  })
+);
 
 @customElement("hui-grid-card-editor")
 export class HuiGridCardEditor extends HuiStackCardEditor {
diff --git a/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
index 405277dd74..2be90322cf 100644
--- a/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
@@ -1,7 +1,15 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { array, assert, number, object, optional, string } from "superstruct";
+import {
+  array,
+  assert,
+  number,
+  object,
+  optional,
+  string,
+  assign,
+} from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { HomeAssistant } from "../../../../types";
 import { HistoryGraphCardConfig } from "../../cards/types";
@@ -12,14 +20,17 @@ import { processEditorEntities } from "../process-editor-entities";
 import { entitiesConfigStruct } from "../structs/entities-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  entities: array(entitiesConfigStruct),
-  title: optional(string()),
-  hours_to_show: optional(number()),
-  refresh_interval: optional(number()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entities: array(entitiesConfigStruct),
+    title: optional(string()),
+    hours_to_show: optional(number()),
+    refresh_interval: optional(number()),
+  })
+);
 
 @customElement("hui-history-graph-card-editor")
 export class HuiHistoryGraphCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts
index 4fea25f1f9..874105247d 100644
--- a/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts
@@ -1,22 +1,25 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, assign, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import { HomeAssistant } from "../../../../types";
 import { HumidifierCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    theme: optional(string()),
+  })
+);
 
 const includeDomains = ["humidifier"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts
index 6028a62395..ade1266f61 100644
--- a/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts
@@ -1,20 +1,23 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, assign, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { HomeAssistant } from "../../../../types";
 import { IframeCardConfig } from "../../cards/types";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(string()),
-  url: optional(string()),
-  aspect_ratio: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(string()),
+    url: optional(string()),
+    aspect_ratio: optional(string()),
+  })
+);
 
 @customElement("hui-iframe-card-editor")
 export class HuiIframeCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
index 86e499f7bc..13f0f1bb0c 100644
--- a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
@@ -1,7 +1,7 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, object, optional, string, assign } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stateIcon } from "../../../../common/entity/state_icon";
 import "../../../../components/ha-icon-input";
@@ -15,16 +15,19 @@ import { LovelaceCardEditor } from "../../types";
 import { actionConfigStruct } from "../structs/action-struct";
 import { EditorTarget } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  name: optional(string()),
-  entity: optional(string()),
-  theme: optional(string()),
-  icon: optional(string()),
-  hold_action: optional(actionConfigStruct),
-  double_tap_action: optional(actionConfigStruct),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    name: optional(string()),
+    entity: optional(string()),
+    theme: optional(string()),
+    icon: optional(string()),
+    hold_action: optional(actionConfigStruct),
+    double_tap_action: optional(actionConfigStruct),
+  })
+);
 
 const includeDomains = ["light"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts
index f99c840bb7..13887619c7 100644
--- a/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts
@@ -1,7 +1,15 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { array, assert, number, object, optional, string } from "superstruct";
+import {
+  array,
+  assert,
+  assign,
+  number,
+  object,
+  optional,
+  string,
+} from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entities-picker";
 import "../../../../components/entity/ha-entity-picker";
@@ -10,16 +18,19 @@ import { LogbookCardConfig } from "../../cards/types";
 import "../../components/hui-entity-editor";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  entities: optional(array(string())),
-  title: optional(string()),
-  hours_to_show: optional(number()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entities: optional(array(string())),
+    title: optional(string()),
+    hours_to_show: optional(number()),
+    theme: optional(string()),
+  })
+);
 
 @customElement("hui-logbook-card-editor")
 export class HuiLogbookCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
index 6e1b26fe9a..18b54b2450 100644
--- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
@@ -9,6 +9,7 @@ import {
   object,
   optional,
   string,
+  assign,
 } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
@@ -25,17 +26,20 @@ import { processEditorEntities } from "../process-editor-entities";
 import { entitiesConfigStruct } from "../structs/entities-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(string()),
-  aspect_ratio: optional(string()),
-  default_zoom: optional(number()),
-  dark_mode: optional(boolean()),
-  entities: array(entitiesConfigStruct),
-  hours_to_show: optional(number()),
-  geo_location_sources: optional(array(string())),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(string()),
+    aspect_ratio: optional(string()),
+    default_zoom: optional(number()),
+    dark_mode: optional(boolean()),
+    entities: array(entitiesConfigStruct),
+    hours_to_show: optional(number()),
+    geo_location_sources: optional(array(string())),
+  })
+);
 
 @customElement("hui-map-card-editor")
 export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
diff --git a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
index 0f9461d19e..7d8e994fd0 100644
--- a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
@@ -2,21 +2,24 @@ import "@polymer/paper-input/paper-input";
 import "@polymer/paper-input/paper-textarea";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, assign, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { HomeAssistant } from "../../../../types";
 import { MarkdownCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(string()),
-  content: string(),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(string()),
+    content: string(),
+    theme: optional(string()),
+  })
+);
 
 @customElement("hui-markdown-card-editor")
 export class HuiMarkdownCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts
index 836c96150b..e1de9a0993 100644
--- a/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts
@@ -1,19 +1,22 @@
 import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, assign, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import { HomeAssistant } from "../../../../types";
 import { MediaControlCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    theme: optional(string()),
+  })
+);
 
 const includeDomains = ["media_player"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
index 3faebebe89..9f6985c076 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
@@ -1,7 +1,7 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, object, optional, string, assign } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { ActionConfig } from "../../../../data/lovelace";
 import { HomeAssistant } from "../../../../types";
@@ -12,14 +12,17 @@ import { LovelaceCardEditor } from "../../types";
 import { actionConfigStruct } from "../structs/action-struct";
 import { EditorTarget } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  image: optional(string()),
-  tap_action: optional(actionConfigStruct),
-  hold_action: optional(actionConfigStruct),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    image: optional(string()),
+    tap_action: optional(actionConfigStruct),
+    hold_action: optional(actionConfigStruct),
+    theme: optional(string()),
+  })
+);
 
 @customElement("hui-picture-card-editor")
 export class HuiPictureCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
index 69428d273e..37a73d2630 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
@@ -4,7 +4,7 @@ import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, boolean, object, optional, string } from "superstruct";
+import { assert, boolean, object, optional, string, assign } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
 import "../../../../components/ha-formfield";
@@ -19,21 +19,24 @@ import { LovelaceCardEditor } from "../../types";
 import { actionConfigStruct } from "../structs/action-struct";
 import { EditorTarget } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  image: optional(string()),
-  name: optional(string()),
-  camera_image: optional(string()),
-  camera_view: optional(string()),
-  aspect_ratio: optional(string()),
-  tap_action: optional(actionConfigStruct),
-  hold_action: optional(actionConfigStruct),
-  show_name: optional(boolean()),
-  show_state: optional(boolean()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    image: optional(string()),
+    name: optional(string()),
+    camera_image: optional(string()),
+    camera_view: optional(string()),
+    aspect_ratio: optional(string()),
+    tap_action: optional(actionConfigStruct),
+    hold_action: optional(actionConfigStruct),
+    show_name: optional(boolean()),
+    show_state: optional(boolean()),
+    theme: optional(string()),
+  })
+);
 
 const includeDomains = ["camera"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
index 37140e59b4..eb38a5a36b 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
@@ -4,7 +4,7 @@ import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { array, assert, object, optional, string } from "superstruct";
+import { array, assert, object, optional, string, assign } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import { ActionConfig } from "../../../../data/lovelace";
@@ -20,20 +20,23 @@ import { actionConfigStruct } from "../structs/action-struct";
 import { entitiesConfigStruct } from "../structs/entities-struct";
 import { EditorTarget } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(string()),
-  entity: optional(string()),
-  image: optional(string()),
-  camera_image: optional(string()),
-  camera_view: optional(string()),
-  aspect_ratio: optional(string()),
-  tap_action: optional(actionConfigStruct),
-  hold_action: optional(actionConfigStruct),
-  entities: array(entitiesConfigStruct),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(string()),
+    entity: optional(string()),
+    image: optional(string()),
+    camera_image: optional(string()),
+    camera_view: optional(string()),
+    aspect_ratio: optional(string()),
+    tap_action: optional(actionConfigStruct),
+    hold_action: optional(actionConfigStruct),
+    entities: array(entitiesConfigStruct),
+    theme: optional(string()),
+  })
+);
 
 const includeDomains = ["camera"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
index b7b39db62d..8145feda36 100644
--- a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
@@ -1,7 +1,7 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, assign, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/ha-icon";
@@ -9,15 +9,18 @@ import { HomeAssistant } from "../../../../types";
 import { PlantStatusCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    theme: optional(string()),
+  })
+);
 
 const includeDomains = ["plant"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts
index 5049e9a964..2e6273e410 100644
--- a/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts
@@ -4,7 +4,7 @@ import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, number, object, optional, string } from "superstruct";
+import { assert, assign, number, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stateIcon } from "../../../../common/entity/state_icon";
 import "../../../../components/entity/ha-entity-picker";
@@ -15,20 +15,23 @@ import { HomeAssistant } from "../../../../types";
 import { SensorCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  icon: optional(string()),
-  graph: optional(string()),
-  unit: optional(string()),
-  detail: optional(number()),
-  theme: optional(string()),
-  hours_to_show: optional(number()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    icon: optional(string()),
+    graph: optional(string()),
+    unit: optional(string()),
+    detail: optional(number()),
+    theme: optional(string()),
+    hours_to_show: optional(number()),
+  })
+);
 
 const includeDomains = ["counter", "input_number", "number", "sensor"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
index 2b473c1198..2b1ca001a6 100644
--- a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
@@ -1,20 +1,23 @@
 import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, assign, object, optional, string } from "superstruct";
 import { isComponentLoaded } from "../../../../common/config/is_component_loaded";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { HomeAssistant } from "../../../../types";
 import { ShoppingListCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 
-const cardConfigStruct = object({
-  type: string(),
-  title: optional(string()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    title: optional(string()),
+    theme: optional(string()),
+  })
+);
 
 @customElement("hui-shopping-list-card-editor")
 export class HuiShoppingListEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
index 9115370c32..2c52f0a402 100644
--- a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
@@ -3,7 +3,15 @@ import "@polymer/paper-tabs";
 import "@polymer/paper-tabs/paper-tab";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state, query } from "lit/decorators";
-import { any, array, assert, object, optional, string } from "superstruct";
+import {
+  any,
+  array,
+  assert,
+  assign,
+  object,
+  optional,
+  string,
+} from "superstruct";
 import { fireEvent, HASSDomEvent } from "../../../../common/dom/fire_event";
 import { LovelaceCardConfig, LovelaceConfig } from "../../../../data/lovelace";
 import { HomeAssistant } from "../../../../types";
@@ -13,14 +21,17 @@ import "../card-editor/hui-card-element-editor";
 import type { HuiCardElementEditor } from "../card-editor/hui-card-element-editor";
 import "../card-editor/hui-card-picker";
 import type { ConfigChangedEvent } from "../hui-element-editor";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { GUIModeChangedEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  cards: array(any()),
-  title: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    cards: array(any()),
+    title: optional(string()),
+  })
+);
 
 @customElement("hui-stack-card-editor")
 export class HuiStackCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts
index 4acd31bca9..9eab0ed1d7 100644
--- a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts
@@ -10,6 +10,7 @@ import {
   optional,
   string,
   union,
+  assign,
 } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { HomeAssistant } from "../../../../types";
@@ -25,6 +26,7 @@ import "../../../../components/ha-checkbox";
 import { StatisticType } from "../../../../data/history";
 import "../../../../components/ha-radio";
 import type { HaRadio } from "../../../../components/ha-radio";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
 const statTypeStruct = union([
   literal("sum"),
@@ -33,14 +35,16 @@ const statTypeStruct = union([
   literal("mean"),
 ]);
 
-const cardConfigStruct = object({
-  type: string(),
-  entities: array(entitiesConfigStruct),
-  title: optional(string()),
-  days_to_show: optional(number()),
-  chart_type: optional(union([literal("bar"), literal("line")])),
-  stat_types: optional(union([array(statTypeStruct), statTypeStruct])),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entities: array(entitiesConfigStruct),
+    title: optional(string()),
+    days_to_show: optional(number()),
+    chart_type: optional(union([literal("bar"), literal("line")])),
+    stat_types: optional(union([array(statTypeStruct), statTypeStruct])),
+  })
+);
 
 @customElement("hui-statistics-graph-card-editor")
 export class HuiStatisticsGraphCardEditor
diff --git a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
index d965849951..b1b9846aa9 100644
--- a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
@@ -1,22 +1,25 @@
 import "@polymer/paper-input/paper-input";
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, object, optional, string } from "superstruct";
+import { assert, assign, object, optional, string } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import { HomeAssistant } from "../../../../types";
 import { ThermostatCardConfig } from "../../cards/types";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  theme: optional(string()),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    theme: optional(string()),
+  })
+);
 
 const includeDomains = ["climate"];
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
index e610847a4d..38ccd48d12 100644
--- a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
@@ -1,6 +1,6 @@
 import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { assert, boolean, object, optional, string } from "superstruct";
+import { assert, boolean, object, optional, string, assign } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeRTLDirection } from "../../../../common/util/compute_rtl";
 import "../../../../components/entity/ha-entity-attribute-picker";
@@ -14,18 +14,21 @@ import { LovelaceCardEditor } from "../../types";
 import { actionConfigStruct } from "../structs/action-struct";
 import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 
-const cardConfigStruct = object({
-  type: string(),
-  entity: optional(string()),
-  name: optional(string()),
-  theme: optional(string()),
-  show_forecast: optional(boolean()),
-  secondary_info_attribute: optional(string()),
-  tap_action: optional(actionConfigStruct),
-  hold_action: optional(actionConfigStruct),
-  double_tap_action: optional(actionConfigStruct),
-});
+const cardConfigStruct = assign(
+  baseLovelaceCardConfig,
+  object({
+    entity: optional(string()),
+    name: optional(string()),
+    theme: optional(string()),
+    show_forecast: optional(boolean()),
+    secondary_info_attribute: optional(string()),
+    tap_action: optional(actionConfigStruct),
+    hold_action: optional(actionConfigStruct),
+    double_tap_action: optional(actionConfigStruct),
+  })
+);
 
 const includeDomains = ["weather"];
 
diff --git a/src/panels/lovelace/editor/structs/base-card-struct.ts b/src/panels/lovelace/editor/structs/base-card-struct.ts
new file mode 100644
index 0000000000..49e18c3b05
--- /dev/null
+++ b/src/panels/lovelace/editor/structs/base-card-struct.ts
@@ -0,0 +1,6 @@
+import { object, string, any } from "superstruct";
+
+export const baseLovelaceCardConfig = object({
+  type: string(),
+  view_layout: any(),
+});
diff --git a/src/panels/lovelace/entity-rows/hui-input-datetime-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-datetime-entity-row.ts
index 0567009b12..c3441ac769 100644
--- a/src/panels/lovelace/entity-rows/hui-input-datetime-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-datetime-entity-row.ts
@@ -1,9 +1,13 @@
-import { html, LitElement, PropertyValues, TemplateResult } from "lit";
-import { customElement, property, state, query } from "lit/decorators";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
 import "../../../components/ha-date-input";
-import type { HaDateInput } from "../../../components/ha-date-input";
-import "../../../components/paper-time-input";
-import type { PaperTimeInput } from "../../../components/paper-time-input";
 import { UNAVAILABLE_STATES, UNKNOWN } from "../../../data/entity";
 import { setInputDateTimeValue } from "../../../data/input_datetime";
 import type { HomeAssistant } from "../../../types";
@@ -11,6 +15,7 @@ import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-generic-entity-row";
 import { createEntityNotFoundWarning } from "../components/hui-warning";
 import type { EntityConfig, LovelaceRow } from "./types";
+import "../../../components/ha-time-input";
 
 @customElement("hui-input-datetime-entity-row")
 class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
@@ -18,10 +23,6 @@ class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
 
   @state() private _config?: EntityConfig;
 
-  @query("paper-time-input") private _timeInputEl?: PaperTimeInput;
-
-  @query("ha-date-input") private _dateInputEl?: HaDateInput;
-
   public setConfig(config: EntityConfig): void {
     if (!config) {
       throw new Error("Invalid configuration");
@@ -55,27 +56,25 @@ class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
               <ha-date-input
                 .disabled=${UNAVAILABLE_STATES.includes(stateObj.state)}
                 .value=${`${stateObj.attributes.year}-${stateObj.attributes.month}-${stateObj.attributes.day}`}
-                @value-changed=${this._selectedValueChanged}
+                @value-changed=${this._dateChanged}
               >
               </ha-date-input>
-              ${stateObj.attributes.has_time ? "," : ""}
             `
           : ``}
         ${stateObj.attributes.has_time
           ? html`
-              <paper-time-input
+              <ha-time-input
+                .value=${stateObj.state === UNKNOWN
+                  ? ""
+                  : stateObj.attributes.has_date
+                  ? stateObj.state.split(" ")[1]
+                  : stateObj.state}
+                .locale=${this.hass.locale}
                 .disabled=${UNAVAILABLE_STATES.includes(stateObj.state)}
-                .hour=${stateObj.state === UNKNOWN
-                  ? ""
-                  : ("0" + stateObj.attributes.hour).slice(-2)}
-                .min=${stateObj.state === UNKNOWN
-                  ? ""
-                  : ("0" + stateObj.attributes.minute).slice(-2)}
-                @change=${this._selectedValueChanged}
-                @click=${this._stopEventPropagation}
                 hide-label
-                .format=${24}
-              ></paper-time-input>
+                @value-changed=${this._timeChanged}
+                @click=${this._stopEventPropagation}
+              ></ha-time-input>
             `
           : ``}
       </hui-generic-entity-row>
@@ -86,19 +85,37 @@ class HuiInputDatetimeEntityRow extends LitElement implements LovelaceRow {
     ev.stopPropagation();
   }
 
-  private _selectedValueChanged(ev): void {
+  private _timeChanged(ev): void {
+    const stateObj = this.hass!.states[this._config!.entity];
+    setInputDateTimeValue(
+      this.hass!,
+      stateObj.entity_id,
+      ev.detail.value,
+      stateObj.attributes.has_date ? stateObj.state.split(" ")[0] : undefined
+    );
+    ev.target.blur();
+  }
+
+  private _dateChanged(ev): void {
     const stateObj = this.hass!.states[this._config!.entity];
 
-    const time = this._timeInputEl
-      ? this._timeInputEl.value?.trim()
-      : undefined;
-
-    const date = this._dateInputEl ? this._dateInputEl.value : undefined;
-
-    setInputDateTimeValue(this.hass!, stateObj.entity_id, time, date);
+    setInputDateTimeValue(
+      this.hass!,
+      stateObj.entity_id,
+      stateObj.attributes.has_time ? stateObj.state.split(" ")[1] : undefined,
+      ev.detail.value
+    );
 
     ev.target.blur();
   }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      ha-date-input + ha-time-input {
+        margin-left: 4px;
+      }
+    `;
+  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/strategies/original-states-strategy.ts b/src/panels/lovelace/strategies/original-states-strategy.ts
index 696e66759a..d8941564a1 100644
--- a/src/panels/lovelace/strategies/original-states-strategy.ts
+++ b/src/panels/lovelace/strategies/original-states-strategy.ts
@@ -1,8 +1,9 @@
 import { STATE_NOT_RUNNING } from "home-assistant-js-websocket";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { subscribeOne } from "../../../common/util/subscribe-one";
 import { subscribeAreaRegistry } from "../../../data/area_registry";
 import { subscribeDeviceRegistry } from "../../../data/device_registry";
-import { getEnergyPreferences } from "../../../data/energy";
+import { EnergyPreferences, getEnergyPreferences } from "../../../data/energy";
 import { subscribeEntityRegistry } from "../../../data/entity_registry";
 import { generateDefaultViewConfig } from "../common/generate-lovelace-config";
 import {
@@ -38,16 +39,30 @@ export class OriginalStatesStrategy {
       subscribeEntityRegistry(hass.connection, () => undefined);
     }
 
-    const [areaEntries, deviceEntries, entityEntries, localize, energyPrefs] =
+    let energyPromise: Promise<EnergyPreferences> | undefined;
+
+    if (isComponentLoaded(hass, "energy")) {
+      energyPromise = getEnergyPreferences(hass);
+    }
+
+    const [areaEntries, deviceEntries, entityEntries, localize] =
       await Promise.all([
         subscribeOne(hass.connection, subscribeAreaRegistry),
         subscribeOne(hass.connection, subscribeDeviceRegistry),
         subscribeOne(hass.connection, subscribeEntityRegistry),
         hass.loadBackendTranslation("title"),
-        // It raises if not configured, just swallow that.
-        getEnergyPreferences(hass).catch(() => undefined),
       ]);
 
+    let energyPrefs: EnergyPreferences | undefined;
+
+    if (energyPromise) {
+      try {
+        energyPrefs = await energyPromise;
+      } catch (_) {
+        // Nothing to do here
+      }
+    }
+
     // User can override default view. If they didn't, we will add one
     // that contains all entities.
     const view = generateDefaultViewConfig(
diff --git a/src/resources/ha-style.ts b/src/resources/ha-style.ts
index 9416b15f99..a570a73c22 100644
--- a/src/resources/ha-style.ts
+++ b/src/resources/ha-style.ts
@@ -38,11 +38,11 @@ documentContainer.innerHTML = `<custom-style>
       --scrollbar-thumb-color: rgb(194, 194, 194);
 
       --error-color: #db4437;
-      --warning-color: #FF9800;
-      --success-color: #0f9d58;
-      --info-color: #4285f4;
+      --warning-color: #ffa600;
+      --success-color: #43a047;
+      --info-color: #039be5;
 
-      /* background and sidebar */
+      /* backgrounds */
       --card-background-color: #ffffff;
       --primary-background-color: #fafafa;
       --secondary-background-color: #e5e5e5; /* behind the cards on state */
@@ -55,8 +55,9 @@ documentContainer.innerHTML = `<custom-style>
       --label-badge-blue: #039be5;
       --label-badge-green: #0DA035;
       --label-badge-yellow: #f4b400;
+      --label-badge-grey: #9e9e9e;
 
-      /* states and badges */
+      /* states */
       --state-icon-color: #44739e;
       /* an active state is anything that would require attention */ 
       --state-icon-active-color: #FDD835;
@@ -69,7 +70,7 @@ documentContainer.innerHTML = `<custom-style>
       --state-not_home-color: #ff0029;
       /* --state-unavailable-color: #a0a0a0; derived from disabled-text-color */
       --state-unknown-color: #606060;
-      --state-idle-color: #377eb8;
+      --state-idle-color: #7990a3;
 
       /* climate state colors */
       --state-climate-auto-color: #008000;
@@ -87,23 +88,9 @@ documentContainer.innerHTML = `<custom-style>
       --energy-grid-return-color: #673ab7;
       --energy-solar-color: #ff9800;
       --energy-non-fossil-color: #0f9d58;
-
-      --rgb-energy-solar-color: 255, 152, 0;
-
-      /*
-        Paper-styles color.html dependency is stripped on build.
-        When a default paper-style color is used, it needs to be copied
-        from paper-styles/color.html to here.
-      */
-
-      --paper-grey-50: #fafafa; /* default for: --mwc-switch-unchecked-button-color */
-      --paper-grey-200: #eeeeee;  /* for ha-date-picker-style */
-      --paper-grey-500: #9e9e9e;  /* --label-badge-grey */
-
-      /* for paper-slider */
-      --paper-green-400: #66bb6a;
-      --paper-blue-400: #42a5f5;
-      --paper-orange-400: #ffa726;
+      --energy-battery-out-color: #4db6ac;
+      --energy-battery-in-color: #f06292;
+      --energy-gas-color: #8E021B;
 
       /* opacity for dark text on a light background */
       --dark-divider-opacity: 0.12;
@@ -117,9 +104,6 @@ documentContainer.innerHTML = `<custom-style>
       --light-secondary-opacity: 0.7;
       --light-primary-opacity: 1.0;
 
-      /* set our slider style */
-      --ha-slider-pin-font-size: 15px;
-
       /* rgb */
       --rgb-primary-color: 3, 169, 244;
       --rgb-accent-color: 255, 152, 0;
diff --git a/src/resources/styles.ts b/src/resources/styles.ts
index 716de34179..6f7cb696ab 100644
--- a/src/resources/styles.ts
+++ b/src/resources/styles.ts
@@ -52,8 +52,7 @@ export const derivedStyles = {
   "switch-unchecked-track-color": "var(--switch-unchecked-color, #000000)",
   "slider-color": "var(--primary-color)",
   "slider-secondary-color": "var(--light-primary-color)",
-  "slider-bar-color": "var(--disabled-text-color)",
-  "label-badge-grey": "var(--paper-grey-500)",
+  "slider-track-color": "var(--scrollbar-thumb-color)",
   "label-badge-background-color": "var(--card-background-color)",
   "label-badge-text-color": "rgba(var(--rgb-primary-text-color), 0.8)",
   "paper-listbox-background-color": "var(--card-background-color)",
@@ -67,7 +66,7 @@ export const derivedStyles = {
   "paper-slider-pin-start-color": "var(--slider-color)",
   "paper-slider-active-color": "var(--slider-color)",
   "paper-slider-secondary-color": "var(--slider-secondary-color)",
-  "paper-slider-container-color": "var(--slider-bar-color)",
+  "paper-slider-container-color": "var(--slider-track-color)",
   "data-table-background-color": "var(--card-background-color)",
   "markdown-code-background-color": "var(--primary-background-color)",
   "mdc-theme-primary": "var(--primary-color)",
diff --git a/src/translations/en.json b/src/translations/en.json
index 24b363da27..c7848aa034 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -74,6 +74,7 @@
       "armed_home": "[%key:state_badge::alarm_control_panel::armed%]",
       "armed_away": "[%key:state_badge::alarm_control_panel::armed%]",
       "armed_night": "[%key:state_badge::alarm_control_panel::armed%]",
+      "armed_vacation": "[%key:state_badge::alarm_control_panel::armed%]",
       "armed_custom_bypass": "[%key:state_badge::alarm_control_panel::armed%]",
       "pending": "Pend",
       "arming": "Arming",
@@ -117,6 +118,7 @@
         "arm_home": "Arm home",
         "arm_away": "Arm away",
         "arm_night": "Arm night",
+        "arm_vacation": "Arm vacation",
         "arm_custom_bypass": "Custom bypass"
       },
       "automation": {
@@ -934,7 +936,8 @@
         "common": {
           "editor": {
             "confirm_unsaved": "You have unsaved changes. Are you sure you want to leave?"
-          }
+          },
+          "learn_more": "Learn more"
         },
         "areas": {
           "caption": "Areas",
@@ -1046,6 +1049,30 @@
             "stat_return_to_grid": "Solar energy returned to the grid",
             "stat_predicted_production": "Prediction of your solar energy production"
           },
+          "battery": {
+            "title": "Home Battery Storage",
+            "sub": "If you have a battery system, you can configure it to monitor how much energy was stored and used from your battery.",
+            "learn_more": "More information on how to get started."
+          },
+          "gas": {
+            "title": "Gas Consumption",
+            "sub": "Let Home Assistant monitor your gas usage.",
+            "learn_more": "More information on how to get started.",
+            "dialog": {
+              "header": "Configure gas consumption",
+              "paragraph": "Gas consumption is the volume of gas that flows to your home.",
+              "energy_stat": "Consumed Energy (m³)",
+              "cost_para": "Select how Home Assistant should keep track of the costs of the consumed energy.",
+              "no_cost": "Do not track costs",
+              "cost_stat": "Use an entity tracking the total costs",
+              "cost_stat_input": "Total Costs Entity",
+              "cost_entity": "Use an entity with current price",
+              "cost_entity_input": "Entity with the current price",
+              "cost_number": "Use a static price",
+              "cost_number_input": "Price per m³",
+              "cost_number_suffix": "{currency}/m³"
+            }
+          },
           "device_consumption": {
             "title": "Individual devices",
             "sub": "Tracking the energy usage of individual devices allows Home Assistant to break down your energy usage by device.",
@@ -1055,6 +1082,42 @@
             "dialog": {
               "selected_stat_intro": "Select the entity that represents the device energy usage."
             }
+          },
+          "validation": {
+            "issues": {
+              "entity_not_defined": {
+                "title": "Entity not defined",
+                "description": "Check the integration or your configuration that provides:"
+              },
+              "recorder_untracked": {
+                "title": "Entity not tracked",
+                "description": "The recorder has been configured to exclude these configured entities:"
+              },
+              "entity_unavailable": {
+                "title": "Entity unavailable",
+                "description": "The state of these configured entities are currently not available:"
+              },
+              "entity_state_non_numeric": {
+                "title": "Entity has non-numeric state",
+                "description": "The following entities have a state that cannot be parsed as a number:"
+              },
+              "entity_negative_state": {
+                "title": "Entity has a negative state",
+                "description": "The following entities have a negative state while a positive state is expected:"
+              },
+              "entity_unexpected_unit_energy": {
+                "title": "Unexpected unit of measurement",
+                "description": "The following entities do not have the expected units of measurement 'kWh' or 'Wh':"
+              },
+              "entity_unexpected_unit_price": {
+                "title": "Unexpected unit of measurement",
+                "description": "The following entities do not have the expected units of measurement ''{currency}/kWh'' or ''{currency}/Wh'':"
+              },
+              "entity_unexpected_state_class_total_increasing": {
+                "title": "Unexpected state class",
+                "description": "The following entities do not have the expected state class 'total_increasing'"
+              }
+            }
           }
         },
         "helpers": {
@@ -2124,6 +2187,7 @@
               "entity_id": "Entity ID",
               "integration": "Integration",
               "area": "Area",
+              "disabled_by": "Disabled by",
               "status": "Status"
             },
             "selected": "{number} selected",
@@ -2255,7 +2319,7 @@
             "system_options": "System options",
             "documentation": "Documentation",
             "delete": "Delete",
-            "delete_confirm": "Are you sure you want to delete this integration?",
+            "delete_confirm": "Are you sure you want to delete the {title} integration?",
             "reload": "Reload",
             "restart_confirm": "Restart Home Assistant to finish removing this integration",
             "reload_confirm": "The integration was reloaded",
@@ -2713,7 +2777,7 @@
             "node_ready": "Node Ready",
             "device_config": "Configure Device",
             "reinterview_device": "Re-interview Device",
-            "heal_node": "Heal Node",
+            "heal_node": "Heal Device",
             "remove_failed": "Remove Failed Device"
           },
           "node_config": {
@@ -3700,19 +3764,19 @@
           "finish": "Next"
         },
         "restore": {
-          "description": "Alternatively you can restore from a previous snapshot.",
+          "description": "Alternatively you can restore from a previous backup.",
           "in_progress": "Restore in progress",
           "show_log": "Show full log",
           "hide_log": "Hide full log",
-          "full_snapshot": "[%key:supervisor::snapshot::full_snapshot%]",
-          "partial_snapshot": "[%key:supervisor::snapshot::partial_snapshot%]",
-          "type": "[%key:supervisor::snapshot::type%]",
-          "select_type": "[%key:supervisor::snapshot::select_type%]",
-          "folders": "[%key:supervisor::snapshot::folders%]",
-          "addons": "[%key:supervisor::snapshot::addons%]",
-          "password_protection": "[%key:supervisor::snapshot::password_protection%]",
-          "password": "[%key:supervisor::snapshot::password%]",
-          "confirm_password": "[%key:supervisor::snapshot::confirm_password%]"
+          "full_backup": "[%key:supervisor::backup::full_backup%]",
+          "partial_backup": "[%key:supervisor::backup::partial_backup%]",
+          "type": "[%key:supervisor::backup::type%]",
+          "select_type": "[%key:supervisor::backup::select_type%]",
+          "folders": "[%key:supervisor::backup::folders%]",
+          "addons": "[%key:supervisor::backup::addons%]",
+          "password_protection": "[%key:supervisor::backup::password_protection%]",
+          "password": "[%key:supervisor::backup::password%]",
+          "confirm_password": "[%key:supervisor::backup::confirm_password%]"
         }
       },
       "custom": {
@@ -3959,7 +4023,7 @@
     },
     "panel": {
       "dashboard": "Dashboard",
-      "snapshots": "Snapshots",
+      "backups": "Backups",
       "store": "Add-on Store",
       "system": "System"
     },
@@ -4054,43 +4118,32 @@
         "ram_usage": "Core RAM Usage"
       }
     },
-    "snapshot": {
-      "description": "Snapshots allow you to easily backup and restore all data of your Home Assistant instance.",
-      "available_snapshots": "Available Snapshots",
-      "no_snapshots": "You don't have any snapshots yet.",
-      "create_blocked_not_running": "Creating a snapshot is not possible right now because the system is in {state} state.",
-      "delete_selected": "Delete selected snapshots",
-      "delete_snapshot_title": "Delete snapshot",
-      "delete_snapshot_text": "Do you want to delete {number} {number, plural,\n  one {snapshot}\n  other {snapshots}\n}?",
-      "delete_snapshot_confirm": "delete",
+    "backup": {
+      "no_backups": "You don't have any backups yet.",
+      "create_blocked_not_running": "Creating a backup is not possible right now because the system is in {state} state.",
+      "delete_selected": "Delete selected backups",
+      "delete_backup_title": "Delete backup",
+      "delete_backup_text": "Do you want to delete {number} {number, plural,\n  one {backup}\n  other {backups}\n}?",
+      "delete_backup_confirm": "delete",
       "selected": "{number} selected",
       "failed_to_delete": "Failed to delete",
-      "could_not_create": "Could not create snapshot",
-      "upload_snapshot": "Upload snapshot",
-      "create_snapshot": "Create snapshot",
+      "could_not_create": "Could not create backup",
+      "upload_backup": "Upload backup",
+      "create_backup": "Create backup",
       "create": "Create",
       "created": "Created",
-      "name": "Snapshot name",
-      "type": "Snapshot type",
+      "name": "Backup name",
+      "type": "Backup type",
       "select_type": "Select what to restore",
-      "security": "Security",
-      "full_snapshot": "Full snapshot",
-      "partial_snapshot": "Partial snapshot",
+      "full_backup": "Full backup",
+      "partial_backup": "Partial backup",
       "addons": "Add-ons",
       "folders": "Folders",
-      "password": "Snapshot password",
-      "confirm_password": "Confirm Snapshot password",
+      "password": "Backup password",
+      "confirm_password": "Confirm backup password",
       "password_protection": "Password protection",
-      "password_protected": "password protected",
       "enter_password": "Please enter a password.",
-      "passwords_not_matching": "The passwords does not match",
-      "folder": {
-        "homeassistant": "Home Assistant configuration",
-        "ssl": "SSL",
-        "share": "Share",
-        "media": "Media",
-        "addons/local": "Local add-ons"
-      }
+      "passwords_not_matching": "The passwords does not match"
     },
     "dialog": {
       "network": {
@@ -4133,10 +4186,10 @@
         "text": "Do you want to restart the add-on with your changes?"
       },
       "update": {
-        "snapshot": "Snapshot",
-        "create_snapshot": "Create a snapshot of {name} before updating",
+        "backup": "Backup",
+        "create_backup": "Create a backup of {name} before updating",
         "updating": "Updating {name} to version {version}",
-        "snapshotting": "Creating snapshot of {name}"
+        "creating_backup": "Creating backup of {name}"
       },
       "hardware": {
         "title": "Hardware",
diff --git a/src/types.ts b/src/types.ts
index effe231479..5d25b7bc8e 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -130,7 +130,7 @@ export type FullCalendarView =
 
 export interface ToggleButton {
   label: string;
-  iconPath: string;
+  iconPath?: string;
   value: string;
 }
 
diff --git a/src/util/brands-url.ts b/src/util/brands-url.ts
index 438e47c104..0d39127baf 100644
--- a/src/util/brands-url.ts
+++ b/src/util/brands-url.ts
@@ -1,8 +1,11 @@
-export const brandsUrl = (
-  domain: string,
-  type: "icon" | "logo",
-  useFallback?: boolean
-): string =>
-  `https://brands.home-assistant.io/${
-    useFallback ? "_/" : ""
-  }${domain}/${type}.png`;
+export interface BrandsOptions {
+  domain: string;
+  type: "icon" | "logo" | "icon@2x" | "logo@2x";
+  useFallback?: boolean;
+  darkOptimized?: boolean;
+}
+
+export const brandsUrl = (options: BrandsOptions): string =>
+  `https://brands.home-assistant.io/${options.useFallback ? "_/" : ""}${
+    options.domain
+  }/${options.darkOptimized ? "dark_" : ""}${options.type}.png`;
diff --git a/src/util/hass-attributes-util.ts b/src/util/hass-attributes-util.ts
index 73fa60cd4e..139287bc4b 100644
--- a/src/util/hass-attributes-util.ts
+++ b/src/util/hass-attributes-util.ts
@@ -50,6 +50,7 @@ const hassAttributeUtil = {
     ],
     humidifier: ["dehumidifier", "humidifier"],
     sensor: [
+      "aqi",
       "battery",
       "carbon_dioxide",
       "carbon_monoxide",
@@ -57,13 +58,22 @@ const hassAttributeUtil = {
       "energy",
       "humidity",
       "illuminance",
+      "nitrogen_dioxide",
+      "nitrogen_monoxide",
+      "nitrous_oxide",
+      "ozone",
+      "pm25",
+      "pm1",
+      "pm10",
       "power",
       "power_factor",
       "pressure",
       "monetary",
       "signal_strength",
+      "sulphur_dioxide",
       "temperature",
       "timestamp",
+      "volatile_organic_compounds",
       "voltage",
     ],
     switch: ["switch", "outlet"],
diff --git a/test-mocha/util/generate-brands-url-spec.ts b/test-mocha/util/generate-brands-url-spec.ts
index 169c0e0ca8..68d8df1074 100644
--- a/test-mocha/util/generate-brands-url-spec.ts
+++ b/test-mocha/util/generate-brands-url-spec.ts
@@ -1,33 +1,41 @@
 import { assert } from "chai";
 import { brandsUrl } from "../../src/util/brands-url";
 
-describe("Generate brands Url", function () {
-  it("Generate logo brands url for cloud component without fallback", function () {
+describe("Generate brands Url", () => {
+  it("Generate logo brands url for cloud component without fallback", () => {
     assert.strictEqual(
       // @ts-ignore
-      brandsUrl("cloud", "logo"),
+      brandsUrl({ domain: "cloud", type: "logo" }),
       "https://brands.home-assistant.io/cloud/logo.png"
     );
   });
-  it("Generate icon brands url for cloud component without fallback", function () {
+  it("Generate icon brands url for cloud component without fallback", () => {
     assert.strictEqual(
       // @ts-ignore
-      brandsUrl("cloud", "icon"),
+      brandsUrl({ domain: "cloud", type: "icon" }),
       "https://brands.home-assistant.io/cloud/icon.png"
     );
   });
-  it("Generate logo brands url for cloud component with fallback", function () {
+  it("Generate logo brands url for cloud component with fallback", () => {
     assert.strictEqual(
       // @ts-ignore
-      brandsUrl("cloud", "logo", true),
+      brandsUrl({ domain: "cloud", type: "logo", useFallback: true }),
       "https://brands.home-assistant.io/_/cloud/logo.png"
     );
   });
-  it("Generate icon brands url for cloud component with fallback", function () {
+  it("Generate icon brands url for cloud component with fallback", () => {
     assert.strictEqual(
       // @ts-ignore
-      brandsUrl("cloud", "icon", true),
+      brandsUrl({ domain: "cloud", type: "icon", useFallback: true }),
       "https://brands.home-assistant.io/_/cloud/icon.png"
     );
   });
+
+  it("Generate dark theme optimized logo brands url for cloud component without fallback", () => {
+    assert.strictEqual(
+      // @ts-ignore
+      brandsUrl({ domain: "cloud", type: "logo", darkOptimized: true }),
+      "https://brands.home-assistant.io/cloud/dark_logo.png"
+    );
+  });
 });
diff --git a/translations/frontend/af.json b/translations/frontend/af.json
index b225047649..abf14f9340 100644
--- a/translations/frontend/af.json
+++ b/translations/frontend/af.json
@@ -16,6 +16,14 @@
         "shopping_list": "Inkopielys",
         "states": "Oorsig"
     },
+    "state": {
+        "default": {
+            "off": "Af",
+            "on": "Aan",
+            "unavailable": "Nie beskikbaar nie",
+            "unknown": "Onbekend"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -71,21 +79,13 @@
             "not_home": "[%key:state_badge::person::not_home%]"
         }
     },
-    "state": {
-        "default": {
-            "off": "Af",
-            "on": "Aan",
-            "unavailable": "Nie beskikbaar nie",
-            "unknown": "Onbekend"
-        }
-    },
     "supervisor": {
+        "backup": {
+            "created": "Geskep"
+        },
         "my": {
             "error_addon_no_ingress": "Die aangevraagde byvoegsel ondersteun nie ingryping nie"
         },
-        "snapshot": {
-            "created": "Geskep"
-        },
         "system": {
             "supervisor": {
                 "search": "Soek"
@@ -457,7 +457,6 @@
                             "introduction": "Die aksies is wat Home Assistant sal doen wanneer die outomatisering geaktiveer word.",
                             "learn_more": "Kom meer te wete oor aksies",
                             "name": "Aksie",
-                            "type_select": "Aksie tipe",
                             "type": {
                                 "condition": {
                                     "label": "Voorwaarde"
@@ -480,6 +479,7 @@
                                     "wait_template": "Wag Templaat"
                                 }
                             },
+                            "type_select": "Aksie tipe",
                             "unsupported_action": "Geen UI-ondersteuning vir aksie nie: {action}"
                         },
                         "alias": "Naam",
@@ -492,7 +492,6 @@
                             "introduction": "Voorwaardes is 'n opsionele deel van 'n outomatiseringsreël en kan gebruik word om te verhoed dat 'n aksie plaasvind wanneer dit geaktiveer word. Voorwaardes lyk baie soos snellers maar is baie anders. 'n Sneller sal kyk na gebeure wat in die stelsel gebeur terwyl 'n voorwaarde net kyk hoe die stelsel lyk. Byvoorbeeld: 'n Sneller kan sien dat 'n skakelaar aangeskakel word. 'n Voorwaarde kan net sien of 'n skakelaar tans aan of af is.",
                             "learn_more": "Kom meer te wete oor voorwaardes",
                             "name": "Voorwaarde",
-                            "type_select": "Voorwaarde tipe",
                             "type": {
                                 "numeric_state": {
                                     "above": "Bo",
@@ -531,6 +530,7 @@
                                     "zone": "Sone"
                                 }
                             },
+                            "type_select": "Voorwaarde tipe",
                             "unsupported_condition": "Ongesteunde voorwaarde: {condition}"
                         },
                         "default_name": "Nuwe outomatisering",
@@ -553,7 +553,6 @@
                             "introduction": "Snellers is wat die prosessering van 'n outomatiseringsreël afskop. Dit is moontlik om verskeie snellers vir dieselfde reël te spesifiseer. Sodra 'n sneller begin, sal Home Assistant die voorwaardes, indien enige, bevestig en die aksie roep.",
                             "learn_more": "Kom meer te wete oor snellers",
                             "name": "Sneller",
-                            "type_select": "Sneller tipe",
                             "type": {
                                 "event": {
                                     "context_user_pick": "Voeg gebruiker toe",
@@ -603,16 +602,16 @@
                                     "label": "Templaat",
                                     "value_template": "Waarde templaat"
                                 },
+                                "time": {
+                                    "at": "Om",
+                                    "label": "Tyd"
+                                },
                                 "time_pattern": {
                                     "hours": "Ure",
                                     "label": "Tydpatroon",
                                     "minutes": "Minute",
                                     "seconds": "Sekondes"
                                 },
-                                "time": {
-                                    "at": "Om",
-                                    "label": "Tyd"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -626,6 +625,7 @@
                                     "zone": "Sone"
                                 }
                             },
+                            "type_select": "Sneller tipe",
                             "unsupported_platform": "Ongesteunde platform: {platform}"
                         },
                         "unsaved_confirm": "U het ongestoorde veranderinge. Is u seker u wil die blad verlaat?"
@@ -823,7 +823,6 @@
                         "hub": "Gekonnekteer via",
                         "manuf": "deur {manufacturer}",
                         "no_area": "Geen Gebied",
-                        "options": "Opsies",
                         "rename": "Hernoem",
                         "restart_confirm": "Herbegin Home Assistant om hierdie integrasie te voltooi",
                         "system_options": "Stelselopsies"
@@ -853,7 +852,6 @@
                         "confirm_delete_ignore_title": "Hou op om {name} ignoreer?",
                         "confirm_ignore": "Is u seker dat u nie hierdie integrasie wil instel nie? U kan dit ongedaan maak deur op die 'Wys geïgnoreerde integrasies' in die oorloopmenu regs bo te klik.",
                         "confirm_ignore_title": "Ignoreer ontdekking van {name}?",
-                        "hide_ignored": "Verberg geïgnoreerde integrasies",
                         "ignore": "Ignoreer",
                         "ignored": "Geïgnoreer",
                         "show_ignored": "Toon geïgnoreerde integrasies",
@@ -1112,12 +1110,6 @@
                     "introduction": "Met sones kan u sekere streke op aarde spesifiseer. As 'n persoon binne 'n sone is, neem die toestand die sonenaam aan. Sones kan ook as 'n sneller of toestand gebruik word in outomatiseringsinstellings.",
                     "no_zones_created_yet": "Lyk asof jy nog geen sones geskep het nie."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "interview_failed": "Die toestelonderhoud het misluk. Bykomende inligting kan moontlik in die logboeke beskikbaar wees.",
-                        "interview_started": "Die toestel word ondervra. Dit kan 'n geruime tyd neem."
-                    }
-                },
                 "zwave": {
                     "common": {
                         "index": "Indeks",
@@ -1161,6 +1153,12 @@
                     "values": {
                         "header": "Knooppuntwaardes"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "interview_failed": "Die toestelonderhoud het misluk. Bykomende inligting kan moontlik in die logboeke beskikbaar wees.",
+                        "interview_started": "Die toestel word ondervra. Dit kan 'n geruime tyd neem."
+                    }
                 }
             },
             "custom": {
@@ -1298,7 +1296,6 @@
                         "unsaved_changes": "Ongestoorde veranderinge"
                     },
                     "save_config": {
-                        "cancel": "Toemaar",
                         "close": "maak toe",
                         "header": "Neem beheer van u Lovelace gebruikerskoppelvlak",
                         "para": "Home Assistant sal outomaties u gebruikerskoppelvlak handhaaf, dit opdateer wanneer nuwe entiteite of Lovelace-komponente beskikbaar raak. Alhoewel, as u beheer neem, sal Home Assistant nie meer outomaties veranderings vir u doen nie.",
@@ -1546,6 +1543,12 @@
                     "prompt_copy_token": "Kopieer u toegangs-tekseenheid. Dit sal nie weer gewys word nie.",
                     "prompt_name": "Naam?"
                 },
+                "mfa": {
+                    "confirm_disable": "Is u seker u wil {name} deaktiveer?",
+                    "disable": "Deaktiveer",
+                    "enable": "Aktiveer",
+                    "header": "Multi-faktor Verifikasie Modules"
+                },
                 "mfa_setup": {
                     "close": "Toe",
                     "step_done": "Opstelling gedoen vir {step}",
@@ -1553,12 +1556,6 @@
                     "title_aborted": "Gestaak",
                     "title_success": "Sukses!"
                 },
-                "mfa": {
-                    "confirm_disable": "Is u seker u wil {name} deaktiveer?",
-                    "disable": "Deaktiveer",
-                    "enable": "Aktiveer",
-                    "header": "Multi-faktor Verifikasie Modules"
-                },
                 "push_notifications": {
                     "description": "Stuur kennisgewings na hierdie toestel.",
                     "error_load_platform": "Stel notify.html5 op.",
diff --git a/translations/frontend/ar.json b/translations/frontend/ar.json
index fb02fbde99..019be3496a 100644
--- a/translations/frontend/ar.json
+++ b/translations/frontend/ar.json
@@ -26,6 +26,14 @@
         "shopping_list": "قائمة التسوق",
         "states": "نظرة عامة"
     },
+    "state": {
+        "default": {
+            "off": "مطفئ",
+            "on": "مشغل",
+            "unavailable": "غير متوفر",
+            "unknown": "غير معروف"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -69,9 +77,9 @@
     "state_badge": {
         "alarm_control_panel": {
             "armed": "مفعل",
-            "armed_away": "مفعّل",
-            "armed_custom_bypass": "مفعّل",
-            "armed_home": "مفعّل",
+            "armed_away": "مفعل",
+            "armed_custom_bypass": "مفعل",
+            "armed_home": "مفعل",
             "armed_night": "مفعل",
             "arming": "جاري التفعيل",
             "disarmed": "غير مفعّل",
@@ -87,21 +95,13 @@
         },
         "device_tracker": {
             "home": "في المنزل",
-            "not_home": "بالخارج"
+            "not_home": "خارج المنزل"
         },
         "person": {
             "home": "في المنزل",
             "not_home": "خارج المنزل"
         }
     },
-    "state": {
-        "default": {
-            "off": "مطفئ",
-            "on": "مشغل",
-            "unavailable": "غير متوفر",
-            "unknown": "غير معروف"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -113,7 +113,22 @@
                 }
             },
             "dashboard": {
+                "action_error": {
+                    "get_changelog": "فشل الحصول على سجل تغيير الوظيفة الإضافية",
+                    "go_to_config": "فشل بدء الوظيفة الإضافية - فشل التحقق من صحة التكوين!",
+                    "install": "فشل تثبيت الوظيفة الإضافية",
+                    "restart": "فشل إعادة تشغيل الوظيفة الإضافية",
+                    "start": "فشل بدء تشغيل الوظيفة الإضافية",
+                    "start_invalid_config": "الانتقال إلى التكوين",
+                    "stop": "فشل إيقاف الوظيفة الإضافية",
+                    "uninstall": "فشل إلغاء تثبيت الوظيفة الإضافية",
+                    "validate_config": "فشل التحقق من صحة تكوين الوظيفة الإضافية"
+                },
                 "capability": {
+                    "apparmor": {
+                        "description": "AppArmor ('Application Armor') هو وحدة أمان Linux kernel التي تقيد إمكانات الوظائف الإضافية مثل الوصول إلى الشبكة والوصول إلى المقبس الأولي والإذن بقراءة ملفات معينة أو كتابتها أو تنفيذها. \n\n يمكن لمؤلفي الإضافات توفير ملفات تعريف الأمان الخاصة بهم ، أو تحسينها للوظيفة الإضافية ، أو طلب تعطيلها. إذا تم تعطيل AppArmor ، فسيؤدي ذلك إلى زيادة مخاطر الأمان وبالتالي يكون له تأثير سلبي على درجة أمان الوظيفة الإضافية.",
+                        "title": "AppArmor"
+                    },
                     "auth_api": {
                         "description": "يمكن للوظيفة الإضافية المصادقة على المستخدمين مقابل Home Assistant ، مما يسمح للوظائف الإضافية بمنح المستخدمين إمكانية تسجيل الدخول إلى التطبيقات التي تعمل داخل الوظائف الإضافية ، باستخدام اسم المستخدم / كلمة المرور الخاصة بـ Home Assistant. تشير هذه الشارة إلى ما إذا كان مؤلف الوظيفة الإضافية يطلب هذه الإمكانية.",
                         "title": "مصادقة Home Assistant"
@@ -131,9 +146,15 @@
                         "title": "وصول supervisor API"
                     },
                     "homeassistant_api": {
-                        "description": "يُسمح لهذه الوظيفة الإضافية بالوصول إلى مثيل Home Assistant قيد التشغيل مباشرةً عبر واجهة برمجة تطبيقات Home Assistant. يعالج هذا الوضع المصادقة للوظيفة الإضافية أيضًا ، مما يمكّن الوظيفة الإضافية من التفاعل مع Home Assistant دون الحاجة إلى رموز مصادقة إضافية."
+                        "description": "يُسمح لهذه الوظيفة الإضافية بالوصول إلى مثيل Home Assistant قيد التشغيل مباشرةً عبر واجهة برمجة تطبيقات Home Assistant. يعالج هذا الوضع المصادقة للوظيفة الإضافية أيضًا ، مما يمكّن الوظيفة الإضافية من التفاعل مع Home Assistant دون الحاجة إلى رموز مصادقة إضافية.",
+                        "title": "وصول Home Assistant API"
+                    },
+                    "host_network": {
+                        "description": "تعمل الوظائف الإضافية عادةً في طبقة الشبكة المعزولة الخاصة بها ، مما يمنعها من الوصول إلى شبكة نظام التشغيل المضيف. في بعض الحالات ، يمكن أن يحد عزل الشبكة هذا من الوظائف الإضافية في تقديم خدماتها ، وبالتالي ، يمكن رفع العزلة بواسطة مؤلف الوظيفة الإضافية ، مما يمنح الوظيفة الإضافية حق الوصول الكامل إلى إمكانات الشبكة الخاصة بالجهاز المضيف. يمنح هذا الوظيفة الإضافية المزيد من إمكانيات الشبكة ولكنه يقلل من مستوى الأمان ، وبالتالي ، سيتم تخفيض تصنيف الأمان للوظيفة الإضافية عند استخدام هذا الخيار بواسطة الوظيفة الإضافية.",
+                        "title": "الشبكة المضيفة"
                     },
                     "host_pid": {
+                        "description": "عادة ، يتم عزل العمليات التي يتم تشغيلها الإضافي عن جميع عمليات النظام الأخرى. طالب مؤلف الوظيفة الإضافية بالوصول إلى عمليات النظام التي تعمل على مثيل النظام المضيف ، والسماح للوظيفة الإضافية بنشر العمليات على النظام المضيف أيضًا. يمنح هذا الوضع الوظيفة الإضافية وصولاً كاملاً وتحكمًا كاملاً في نظام Home Assistant بالكامل ، مما يضيف مخاطر أمنية ، وقد يؤدي إلى إتلاف نظامك عند إساءة استخدامه. لذلك ، تؤثر هذه الميزة سلبًا على درجة أمان الوظيفة الإضافية. \n\n لا يتم منح هذا المستوى من الوصول تلقائيًا ويجب تأكيده بواسطتك. للقيام بذلك ، تحتاج إلى تعطيل وضع الحماية على الوظيفة الإضافية يدويًا. قم بتعطيل وضع الحماية فقط إذا كنت تعلم ، تحتاج وتثق بمصدر هذه الوظيفة الإضافية.",
                         "title": "مساحة عمليات المضيف"
                     },
                     "ingress": {
@@ -141,17 +162,23 @@
                         "title": "مدخل"
                     },
                     "label": {
+                        "apparmor": "apparmor",
                         "auth": "المصادقة",
                         "docker": "docker",
                         "hardware": "عتاد",
                         "hass": "hass",
                         "hassio": "hassio",
                         "host": "مضيف",
+                        "host_pid": "pid المضيف",
                         "ingress": "مدخل",
                         "rating": "تقييم",
                         "stage": "مرحلة"
                     },
+                    "rating": {
+                        "description": "يوفر Home Assistant تصنيفًا أمنيًا لكل من الوظائف الإضافية ، مما يشير إلى المخاطر التي تنطوي عليها عند استخدام هذه الوظيفة الإضافية. كلما زاد الوصول الذي تتطلبه الوظيفة الإضافية على نظامك ، انخفضت النتيجة ، وبالتالي تزيد من مخاطر الأمان المحتملة. \n\n تكون الدرجة على مقياس من 1 إلى 6. حيث 1 هي أدنى درجة (تعتبر الأكثر انعدامًا للأمان والأكثر خطورة) والنتيجة 6 هي أعلى درجة (تعتبر الأكثر أمانًا والأقل خطورة)."
+                    },
                     "role": {
+                        "admin": "المشرف",
                         "backup": "نسخ احتياطي",
                         "default": "إفتراضي",
                         "homeassistant": "homeassistant",
@@ -163,14 +190,73 @@
                 "not_available_arch": "هذه الوظيفة الإضافية غير متوافقة مع معالج جهازك أو نظام التشغيل الذي قمت بتثبيته على جهازك.",
                 "not_available_version": "أنت تقوم بتشغيل Home Assistant {core_version_installed} ، للتحديث إلى هذا الإصدار من الوظيفة الإضافية تحتاج على الأقل الإصدار {core_version_needed} من Home Assistant",
                 "open_web_ui": "افتح واجهة مستخدم الويب",
+                "option": {
+                    "auto_update": {
+                        "description": "التحديث التلقائي للوظيفة الإضافية عند توفر إصدار جديد",
+                        "title": "تحديث تلقائي"
+                    },
+                    "boot": {
+                        "description": "جعل الوظيفة الإضافية تبدأ أثناء إقلاع النظام",
+                        "title": "ابدأ عند الاقلاع"
+                    },
+                    "ingress_panel": {
+                        "description": "إضافة هذه الوظيفة الإضافية إلى الشريط الجانبي",
+                        "title": "إظهار في الشريط الجانبي"
+                    },
+                    "protected": {
+                        "title": "وضع الحماية"
+                    },
+                    "watchdog": {
+                        "description": "سيبدأ هذا الوظيفة الإضافية إذا تعطلت",
+                        "title": "مراقبه"
+                    }
+                },
                 "protection_mode": {
                     "enable": "تفعيل وضع الحماية"
                 },
                 "visit_addon_page": "قم بزيارة صفحة {name} لمزيد من التفاصيل"
+            },
+            "documentation": {
+                "get_documentation": "فشل الحصول على وثائق الوظيفة الإضافية ، {error}"
+            },
+            "failed_to_save": "فشل حفظ تكوين الوظيفة الإضافية ، {error}",
+            "logs": {
+                "get_logs": "فشل الحصول على سجلات الوظائف الإضافية ، {error}"
+            },
+            "panel": {
+                "configuration": "الإعدادات",
+                "documentation": "الوثائق",
+                "info": "معلومات",
+                "log": "سجل"
+            },
+            "state": {
+                "installed": "الوظيفة الإضافية مثبتة",
+                "not_available": "الوظيفة الإضافية غير متوفرة على نظامك",
+                "not_installed": "الوظيفة الإضافية غير مثبتة"
             }
         },
+        "backup": {
+            "addons": "الإضافات",
+            "confirm_password": "تأكيد كلمة مرور اللقطة",
+            "could_not_create": "تعذر إنشاء لقطة",
+            "create": "إنشاء",
+            "create_blocked_not_running": "إنشاء لقطة غير ممكن الآن لأن النظام في حالة {state}.",
+            "created": "خلقت",
+            "delete_backup_confirm": "حذف",
+            "delete_selected": "حذف اللقطات المحددة",
+            "enter_password": "الرجاء إدخال كلمة المرور.",
+            "failed_to_delete": "فشل الحذف",
+            "folders": "المجلدات",
+            "name": "اسم اللقطة",
+            "password": "كلمة مرور اللقطة",
+            "password_protection": "حماية كلمة المرور",
+            "passwords_not_matching": "كلمات المرور غير متطابقة",
+            "select_type": "تحديد ما يجب استعادته",
+            "selected": "{number} حدد",
+            "type": "نوع اللقطة"
+        },
         "common": {
-            "cancel": "الغاء",
+            "cancel": "إلغاء",
             "close": "إغلاق",
             "error": {
                 "unknown": "خطأ غير معروف",
@@ -178,13 +264,21 @@
             },
             "failed_to_restart_name": "فشل في إعادة تشغيل {name}",
             "failed_to_update_name": "فشل في تحديث {name}",
+            "newest_version": "أحدث إصدار",
+            "no": "لا",
+            "refresh": "تحديث",
+            "release_notes": "ملاحظات الإصدار",
+            "reload": "إعادة تحميل",
             "reset_defaults": "إعادة التعيين إلى الإعدادات الافتراضية",
             "reset_options": "خيارات إعادة التعيين",
             "restart": "إعادة التشغيل",
             "restart_name": "أعد تشغيل {name}",
             "running_version": "تقوم حاليا بتشغيل الإصدار {version}",
             "save": "حفظ",
-            "show_more": "أظهر المزيد من المعلومات حول هذا"
+            "show_more": "أظهر المزيد من المعلومات حول هذا",
+            "update": "تحديث",
+            "version": "الإصدار",
+            "yes": "نعم"
         },
         "confirm": {
             "reset_options": {
@@ -201,7 +295,11 @@
             }
         },
         "dashboard": {
-            "addons": "الوظائف الإضافية المثبتة"
+            "addon_new_version": "الإصدار الجديد متوفر",
+            "addon_running": "الوظيفة الإضافية قيد التشغيل",
+            "addon_stopped": "تم إيقاف الوظيفة الإضافية",
+            "addons": "الوظائف الإضافية المثبتة",
+            "no_addons": "لم يتم تثبيت أية إضافات بعد. توجه إلى متجر الإضافات للبدء!"
         },
         "dialog": {
             "hardware": {
@@ -235,7 +333,7 @@
                 "failed_to_add": "فشل في إضافة السجل",
                 "failed_to_remove": "فشل في إزالة السجل",
                 "no_registries": "لم يتم تكوين سجلات",
-                "password": "كلمة السر",
+                "password": "كلمة المرور",
                 "registry": "سجل",
                 "remove": "إزالة",
                 "title_add": "إضافة سجل حاوية جديد",
@@ -252,54 +350,22 @@
                 "text": "هل تريد إعادة تشغيل الإضافة بالتغييرات التي قمت بها؟"
             },
             "update": {
-                "create_snapshot": "قم بإنشاء لقطة من {name} قبل التحديث",
-                "snapshot": "لقط",
-                "snapshotting": "إنشاء لقطة لـ {name}",
                 "updating": "تحديث {name} إلى الإصدار {version}"
             }
         },
         "my": {
+            "error": "حدث خطأ غير معروف",
             "error_addon_no_ingress": "الوظيفة الإضافية المطلوبة لا تدعم الإدخال",
             "error_addon_not_found": "لم يتم العثور على الإضافة",
             "error_addon_not_installed": "لم يتم تثبيت الوظيفة الإضافية المطلوبة. الرجاء تثبيتها أولا",
-            "error_addon_not_started": "الوظيفة الإضافية المطلوبة ليست قيد التشغيل. يرجى تشغيلها أولاً"
+            "error_addon_not_started": "الوظيفة الإضافية المطلوبة ليست قيد التشغيل. يرجى تشغيلها أولاً",
+            "faq_link": "الأسئلة الشائعة حول My Home Assistant",
+            "not_supported": "لا يدعم مثيل Home Assistant إعادة التوجيه هذه. تحقق من {link} لعمليات إعادة التوجيه المدعومة والإصدار الذي تم تقديمه فيه."
         },
-        "snapshot": {
-            "addons": "الإضافات",
-            "available_snapshots": "اللقطات المتوفرة",
-            "confirm_password": "تأكيد كلمة مرور اللقطة",
-            "could_not_create": "تعذر إنشاء لقطة",
-            "create": "إنشاء",
-            "create_blocked_not_running": "إنشاء لقطة غير ممكن الآن لأن النظام في حالة {state}.",
-            "create_snapshot": "إنشاء لقطة",
-            "created": "خلقت",
-            "delete_selected": "حذف اللقطات المحددة",
-            "delete_snapshot_confirm": "حذف",
-            "delete_snapshot_title": "حذف لقطة",
-            "description": "تسمح لك اللقطات بالنسخ الاحتياطي واستعادة جميع بيانات مثيل Home Assistant الخاص بك بسهولة.",
-            "enter_password": "الرجاء إدخال كلمة المرور.",
-            "failed_to_delete": "فشل الحذف",
-            "folder": {
-                "addons/local": "الإضافات المحلية",
-                "homeassistant": "تكوين Home Assistant",
-                "media": "وسائط",
-                "share": "شارك",
-                "ssl": "SSL"
-            },
-            "folders": "المجلدات",
-            "full_snapshot": "لقطة كاملة",
-            "name": "اسم اللقطة",
-            "no_snapshots": "ليس لديك أي لقطات حتى الآن.",
-            "partial_snapshot": "لقطة جزئية",
-            "password": "كلمة مرور اللقطة",
-            "password_protected": "محمي بكلمة مرور",
-            "password_protection": "حماية كلمة المرور",
-            "passwords_not_matching": "كلمات المرور غير متطابقة",
-            "security": "حماية",
-            "select_type": "تحديد ما يجب استعادته",
-            "selected": "{number} حدد",
-            "type": "نوع اللقطة",
-            "upload_snapshot": "تحميل لقطة"
+        "panel": {
+            "dashboard": "لوحة المعلومات",
+            "store": "متجر الوظائف الإضافية",
+            "system": "النظام"
         },
         "store": {
             "missing_addons": "الإضافات المفقودة؟ مكن الوضع المتقدم في صفحة ملف تعريف المستخدم",
@@ -313,17 +379,26 @@
                 "ram_usage": "استخدام ذاكرة الوصول العشوائي الأساسية"
             },
             "host": {
+                "change": "تغيير",
                 "change_hostname": "تغيير اسم المضيف",
                 "confirm_reboot": "هل تريد بالتأكيد إعادة تشغيل المضيف؟",
                 "confirm_shutdown": "هل تريد بالتأكيد إيقاف تشغيل المضيف؟",
+                "docker_version": "نسخة Docker",
                 "emmc_lifetime_used": "مدة حياة eMMC المستخدمة",
+                "failed_to_get_hardware_list": "فشل في الحصول على قائمة الأجهزة",
+                "failed_to_import_from_usb": "فشل الاستيراد من USB",
+                "failed_to_reboot": "فشل إعادة تشغيل المضيف",
                 "failed_to_set_hostname": "فشل إعداد اسم المضيف",
+                "failed_to_shutdown": "فشل إيقاف تشغيل المضيف",
                 "hardware": "العتاد",
                 "hostname": "اسم المضيف",
                 "import_from_usb": "الاستيراد من USB",
+                "ip_address": "عنوان IP",
                 "new_hostname": "الرجاء إدخال اسم مضيف جديد:",
+                "operating_system": "نظام التشغيل",
                 "reboot_host": "إعادة تشغيل المضيف",
-                "shutdown_host": "إيقاف تشغيل المضيف"
+                "shutdown_host": "إيقاف تشغيل المضيف",
+                "used_space": "المساحة المستخدمة"
             },
             "log": {
                 "get_logs": "فشل الحصول على سجلات {provider} {error}",
@@ -349,6 +424,8 @@
                 "share_diagonstics_title": "ساعد في تحسين Home Assistant",
                 "unhealthy_description": "سيؤدي تشغيل التثبيت غير الصحي إلى حدوث مشكلات. يوجد أدناه قائمة بالمشكلات التي تم العثور عليها في التثبيت الخاص بك ، انقر فوق الارتباطات لمعرفة كيفية حل المشكلات.",
                 "unhealthy_reason": {
+                    "privileged": "supervisor ليس له امتياز",
+                    "setup": "فشل إعداد supervisor",
                     "untrusted": "تم الكشف عن محتوى غير موثوق به"
                 },
                 "unhealthy_title": "التثبيت الخاص بك غير صحي",
@@ -356,10 +433,17 @@
                 "unsupported_reason": {
                     "apparmor": "لم يتم تمكين AppArmor على المضيف",
                     "content-trust": "تم تعطيل التحقق من صحة المحتوى",
-                    "network_manager": "مدير الشبكة"
+                    "dbus": "DBUS",
+                    "docker_version": "نسخة Docker",
+                    "lxc": "LXC",
+                    "network_manager": "مدير الشبكة",
+                    "os": "نظام التشغيل",
+                    "privileged": "supervisor ليس له امتياز",
+                    "systemd": "Systemd"
                 },
                 "unsupported_title": "أنت تقوم بتشغيل تثبيت غير مدعوم",
-                "update_supervisor": "تحديث supervisor"
+                "update_supervisor": "تحديث supervisor",
+                "warning": "تحذير"
             }
         }
     },
@@ -431,16 +515,16 @@
                 "target_humidity_entity": "{name} الرطوبة المستهدفة"
             },
             "light": {
-                "brightness": "Helderheid",
+                "brightness": "السطوع",
                 "cold_white_value": "سطوع أبيض بارد",
                 "color_brightness": "سطوع اللون",
-                "color_temperature": "Kleurtemperatuur",
+                "color_temperature": "درجة حرارة اللون",
                 "effect": "مؤثرات",
                 "warm_white_value": "سطوع أبيض دافئ",
                 "white_value": "سطوع الأبيض"
             },
             "lock": {
-                "code": "كود",
+                "code": "الرمز",
                 "lock": "قفل",
                 "unlock": "فتح"
             },
@@ -464,7 +548,8 @@
             },
             "script": {
                 "cancel": "إلغاء",
-                "cancel_multiple": "إلغاء {number}"
+                "cancel_multiple": "إلغاء {number}",
+                "run": "تشغيل"
             },
             "service": {
                 "run": "تشغيل"
@@ -592,6 +677,9 @@
                 "today": "اليوم"
             },
             "data-table": {
+                "clear": "مسح",
+                "filtering_by": "التصفية حسب",
+                "hidden": "{number} مخفي",
                 "no-data": "لايوجد بيانات",
                 "search": "بحث"
             },
@@ -626,11 +714,13 @@
                 "no_history_found": "لم يتم العثور على سجل الحالات."
             },
             "logbook": {
+                "by": "بواسطة",
                 "entries_not_found": "لم يتم العثور على إدخالات في دفتر السجلات.",
                 "messages": {
                     "became_unavailable": "أصبح غير متوفر",
                     "changed_to_state": "تغير إلى {state}",
                     "detected_device_class": "تم الكشف عن {device_class}",
+                    "is_closing": "قيد الاغلاق",
                     "is_opening": "يفتح",
                     "rose": "وردة",
                     "set": "اضبط",
@@ -665,10 +755,10 @@
                     "composer": "الملحن",
                     "url": "URL"
                 },
+                "media-player-browser": "متصفح مشغل الوسائط",
                 "media_browsing_error": "خطأ في استعراض الوسائط",
                 "media_not_supported": "لا يدعم مشغل الوسائط هذا النوع من الوسائط",
                 "media_player": "مشغل الوسائط",
-                "media-player-browser": "متصفح مشغل الوسائط",
                 "no_items": "لا توجد عناصر",
                 "pick": "اختار",
                 "pick-media": "اختر الوسائط",
@@ -740,7 +830,7 @@
             "config_entry_system_options": {
                 "enable_new_entities_description": "إذا كان يجب إضافة الأجهزة المكتشفة حديثًا لـ {integration}",
                 "enable_new_entities_label": "تمكين الكيانات المضافة حديثًا.",
-                "enable_polling_description": "إذا كان يجب على Home Assistant  تلقائيًا سحب {integration} للحصول على التحديثات.",
+                "enable_polling_description": "إذا كان يجب على Home Assistant سحب {integration} تلقائيًا للحصول على التحديثات.",
                 "enable_polling_label": "تمكين سحب التحديثات.",
                 "restart_home_assistant": "تحتاج إلى إعادة تشغيل Home Assistant حتى تصبح التغييرات سارية المفعول.",
                 "title": "خيارات النظام لـ {integration}",
@@ -892,7 +982,7 @@
                 "no_entities": "لا توجد كيانات",
                 "no_triggers": "لا توجد محفزات",
                 "payload_display": "عرض الـPayload",
-                "recent_messages": "{n} آخر الرسائل التي تم استلامها",
+                "recent_messages": "{n} أحدث الرسائل المستلمة",
                 "show_as_yaml": "إظهار كـ YAML",
                 "title": "{device} معلومات تصحيح الأخطاء",
                 "triggers": "محفزات"
@@ -901,6 +991,10 @@
                 "form": {
                     "header": "الخيارات"
                 },
+                "loading": {
+                    "loading_flow": "يرجى الانتظار حتى يتم تهيئة خيارات {integration}",
+                    "loading_step": "تحميل الخطوة التالية لـ {integration}"
+                },
                 "success": {
                     "description": "تم حفظ الخيارات بنجاح."
                 }
@@ -908,10 +1002,59 @@
             "quick-bar": {
                 "commands": {
                     "navigation": {
-                        "navigate_to": "انتقل إلى {panel}"
+                        "areas": "المناطق",
+                        "automation": "الأتمتة",
+                        "blueprint": "المخططات",
+                        "core": "عام",
+                        "customize": "التخصيصات",
+                        "devices": "الأجهزة",
+                        "entities": "الكيانات",
+                        "helpers": "المساعدين",
+                        "info": "معلومات",
+                        "integrations": "التكاملات",
+                        "logs": "السجلات",
+                        "lovelace": "لوحات معلومات Lovelace",
+                        "person": "الأشخاص",
+                        "scene": "مشاهد",
+                        "script": "السكريبتات",
+                        "server_control": "عناصر التحكم بالخادم",
+                        "tag": "العلامات",
+                        "users": "المستخدمين",
+                        "zone": "المناطق"
+                    },
+                    "reload": {
+                        "command_line": "كيانات سطر الأوامر",
+                        "filesize": "كيانات حجم الملف",
+                        "filter": "تصفية الكيانات",
+                        "generic": "كيانات كاميرا IP عامة",
+                        "generic_thermostat": "كيانات ترموستات عامة",
+                        "history_stats": "كيانات احصائيات التاريخ",
+                        "homekit": "HomeKit",
+                        "input_boolean": "قيم الإدخال المنطقية",
+                        "input_datetime": "مدخل الوقت والتاريخ",
+                        "input_number": "أرقام الإدخال",
+                        "input_select": "تحديد المدخلات",
+                        "input_text": "نصوص الإدخال",
+                        "min_max": "الحد الأدنى/الأقصى للكيانات",
+                        "mqtt": "كيانات MQTT المكونة يدويًا",
+                        "person": "الناس",
+                        "rest": "اعادة ضبط الكيانات وإخطار الخدمات",
+                        "rpi_gpio": "كيانات Raspberry Pi GPIO",
+                        "scene": "مشاهد",
+                        "smtp": "خدمات إعلام SMTP",
+                        "statistics": "الكيانات الإحصائية",
+                        "telegram": "خدمات اشعارات Telegram",
+                        "template": "كيانات القالب",
+                        "universal": "كيانات مشغل الوسائط العالمي",
+                        "zone": "المناطق"
                     },
                     "server_control": {
                         "perform_action": "{action} الخادم"
+                    },
+                    "types": {
+                        "navigation": "التنقل",
+                        "reload": "إعادة تحميل",
+                        "server_control": "الخادم"
                     }
                 },
                 "filter_placeholder": "عامل تصفية الكيان"
@@ -944,7 +1087,7 @@
                     "updateDeviceName": "قم بتعيين اسم مخصص لهذا الجهاز في سجل الجهاز.",
                     "zigbee_information": "عرض معلومات Zigbee للجهاز."
                 },
-                "unknown": "غير معروف ",
+                "unknown": "غير معروف",
                 "zha_device_card": {
                     "device_name_placeholder": "تغيير اسم الجهاز"
                 }
@@ -962,6 +1105,7 @@
                 "heading": "إعادة تكوين الجهاز",
                 "in_progress": "يتم إعادة تكوين الجهاز. هذا قد يستغرق بعض الوقت.",
                 "introduction": "أعد تكوين جهاز على شبكة Zigbee الخاصة بك. استخدم هذه الميزة إذا كان جهازك لا يعمل بشكل صحيح.",
+                "min_max_change": "الأدنى / الأقصى / تغيير",
                 "reporting_header": "إبلاغ",
                 "run_in_background": "يمكنك إغلاق هذا الحوار وستستمر إعادة التكوين في الخلفية.",
                 "start_reconfiguration": "بدء إعادة التكوين"
@@ -1076,24 +1220,24 @@
                         "actions": {
                             "add": "أضف إجراء",
                             "delete": "حذف",
-                            "delete_confirm": "هل تريد الحذف فعلا؟",
+                            "delete_confirm": "هل أنت متأكد أنك تريد حذف هذا؟",
                             "duplicate": "تكرار",
                             "header": "الإجراءات",
                             "introduction": "الإجراءات هي ما سيفعله Home Assistant عند تشغيل الأتمتة.",
                             "learn_more": "معرفة المزيد عن الإجراءات",
                             "name": "إجراء",
-                            "type_select": "نوع الإجراء",
                             "type": {
                                 "condition": {
                                     "label": "الشرط"
                                 },
                                 "delay": {
-                                    "delay": "تأخير",
+                                    "delay": "التأخير",
                                     "label": "التأخير"
                                 },
                                 "device_id": {
                                     "action": "أضف إجراء",
                                     "extra_fields": {
+                                        "brightness_pct": "السطوع",
                                         "code": "الرمز",
                                         "flash": "فلاش",
                                         "humidity": "الرطوبة",
@@ -1106,12 +1250,16 @@
                                     "label": "جهاز"
                                 },
                                 "event": {
-                                    "event": "الحدث",
-                                    "label": "إجراء الحريق",
-                                    "service_data": "بيانات الخدمة"
+                                    "event": "الحدث:",
+                                    "label": "إجراء الحريق"
                                 },
                                 "repeat": {
-                                    "label": "كرر"
+                                    "label": "كرر",
+                                    "type": {
+                                        "until": {
+                                            "label": "حتى"
+                                        }
+                                    }
                                 },
                                 "scene": {
                                     "label": "تنشيط مشهد"
@@ -1120,7 +1268,8 @@
                                     "label": "طلب خدمة"
                                 },
                                 "wait_for_trigger": {
-                                    "label": "انتظر المشغل"
+                                    "label": "انتظر المشغل",
+                                    "timeout": "الحد الأقصى (إختياري)"
                                 },
                                 "wait_template": {
                                     "label": "الإنتظار",
@@ -1128,6 +1277,7 @@
                                     "wait_template": "نموذج الانتظار"
                                 }
                             },
+                            "type_select": "نوع الإجراء",
                             "unsupported_action": "لا يوجد محرر مرئي يدعم الإجراء: {action}"
                         },
                         "alias": "الاسم",
@@ -1140,13 +1290,12 @@
                         "conditions": {
                             "add": "إضافة شرط",
                             "delete": "حذف",
-                            "delete_confirm": "هل تريد الحذف فعلا؟",
+                            "delete_confirm": "هل أنت متأكد أنك تريد حذف هذا؟",
                             "duplicate": "تكرار",
                             "header": "الشروط",
                             "introduction": "الشروط اختيارية وستمنع تشغيل الأتمتة ما لم يتم استيفاء جميع الشروط.",
                             "learn_more": "معرفة المزيد عن الشروط",
                             "name": "الشرط",
-                            "type_select": "نوع الشرط",
                             "type": {
                                 "and": {
                                     "label": "و"
@@ -1168,8 +1317,8 @@
                                 "numeric_state": {
                                     "above": "فوق",
                                     "below": "تحت",
-                                    "label": "الوضع الرقمي",
-                                    "value_template": "نموذج القيمة (إختياري)"
+                                    "label": "القيمة الرقمية",
+                                    "value_template": "نموذج القيمة (اختياري)"
                                 },
                                 "or": {
                                     "label": "أو"
@@ -1194,7 +1343,8 @@
                                 "time": {
                                     "after": "بعد",
                                     "before": "قبل",
-                                    "label": "وقت",
+                                    "label": "الوقت",
+                                    "type_input": "قيمة مساعد التاريخ/الوقت",
                                     "type_value": "وقت ثابت",
                                     "weekdays": {
                                         "fri": "الجمعة",
@@ -1206,12 +1356,18 @@
                                         "wed": "الأربعاء"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "معرف المشغل",
+                                    "label": "المشغل",
+                                    "no_triggers": "لا توجد مشغلات متاحة"
+                                },
                                 "zone": {
-                                    "entity": "كيان مع موقع",
+                                    "entity": "اسم الجهاز مع المنطقة",
                                     "label": "المنطقة",
                                     "zone": "المنطقة"
                                 }
                             },
+                            "type_select": "نوع الشرط",
                             "unsupported_condition": "لا يوجد محرر مرئي يدعم الشرط: {condition}"
                         },
                         "copy_to_clipboard": "نسخ إلى الحافظة",
@@ -1249,16 +1405,17 @@
                             "delete_confirm": "هل أنت متأكد أنك تريد حذف هذا؟",
                             "duplicate": "تكرار",
                             "header": "المشغلات",
+                            "id": "معرف المشغل (المستخدم بواسطة شرط المشغل)",
                             "introduction": "المشغلات هي التي تبدأ معالجةقاعدة الأتمتة. من الممكن تحديد عدة مشغلات لنفس القاعدة. بمجرد بدء المشغل ، سيقوم Home Assistant بالتحقق من صحة الشروط ، إن وجدت ، واستدعاء الإجراء.",
                             "learn_more": "معرفة المزيد عن المشغلات",
                             "name": "المشغل",
-                            "type_select": "نوع المشغل",
                             "type": {
                                 "device": {
                                     "extra_fields": {
                                         "above": "فوق",
                                         "below": "تحت",
-                                        "for": "المدة"
+                                        "for": "المدة",
+                                        "zone": "المنطقة"
                                     },
                                     "label": "جهاز",
                                     "trigger": "نوع المشغل"
@@ -1301,7 +1458,7 @@
                                     "to": "إلى"
                                 },
                                 "sun": {
-                                    "event": "الحدث",
+                                    "event": "الحدث:",
                                     "label": "الشمس",
                                     "offset": "إزاحة (اختياري)",
                                     "sunrise": "شروق الشمس",
@@ -1314,18 +1471,18 @@
                                     "label": "نموذج",
                                     "value_template": "نموذج القيمة"
                                 },
-                                "time_pattern": {
-                                    "hours": "ساعات",
-                                    "label": "نمط الوقت",
-                                    "minutes": "دقائق",
-                                    "seconds": "ثواني"
-                                },
                                 "time": {
                                     "at": "عند",
                                     "label": "الوقت",
                                     "type_input": "قيمة مساعد التاريخ/الوقت",
                                     "type_value": "وقت ثابت"
                                 },
+                                "time_pattern": {
+                                    "hours": "ساعات",
+                                    "label": "نمط الوقت",
+                                    "minutes": "دقائق",
+                                    "seconds": "ثواني"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "معرف Webhook"
@@ -1333,12 +1490,13 @@
                                 "zone": {
                                     "enter": "دخول",
                                     "entity": "اسم الجهاز مع المنطقة",
-                                    "event": "الحدث",
+                                    "event": "الحدث:",
                                     "label": "المنطقة",
                                     "leave": "مغادرة",
                                     "zone": "المنطقة"
                                 }
                             },
+                            "type_select": "نوع المشغل",
                             "unsupported_platform": "لا يوجد محرر مرئي يدعم النظام الأساسي: {platform}"
                         },
                         "unsaved_confirm": "لديك تغييرات غير محفوظة. هل أنت متأكد من أنك تريد أن تغادر ؟"
@@ -1450,8 +1608,10 @@
                             "title": "Google Assistant"
                         },
                         "integrations": "تكاملات",
+                        "integrations_introduction": "تسمح لك عمليات تكامل Home Assistant Cloud بالاتصال بالخدمات في السحابة دون الحاجة إلى الكشف عن مثيل Home Assistant الخاص بك علنًا على الإنترنت.",
                         "integrations_introduction2": "تحقق من موقع الويب بحثا عن ",
-                        "integrations_link_all_features": " جميع الميزات المتوفرة",
+                        "integrations_link_all_features": " جميع الميزات المتاحة",
+                        "manage_account": "إدارة الحساب",
                         "nabu_casa_account": "حساب Nabu Casa",
                         "not_connected": "غير متصل",
                         "remote": {
@@ -1492,16 +1652,17 @@
                             "link_learn_more": "تعرف على المزيد حول إنشاء عمليات اتمتة مدعومة بwebhook.",
                             "loading": "جار التحميل...",
                             "manage": "أدر",
-                            "no_hooks_yet": "يبدو أنه ليس لديك webhook حتى الآن. ابدأ بتكوين",
+                            "no_hooks_yet": "يبدو أنه ليس لديك webhook حتى الآن. ابدأ بتكوين ",
+                            "no_hooks_yet2": "أو عن طريق إنشاء",
                             "no_hooks_yet_link_automation": "أتمتة webhook",
                             "no_hooks_yet_link_integration": "التكامل المستند إلى webhook",
-                            "no_hooks_yet2": "أو عن طريق إنشاء",
                             "title": "webhook"
                         }
                     },
                     "alexa": {
                         "banner": "تم تعطيل تحرير الكيانات التي يتم كشفها عبر واجهة المستخدم هذه لأنك قمت بتكوين عوامل تصفية الكيان في configuration.yaml.",
                         "dont_expose_entity": "عدم كشف الكيان",
+                        "expose": "كشف لـ Alexa",
                         "expose_entity": "كشف الكيان",
                         "exposed": "{selected} مكشوف",
                         "exposed_entities": "الكيانات المكشوفة",
@@ -1516,6 +1677,7 @@
                     "description_not_login": "لم يتم تسجيل الدخول",
                     "dialog_certificate": {
                         "certificate_expiration_date": "تاريخ انتهاء صلاحية الشهادة:",
+                        "certificate_information": "معلومات الشهادة",
                         "close": "إغلاق",
                         "fingerprint": "بصمة الشهادة:",
                         "will_be_auto_renewed": "سيتم تجديده تلقائيًا"
@@ -1552,6 +1714,7 @@
                         "manage_domains": "إدارة المجالات",
                         "not_exposed": "{selected} غير مكشوف",
                         "not_exposed_entities": "الكيانات غير المكشوفة",
+                        "sync_to_google": "مزامنة التغييرات إلى Google.",
                         "title": "Google Assistant"
                     },
                     "login": {
@@ -1607,36 +1770,6 @@
                     "description": "نظام الوحدة والموقع والمنطقة الزمنية والمتغيرات العامة الأخرى",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "قبل تمكين هذا ، تأكد من زيارة صفحة وثائق التحليلات {link} لفهم ما ترسله وكيفية تخزينه.",
-                                "header": "تحليلات",
-                                "instance_id": "معرف المثيل: {huuid}",
-                                "introduction": "شارك معلومات التثبيت للمساعدة في تحسين Home Assistant ومساعدتنا في إقناع الشركات المصنعة بإضافة ميزات تحكم محلية وميزات تركز على الخصوصية.",
-                                "learn_more": "كيف نعالج بياناتك",
-                                "needs_base": "تحتاج إلى تمكين التحليلات الأساسية حتى يكون هذا الخيار متاحًا",
-                                "preference": {
-                                    "base": {
-                                        "description": "معرف المثيل والإصدار ونوع التثبيت.",
-                                        "title": "التحليلات الأساسية"
-                                    },
-                                    "diagnostics": {
-                                        "description": "مشاركة تقارير الأعطال عند حدوث أخطاء غير متوقعة.",
-                                        "title": "التشخيص"
-                                    },
-                                    "statistics": {
-                                        "description": "إجمالي الكيانات المستخدمة والمستخدمين والعناصر الأخرى.",
-                                        "title": "إحصائيات الاستخدام"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "الأسماء والإصدارات والقدرات.",
-                                        "title": "عمليات التكامل والإضافات المستخدمة"
-                                    },
-                                    "usage": {
-                                        "description": "الأسماء ومعلومات الإصدار.",
-                                        "title": "التكاملات المستخدمة"
-                                    }
-                                }
-                            },
                             "core_config": {
                                 "edit_requires_storage": "تم تعطيل المحرر بسبب تخزين التكوين في configuration.yaml.",
                                 "elevation": "ارتفاع",
@@ -1793,6 +1926,7 @@
                             "confirm_text": "يجب عليك إزالتها من إعدادات Lovelace والأتمتة إذا كانت تحتوي على هذه الكيانات."
                         },
                         "search": "إبحث عن الكيانات",
+                        "selected": "{number} حدد",
                         "status": {
                             "disabled": "معطل",
                             "restored": "مستعاد",
@@ -1800,27 +1934,24 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "محو",
-                    "filtering_by": "التصفية حسب",
-                    "show": "عرض"
-                },
-                "hassio": {
-                    "button": "تكوين"
-                },
                 "header": "تكوين Home Assistant",
                 "helpers": {
+                    "caption": "المساعدين",
                     "description": "العناصر التي تساعد في بناء الأتمتة",
                     "dialog": {
+                        "add_helper": "إضافة مساعد",
+                        "add_platform": "إضافة {platform}",
                         "create": "إضافة"
                     },
                     "picker": {
+                        "add_helper": "إضافة مساعد",
                         "headers": {
                             "editable": "قابل للتحرير",
                             "entity_id": "معرف الكيان",
                             "name": "الاسم",
                             "type": "النوع"
-                        }
+                        },
+                        "no_helpers": "يبدو أنه ليس لديك أي مساعدين حتى الآن!"
                     },
                     "types": {
                         "counter": "العداد",
@@ -1850,15 +1981,11 @@
                     "server": "الخادم",
                     "setup_time": "وقت التنصيب",
                     "source": "مصدر:",
-                    "system_health_error": "لم يتم تحميل مكون \"صحة النظام\". إضافة 'system_health:' إلى configuration.yaml",
                     "system_health": {
                         "manage": "أدر",
                         "more_info": "مزيد من المعلومات"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "صفحة التكاملات",
-                    "missing_zha": "هل فقدت لوحة تكوين ZHA؟ تم نقله إلى إدخال ZHA على {integrations_page} ."
+                    },
+                    "system_health_error": "لم يتم تحميل مكون \"صحة النظام\". إضافة 'system_health:' إلى configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "أضف تكامل",
@@ -1873,26 +2000,28 @@
                         "depends_on_cloud": "يعتمد على السحابة",
                         "device_unavailable": "الجهاز غير متوفر",
                         "devices": "{count} {count, plural,\n  one {جهاز}\n  other {أجهزة}\n}",
-                        "disable_error": "فشل تمكين التكامل أو تعطيله",
-                        "disable_restart_confirm": "أعد تشغيل Home Assistant لإنهاء تعطيل هذا التكامل",
                         "disable": {
                             "disable_confirm": "هل أنت متأكد أنك تريد تعطيل إدخال التكوين هذا؟ سيتم تعطيل أجهزتها وكياناتها.",
+                            "disabled": "معطل",
                             "disabled_by": {
                                 "device": "جهاز",
-                                "integration": "تكامل"
-                            }
+                                "integration": "تكامل",
+                                "user": "مستخدم"
+                            },
+                            "disabled_cause": "معطل بواسطة {cause}"
                         },
+                        "disable_error": "فشل تمكين التكامل أو تعطيله",
+                        "disable_restart_confirm": "أعد تشغيل Home Assistant لإنهاء تعطيل هذا التكامل",
                         "disabled_polling": "تم تعطيل السحب التلقائي للبيانات المحدثة",
                         "documentation": "الوثائق",
+                        "enable_restart_confirm": "أعد تشغيل Home Assistant لإنهاء تمكين هذا التكامل",
                         "entities": "{count} {count, plural,\n  one {كيان}\n  other {كيانات}\n}",
                         "entity_unavailable": "الكيان غير متوفر",
                         "firmware": "نظام التشغيل {version}",
                         "hub": "متصل عبر",
-                        "logs": "السجلات",
                         "manuf": "بواسطة {manufacturer}",
                         "no_area": "لا توجد منطقة",
                         "not_loaded": "لم يُحمل",
-                        "options": "خيارات",
                         "provided_by_custom_integration": "يتم توفيره من خلال تكامل مخصص",
                         "reload": "إعادة تحميل",
                         "reload_confirm": "تم إعادة تحميل التكامل",
@@ -1922,7 +2051,11 @@
                             "open_site": "افتح الموقع"
                         },
                         "finish": "إنهاء",
-                        "loading_first_time": "يرجى الانتظار بينما يتم تثبيت الـintegration",
+                        "loading": {
+                            "fallback_title": "التكامل",
+                            "loading_flow": "يُرجى الانتظار أثناء إعداد {integration}",
+                            "loading_step": "تحميل الخطوة التالية لـ {integration}"
+                        },
                         "next": "التالى",
                         "not_all_required_fields": "لم يتم تعبئة جميع الحقول المطلوبة.",
                         "not_loaded": "تعذر تحميل التكامل ، حاول إعادة تشغيل Home Assistant"
@@ -1934,7 +2067,6 @@
                     "details": "تفاصيل التكامل",
                     "disable": {
                         "disabled_integrations": "تم تعطيل {number}",
-                        "hide_disabled": "إخفاء عمليات التكامل المعطلة",
                         "show": "عرض",
                         "show_disabled": "إظهار عمليات التكامل المعطلة"
                     },
@@ -1945,7 +2077,6 @@
                         "confirm_delete_ignore_title": "توقف عن تجاهل {name} ؟",
                         "confirm_ignore": "هل أنت متأكد أنك لا تريد إعداد هذا التكامل؟ يمكنك التراجع بالنقر على \"إظهار عمليات التكامل التي تم تجاهلها\" في القائمة بأعلى اليسار.",
                         "confirm_ignore_title": "تجاهل اكتشاف {name} ؟",
-                        "hide_ignored": "إخفاء التكاملات المتجاهلة",
                         "ignore": "تجاهل",
                         "ignored": "متجاهل",
                         "show_ignored": "أظهر التكاملات المتجاهلة",
@@ -2027,15 +2158,18 @@
                     "description": "قم بإنشاء مجموعات مخصصة من البطاقات للتحكم في منزلك",
                     "resources": {
                         "cant_edit_yaml": "انت تستخدم Lovelace في وضع YAML، ولذلك لا يمكنك إدارة الموارد الخاصة بك من خلال واجهة المستخدم. إدرها في configuration.yaml.",
+                        "caption": "الموارد",
                         "confirm_delete": "هل أنت متأكد أنك تريد حذف هذا المورد؟",
                         "detail": {
                             "create": "إنشاء",
                             "delete": "حذف",
                             "dismiss": "اغلاق",
+                            "new_resource": "إضافة مورد جديد",
                             "type": "نوع الموارد",
                             "update": "تحديث",
                             "url": "URL",
-                            "url_error_msg": "عنوان URL هو حقل مطلوب"
+                            "url_error_msg": "عنوان URL هو حقل مطلوب",
+                            "warning_header": "كن حذرا!"
                         },
                         "picker": {
                             "add_resource": "إضافة مورد",
@@ -2048,17 +2182,18 @@
                         "refresh_body": "يجب عليك تحديث الصفحة لإكمال الإزالة. هل تريد التحديث الآن؟",
                         "refresh_header": "هل تريد التحديث؟",
                         "types": {
+                            "css": "ورقة الأنماط",
+                            "html": "HTML (مهمل)",
+                            "js": "ملف جافا سكريبت (مهمل)",
                             "module": "وحدة جافا سكريبت"
                         }
                     }
                 },
                 "mqtt": {
-                    "button": "كوِن",
                     "message_received": "الرسالة {id} التي تم تلقيها على {topic} في {time}:",
                     "title": "MQTT"
                 },
                 "ozw": {
-                    "button": "كوِن",
                     "common": {
                         "controller": "وحده تحكم",
                         "instance": "مثيل",
@@ -2077,6 +2212,11 @@
                         "nodes": "العقد",
                         "select_instance": "حدد مثيل"
                     },
+                    "network": {
+                        "header": "إدارة الشبكة",
+                        "introduction": "إدارة وظائف الشبكة.",
+                        "node_count": "{count} عقدة"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "تم الاستعلام عن جميع العقد",
@@ -2097,10 +2237,9 @@
                         "starting": "يبدء",
                         "unknown": "مجهول"
                     },
-                    "network": {
-                        "header": "إدارة الشبكة",
-                        "introduction": "إدارة وظائف الشبكة.",
-                        "node_count": "{count} عقدة"
+                    "node": {
+                        "button": "تفاصيل العقدة",
+                        "not_found": "لم يتم العثور على العقدة"
                     },
                     "node_config": {
                         "wakeup_help": "يجب أن تكون العقد التي تعمل بالبطارية مستيقظة لتغيير تكوينها. إذا لم تكن العقدة مستيقظة، سيحاول OpenZWave تحديث تكوين العقدة في المرة التالية التي تستيقظ فيها، والتي قد تكون عدة ساعات (أو أيام) لاحقا. اتبع الخطوات التالية لتنبيه جهازك:"
@@ -2114,17 +2253,13 @@
                         "static": "الحصول على قيم ثابتة من الجهاز",
                         "wakeup": "إعداد الدعم لقوائم انتظار التنبيه والرسائل"
                     },
-                    "node": {
-                        "button": "تفاصيل العقدة",
-                        "not_found": "لم يتم العثور على العقدة"
-                    },
                     "nodes_table": {
                         "failed": "فشل",
                         "id": "معرف",
                         "manufacturer": "الشركه المصنعه",
                         "model": "الموديل",
                         "query_stage": "مرحلة الاستعلام",
-                        "zwave_plus": "Z-Wave  Plus"
+                        "zwave_plus": "Z-Wave Plus"
                     },
                     "refresh_node": {
                         "battery_note": "إذا كانت العقدة تعمل بالبطارية ، فتأكد من تنشيطها قبل المتابعة",
@@ -2156,6 +2291,7 @@
                     "create_person": "إنشاء شخص",
                     "description": "إدارة الأشخاص الذين يتتبعهم Home Assistant.",
                     "detail": {
+                        "admin": "مدير",
                         "confirm_delete_user": "هل أنت متأكد أنك تريد حذف حساب المستخدم لـ {name} ؟ لا يزال بإمكانك تتبع المستخدم ، ولكن لن يتمكن الشخص من تسجيل الدخول مرة أخرى.",
                         "create": "إنشاء",
                         "delete": "حذف",
@@ -2219,11 +2355,13 @@
                     "editor": {
                         "alias": "الاسم",
                         "default_name": "سكريبت جديد",
+                        "delete_confirm": "هل أنت متأكد أنك تريد حذف هذا البرنامج النصي؟",
                         "header": "سكريبت: {name}",
                         "icon": "أيقونة",
                         "id": "معرف الكيان",
                         "id_already_exists": "هذا المعرف موجود بالفعل",
                         "introduction": "استخدم البرامج النصية لتشغيل سلسلة من الإجراءات.",
+                        "load_error_not_editable": "فقط البرامج النصية داخل scripts.yaml قابلة للتحرير.",
                         "max": {
                             "parallel": "أقصى عدد من التشغيلات المتوازية",
                             "queued": "طول قائمة الإنتظار"
@@ -2237,13 +2375,20 @@
                             "single": "فردي (إفتراضي)"
                         },
                         "save_script": "حفظ السكربت",
-                        "sequence": "تسلسل"
+                        "sequence": "تسلسل",
+                        "show_trace": "عرض التتبع"
                     },
                     "picker": {
                         "add_script": "اضف سكريبت",
+                        "dev_script": "تصحيح البرنامج النصي",
+                        "duplicate": "تكرار",
+                        "duplicate_script": "تكرار السكربت",
+                        "header": "محرر البرامج النصية",
                         "headers": {
                             "name": "الاسم"
                         },
+                        "introduction": "يتيح لك محرر البرنامج النصي إنشاء البرامج النصية وتحريرها. يرجى اتباع الرابط أدناه لقراءة التعليمات للتأكد من تهيئة Home Assistant بشكل صحيح.",
+                        "learn_more": "تعرف على المزيد حول البرامج النصية",
                         "no_scripts": "لم نتمكن من العثور على أي سكريبت",
                         "show_info": "عرض معلومات حول السكربت"
                     }
@@ -2269,7 +2414,7 @@
                             "input_number": "أرقام الإدخال",
                             "input_select": "تحديد المدخلات",
                             "input_text": "نصوص الإدخال",
-                            "introduction": "يمكن إعادة تحميل بعض أجزاء Home Assistant دون الحاجة إلى إعادة التشغيل. سيؤدي الضغط على إعادة التحميل إلى تفريغ تكوين YAML الحالي وتحميل التكوين الجديد.",
+                            "introduction": "يمكن إعادة تحميل بعض أجزاء Home Assistant دون الحاجة إلى إعادة التشغيل. سيؤدي النقر فوق أحد الخيارات أدناه إلى إلغاء تحميل تهيئة YAML الحالية وتحميل التكوين الجديد.",
                             "min_max": "الحد الأدنى/الأقصى للكيانات",
                             "mqtt": "كيانات MQTT المكونة يدويًا",
                             "person": "الناس",
@@ -2336,7 +2481,7 @@
                     "add_user": {
                         "caption": "أضف مستخدم",
                         "create": "إنشاء",
-                        "password": "كلمه السر",
+                        "password": "كلمة المرور",
                         "password_confirm": "تأكيد كلمة المرور",
                         "password_not_match": "كلمات المرور غير متطابقة"
                     },
@@ -2347,7 +2492,7 @@
                         "active": "مفعل",
                         "admin": "مدير",
                         "caption": "عرض المستخدم",
-                        "change_password": "تغيير كلمة السر",
+                        "change_password": "تغيير كلمة المرور",
                         "confirm_user_deletion": "هل أنت متأكد أنك تريد حذف {name} ؟",
                         "deactivate_user": "إلغاء تنشيط المستخدم",
                         "delete_user": "حذف المستخدم",
@@ -2385,22 +2530,32 @@
                         "search_again": "ابحث مرة أخرى",
                         "spinner": "البحث عن أجهزة ZHA Zigbee ..."
                     },
-                    "button": "كوِن",
+                    "cluster_attributes": {
+                        "attributes_of_cluster": "سمات الكتلة المحددة",
+                        "get_zigbee_attribute": "احصل على سمة Zigbee",
+                        "header": "سمات الكتلة",
+                        "help_attribute_dropdown": "حدد سمة لعرض قيمتها أو تعيين قيمتها.",
+                        "help_get_zigbee_attribute": "احصل على قيمة السمة المحددة.",
+                        "help_set_zigbee_attribute": "عين قيمة السمة للكتلة المحددة على الكيان المحدد.",
+                        "introduction": "عرض وتحرير سمات الكتلة.",
+                        "set_zigbee_attribute": "تعيين سمة Zigbee"
+                    },
+                    "cluster_commands": {
+                        "header": "أوامر الكتلة"
+                    },
                     "clusters": {
                         "header": "عناقيد",
+                        "help_cluster_dropdown": "حدد كتلة لعرض السمات والأوامر.",
                         "introduction": "الكتل هي لبنات البناء لوظائف Zigbee. وهي تفصل الوظائف إلى وحدات منطقية. هناك أنواع العميل والخادم والتي تتألف من سمات وأوامر."
                     },
                     "common": {
+                        "clusters": "العناقيد",
+                        "manufacturer_code_override": "تجاوز رمز الشركة المصنعة",
                         "value": "قيمة"
                     },
                     "configuration_page": {
                         "shortcuts_title": "الاختصارات",
-                        "update_button": "تحديث التكوين",
-                        "zha_options": {
-                            "default_light_transition": "وقت انتقال الضوء الافتراضي (بالثواني)",
-                            "enable_identify_on_join": "تمكين تأثير التعريف عند انضمام الأجهزة إلى الشبكة",
-                            "title": "الخيارات العامة"
-                        }
+                        "update_button": "تحديث التكوين"
                     },
                     "device_pairing_card": {
                         "CONFIGURED_status_text": "قيد التهيئة",
@@ -2459,104 +2614,10 @@
                     "edit_home_zone": "لا يمكن تعديل نصف قطر المنطقة الرئيسية من Frontend بعد. اسحب العلامة على الخريطة لتحريك المنطقة الرئيسية.",
                     "introduction": "تسمح لك المناطق بتحديد مناطق معينة على وجه الأرض. عندما يكون الشخص داخل منطقة ما ، ستأخذ الحالة الاسم من المنطقة. يمكن أيضًا استخدام المناطق كمشغل أو حالة داخل إعدادات الأتمتة."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "إلغاء التضمين",
-                        "controller_in_inclusion_mode": "أصبحت وحدة التحكم Z-Wave الآن في وضع التضمين.",
-                        "follow_device_instructions": "اتبع الإرشادات المرفقة مع جهازك لبدء الاقتران على الجهاز.",
-                        "inclusion_finished": "تم إضافة العقدة.",
-                        "interview_failed": "فشلت مقابلة الجهاز. قد تتوفر معلومات إضافية في السجلات.",
-                        "interview_started": "الجهاز قيد المقابلة. هذا قد يستغرق بعض الوقت.",
-                        "secure_inclusion_warning": "تتطلب الأجهزة الآمنة نطاقًا تردديًا إضافيًا ؛ يمكن أن يؤدي وجود عدد كبير جدًا من الأجهزة الآمنة إلى إبطاء شبكة Z-Wave. نوصي باستخدام التضمين الآمن فقط للأجهزة التي تتطلب ذلك ، مثل الأقفال أو فتاحات أبواب المرآب.",
-                        "view_device": "عرض الجهاز"
-                    },
-                    "button": "تكوين",
-                    "common": {
-                        "add_node": "إضافة عقدة",
-                        "close": "إغلاق",
-                        "heal_network": "عالج الشبكة",
-                        "home_id": "معرف المنزل",
-                        "network": "الشبكة",
-                        "node_id": "معرف العقدة",
-                        "reconfigure_server": "أعد تكوين الخادم",
-                        "remove_node": "إزالة عقدة"
-                    },
-                    "dashboard": {
-                        "driver_version": "إصدار برنامج التشغيل",
-                        "dump_dead_nodes_text": "بعض العقد الخاصة بك لم تستجب ويفترض أنها ميتة. لن يتم تصديرها بالكامل.",
-                        "dump_dead_nodes_title": "بعض العقد الخاصة بك ميتة",
-                        "dump_debug": "قم بتنزيل ملف تفريغ لشبكتك للمساعدة في تشخيص المشكلات",
-                        "dump_not_ready_confirm": "تحميل",
-                        "dump_not_ready_text": "إذا أنشأت تصديرًا بينما لم تكن جميع العقد جاهزة ، فقد تفوتك البيانات المطلوبة. امنح شبكتك بعض الوقت للاستعلام عن جميع العقد. هل تريد الاستمرار في التفريغ؟",
-                        "dump_not_ready_title": "ليست كل العقد جاهزة بعد",
-                        "header": "إدارة شبكة Z-Wave",
-                        "home_id": "معرف المنزل",
-                        "introduction": "إدارة شبكة Z-Wave وعقد Z-Wave",
-                        "nodes_ready": "العقد جاهزة",
-                        "server_version": "إصدار الخادم"
-                    },
-                    "device_info": {
-                        "device_config": "تكوين جهاز",
-                        "node_ready": "عقدة جاهزة",
-                        "node_status": "حالة العقدة",
-                        "zwave_info": "معلومات Z-Wave"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "تم إلغاء معالجة الشبكة.",
-                        "healing_complete": "اكتملت معالجة الشبكة.",
-                        "healing_failed": "المعالجة فشلت. قد تتوفر معلومات إضافية في السجلات.",
-                        "in_progress": "معالجة الشبكة جارية. سيستغرق هذا بعض الوقت.",
-                        "introduction": "ابدأ معالجة الشبكة على شبكة Z-Wave الخاصة بك. سيؤدي علاج الشبكة إلى إعادة حساب جميع الأجهزة لمساراتها مرة أخرى إلى وحدة التحكم ويوصى بذلك إذا قمت مؤخرًا بنقل الأجهزة أو وحدة التحكم الخاصة بك.",
-                        "run_in_background": "يمكنك إغلاق مربع الحوار هذا وستستمر عملية معالجة الشبكة في الخلفية.",
-                        "start_heal": "ابدأ المعالجة",
-                        "stop_heal": "أوقف المعالجة.",
-                        "title": "عالج شبكة Z-Wave الخاصة بك",
-                        "traffic_warning": "تولد عملية المعالجة قدرًا كبيرًا من حركة المرور على شبكة Z-Wave. قد يتسبب هذا في استجابة الأجهزة ببطء (أو عدم الاستجابة على الإطلاق) أثناء تقدم المعالجة."
-                    },
-                    "logs": {
-                        "log_level": "مستوى التسجيل في السجل",
-                        "log_level_changed": "تم تغيير مستوى السجل إلى: {level}",
-                        "subscribed_to_logs": "اشترك في Z-Wave JS سجل الرسائل...",
-                        "title": "سجلات Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "السجلات",
-                        "network": "الشبكة"
-                    },
-                    "node_config": {
-                        "header": "تكوين جهاز Z-Wave",
-                        "introduction": "إدارة وضبط معلمات التكوين الخاصة بالجهاز (العقدة) للجهاز المحدد",
-                        "set_param_accepted": "تم تحديث المعلمة.",
-                        "set_param_error": "حدث خطأ.",
-                        "set_param_queued": "تم وضع تغيير المعلمة في قائمة الانتظار ، وسيتم تحديثه عند تنبيه الجهاز."
-                    },
-                    "node_status": {
-                        "asleep": "نائم",
-                        "awake": "مستيقظ",
-                        "dead": "ميت",
-                        "unknown": "غير معروف"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "ستحتاج إلى تنبيه الأجهزة التي تعمل بالبطارية قبل بدء إعادة المقابلة. ارجع إلى دليل جهازك للحصول على إرشادات حول كيفية تنبيه الجهاز.",
-                        "in_progress": "الجهاز قيد المقابلة. هذا قد يستغرق بعض الوقت.",
-                        "interview_complete": "اكتملت مقابلة الجهاز.",
-                        "interview_failed": "فشلت مقابلة الجهاز. قد تتوفر معلومات إضافية في السجلات.",
-                        "introduction": "إعادة مقابلة جهاز على شبكة Z-Wave. استخدم هذه الميزة إذا كان جهازك يحتوي على وظائف مفقودة أو غير صحيحة.",
-                        "run_in_background": "يمكنك إغلاق مربع الحوار هذا وستستمر المقابلة في الخلفية.",
-                        "start_reinterview": "ابدأ إعادة المقابلة",
-                        "title": "أعد إجراء مقابلة مع جهاز Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "إلغاء الاستبعاد",
-                        "follow_device_instructions": "اتبع الإرشادات المرفقة مع جهازك لبدء الاستبعاد على الجهاز.",
-                        "introduction": "قم بإزالة عقدة من شبكة Z-Wave الخاصة بك ، وقم بإزالة الجهاز والكيانات المرتبطة بها من Home Assistant.",
-                        "start_exclusion": "بدء الاستبعاد"
-                    }
-                },
                 "zwave": {
-                    "button": "كوِن",
                     "common": {
                         "index": "فهرس",
+                        "instance": "مثيل",
                         "unknown": "غير معروف",
                         "value": "قيمة",
                         "wakeup_interval": "فترة الاستيقاظ"
@@ -2574,6 +2635,8 @@
                     },
                     "network_status": {
                         "network_started": "بدء تشغيل شبكة Z-Wave",
+                        "network_started_note_all_queried": "تم الاستعلام عن جميع العقد.",
+                        "network_started_note_some_queried": "تم الاستعلام عن العقد المستيقظة. سيتم الاستعلام عن العقد النائمة عند التنبيه.",
                         "network_starting": "جارٍ بدء تشغيل شبكة Z-Wave ...",
                         "network_starting_note": "قد يستغرق هذا بعض الوقت اعتمادا على حجم الشبكة.",
                         "network_stopped": "توقفت شبكة Z-Wave"
@@ -2616,6 +2679,9 @@
                         "tail": "الذيل"
                     },
                     "services": {
+                        "add_node": "إضافة عقدة",
+                        "add_node_secure": "إضافة عقدة آمنة",
+                        "cancel_command": "إلغاء الأمر",
                         "heal_network": "عالج الشبكة",
                         "heal_node": "اختبار عقدة",
                         "node_info": "معلومات العقدة",
@@ -2623,6 +2689,7 @@
                         "refresh_entity": "تحديث الكيان",
                         "refresh_node": "تحديث العقدة",
                         "remove_failed_node": "إزالة العقدة الفاشلة",
+                        "remove_node": "إزالة عقدة",
                         "replace_failed_node": "استبدال العقدة الفاشلة",
                         "save_config": "حفظ التكوين",
                         "soft_reset": "إعادة تشغيل بسيطه",
@@ -2634,6 +2701,107 @@
                     "values": {
                         "header": "قيم العقدة"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "إلغاء التضمين",
+                        "controller_in_inclusion_mode": "أصبحت وحدة التحكم Z-Wave الآن في وضع التضمين.",
+                        "follow_device_instructions": "اتبع الإرشادات المرفقة مع جهازك لبدء الاقتران على الجهاز.",
+                        "inclusion_finished": "تم إضافة العقدة.",
+                        "interview_failed": "فشلت مقابلة الجهاز. قد تتوفر معلومات إضافية في السجلات.",
+                        "interview_started": "الجهاز قيد المقابلة. هذا قد يستغرق بعض الوقت.",
+                        "secure_inclusion_warning": "تتطلب الأجهزة الآمنة نطاقًا تردديًا إضافيًا ؛ يمكن أن يؤدي وجود عدد كبير جدًا من الأجهزة الآمنة إلى إبطاء شبكة Z-Wave. نوصي باستخدام التضمين الآمن فقط للأجهزة التي تتطلب ذلك ، مثل الأقفال أو فتاحات أبواب المرآب.",
+                        "view_device": "عرض الجهاز"
+                    },
+                    "common": {
+                        "add_node": "إضافة عقدة",
+                        "close": "إغلاق",
+                        "heal_network": "عالج الشبكة",
+                        "home_id": "معرف المنزل",
+                        "network": "الشبكة",
+                        "node_id": "معرف العقدة",
+                        "reconfigure_server": "أعد تكوين الخادم",
+                        "remove_node": "إزالة عقدة",
+                        "source": "المصدر"
+                    },
+                    "dashboard": {
+                        "driver_version": "إصدار برنامج التشغيل",
+                        "dump_dead_nodes_text": "بعض العقد الخاصة بك لم تستجب ويفترض أنها ميتة. لن يتم تصديرها بالكامل.",
+                        "dump_dead_nodes_title": "بعض العقد الخاصة بك ميتة",
+                        "dump_debug": "قم بتنزيل ملف تفريغ لشبكتك للمساعدة في تشخيص المشكلات",
+                        "dump_not_ready_confirm": "تحميل",
+                        "dump_not_ready_text": "إذا أنشأت تصديرًا بينما لم تكن جميع العقد جاهزة ، فقد تفوتك البيانات المطلوبة. امنح شبكتك بعض الوقت للاستعلام عن جميع العقد. هل تريد الاستمرار في التفريغ؟",
+                        "dump_not_ready_title": "ليست كل العقد جاهزة بعد",
+                        "header": "إدارة شبكة Z-Wave",
+                        "home_id": "معرف المنزل",
+                        "introduction": "إدارة شبكة Z-Wave وعقد Z-Wave",
+                        "nodes_ready": "العقد جاهزة",
+                        "server_version": "إصدار الخادم"
+                    },
+                    "device_info": {
+                        "device_config": "تكوين جهاز",
+                        "node_ready": "عقدة جاهزة",
+                        "node_status": "حالة العقدة",
+                        "reinterview_device": "أعد إجراء المقابلة مع الجهاز",
+                        "zwave_info": "معلومات Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "تم إلغاء معالجة الشبكة.",
+                        "healing_complete": "اكتملت معالجة الشبكة.",
+                        "healing_failed": "المعالجة فشلت. قد تتوفر معلومات إضافية في السجلات.",
+                        "in_progress": "معالجة الشبكة جارية. سيستغرق هذا بعض الوقت.",
+                        "introduction": "ابدأ معالجة الشبكة على شبكة Z-Wave الخاصة بك. سيؤدي علاج الشبكة إلى إعادة حساب جميع الأجهزة لمساراتها مرة أخرى إلى وحدة التحكم ويوصى بذلك إذا قمت مؤخرًا بنقل الأجهزة أو وحدة التحكم الخاصة بك.",
+                        "run_in_background": "يمكنك إغلاق مربع الحوار هذا وستستمر عملية معالجة الشبكة في الخلفية.",
+                        "start_heal": "ابدأ المعالجة",
+                        "stop_heal": "أوقف المعالجة.",
+                        "title": "عالج شبكة Z-Wave الخاصة بك",
+                        "traffic_warning": "تولد عملية المعالجة قدرًا كبيرًا من حركة المرور على شبكة Z-Wave. قد يتسبب هذا في استجابة الأجهزة ببطء (أو عدم الاستجابة على الإطلاق) أثناء تقدم المعالجة."
+                    },
+                    "logs": {
+                        "log_level": "مستوى التسجيل في السجل",
+                        "log_level_changed": "تم تغيير مستوى السجل إلى: {level}",
+                        "subscribed_to_logs": "اشترك في Z-Wave JS سجل الرسائل...",
+                        "title": "سجلات Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "السجلات",
+                        "network": "الشبكة"
+                    },
+                    "node_config": {
+                        "attribution": "يتم توفير معلمات تكوين الجهاز وأوصافه من قبل {device_database}",
+                        "battery_device_notice": "يجب أن تكون أجهزة البطارية نشطة لتحديث التكوين الخاص بها. يرجى الرجوع إلى دليل جهازك للحصول على إرشادات حول كيفية تنشيط الجهاز.",
+                        "error_device_not_found": "لم يتم العثور علي الجهاز",
+                        "header": "تكوين جهاز Z-Wave",
+                        "introduction": "إدارة وضبط معلمات التكوين الخاصة بالجهاز (العقدة) للجهاز المحدد",
+                        "parameter": "المعامل",
+                        "parameter_is_read_only": "هذه المعلمة للقراءة فقط.",
+                        "set_param_accepted": "تم تحديث المعلمة.",
+                        "set_param_error": "حدث خطأ.",
+                        "set_param_queued": "تم وضع تغيير المعلمة في قائمة الانتظار ، وسيتم تحديثه عند تنبيه الجهاز.",
+                        "zwave_js_device_database": "قاعدة بيانات جهاز Z-Wave JS"
+                    },
+                    "node_status": {
+                        "asleep": "نائم",
+                        "awake": "مستيقظ",
+                        "dead": "ميت",
+                        "unknown": "غير معروف"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "ستحتاج إلى تنبيه الأجهزة التي تعمل بالبطارية قبل بدء إعادة المقابلة. ارجع إلى دليل جهازك للحصول على إرشادات حول كيفية تنبيه الجهاز.",
+                        "in_progress": "الجهاز قيد المقابلة. هذا قد يستغرق بعض الوقت.",
+                        "interview_complete": "اكتملت مقابلة الجهاز.",
+                        "interview_failed": "فشلت مقابلة الجهاز. قد تتوفر معلومات إضافية في السجلات.",
+                        "introduction": "إعادة مقابلة جهاز على شبكة Z-Wave. استخدم هذه الميزة إذا كان جهازك يحتوي على وظائف مفقودة أو غير صحيحة.",
+                        "run_in_background": "يمكنك إغلاق مربع الحوار هذا وستستمر المقابلة في الخلفية.",
+                        "start_reinterview": "ابدأ إعادة المقابلة",
+                        "title": "أعد إجراء مقابلة مع جهاز Z-Wave"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "إلغاء الاستبعاد",
+                        "follow_device_instructions": "اتبع الإرشادات المرفقة مع جهازك لبدء الاستبعاد على الجهاز.",
+                        "introduction": "قم بإزالة عقدة من شبكة Z-Wave الخاصة بك ، وقم بإزالة الجهاز والكيانات المرتبطة بها من Home Assistant.",
+                        "start_exclusion": "بدء الاستبعاد"
+                    }
                 }
             },
             "custom": {
@@ -2654,6 +2822,7 @@
                     "services": {
                         "accepts_target": "تقبل هذه الخدمة هدفًا ، على سبيل المثال: `entity_id: light.bed_light`",
                         "all_parameters": "جميع المعلمات المتاحة",
+                        "no_template_ui_support": "لا تدعم واجهة المستخدم القوالب ، لا يزال بإمكانك استخدام محرر YAML",
                         "title": "الخدمات",
                         "ui_mode": "انتقل إلى وضع واجهة المستخدم",
                         "yaml_mode": "انتقل إلى وضع YAML",
@@ -2677,33 +2846,6 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "الرجوع للخلف",
-                "supervisor": {
-                    "ask": "طلب المساعدة",
-                    "observer": "تحقق من المراقب",
-                    "reboot": "حاول إعادة تشغيل المضيف",
-                    "system_health": "تحقق من صحة النظام",
-                    "title": "تعذر تحميل لوحة المشرف!",
-                    "wait": "إذا كنت قد بدأت للتو ، فتأكد من منح المشرف الوقت الكافي للبدء."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "الأسبوع الماضي",
-                    "this_week": "هذا الأسبوع",
-                    "today": "اليوم",
-                    "yesterday": "أمس"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "الأسبوع الماضي",
-                    "this_week": "هذا الأسبوع",
-                    "today": "اليوم",
-                    "yesterday": "أمس"
-                }
-            },
             "lovelace": {
                 "add_entities": {
                     "generated_unsupported": "لا يمكنك استخدام هذه الوظيفة إلا عندما تتحكم في واجهة مستخدم Lovelace.",
@@ -2735,7 +2877,7 @@
                         "url": "فتح النافذة لـ {url_path}"
                     },
                     "safe-mode": {
-                        "description": "واجه Home Assistant مشكلة أثناء تحميل التكوينات الخاصة بك ويتم تشغيله الآن في الوضع الآمن. أنظر إلى سجل الأخطاء لمعرفة  الخطأ.",
+                        "description": "واجه Home Assistant مشكلة أثناء تحميل التكوينات الخاصة بك ويتم تشغيله الآن في الوضع الآمن. أنظر إلى سجل الأخطاء لمعرفة الخطأ.",
                         "header": "الوضع الآمن منشط"
                     },
                     "shopping-list": {
@@ -2806,7 +2948,9 @@
                             "secondary_info_values": {
                                 "last-changed": "آخر تعديل",
                                 "last-triggered": "آخر تشغيل",
-                                "last-updated": "آخر تحديث"
+                                "last-updated": "آخر تحديث",
+                                "none": "لا توجد معلومات ثانوية",
+                                "tilt-position": "وضع الإمالة"
                             },
                             "show_header_toggle": "إظهار الزر العلوي؟"
                         },
@@ -2894,7 +3038,7 @@
                             "name": "السجل"
                         },
                         "map": {
-                            "dark_mode": "الوضع المظلم؟",
+                            "dark_mode": "الوضع الداكن؟",
                             "default_zoom": "التكبير الافتراضي",
                             "description": "بطاقة الخريطة التي تتيح لك عرض الكيانات على الخريطة.",
                             "geo_location_sources": "مصادر تحديد الموقع الجغرافي",
@@ -2933,6 +3077,7 @@
                         },
                         "sensor": {
                             "description": "تمنحك بطاقة المستشعر لمحة عامة سريعة عن حالة المستشعرات الخاصة بك مع رسم بياني اختياري لتصور التغيير بمرور الوقت.",
+                            "graph_type": "نوع الرسم البياني",
                             "name": "مستشعر"
                         },
                         "shopping-list": {
@@ -3038,12 +3183,12 @@
                         "error_remove": "تعذر إزالة التكوين: {error}",
                         "error_save_yaml": "تعذر حفظ YAML: {error}",
                         "header": "تعديل التكوين",
+                        "reload": "إعادة تحميل",
                         "save": "حفظ",
                         "saved": "تم الحفظ",
                         "unsaved_changes": "التغييرات غير محفوظة"
                     },
                     "save_config": {
-                        "cancel": "لا يهم",
                         "close": "إغلاق",
                         "empty_config": "ابدأ بلوحة معلومات فارغة",
                         "header": "تحكم في واجهة مستخدم Lovelace",
@@ -3062,8 +3207,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "هذا يجعل البطاقة الأولى بالعرض الكامل. لن يتم عرض البطاقات الأخرى في هذا العرض بالإضافة إلى الشارات.",
-                            "title": "وضع اللوحة؟",
                             "warning_multiple_cards": "تحتوي طريقة العرض هذه على أكثر من بطاقة ، ولكن يمكن أن تعرض طريقة عرض اللوحة بطاقة واحدة فقط."
                         }
                     }
@@ -3123,12 +3266,13 @@
                                 "login_expired": "انتهت مدة الجلسة، يرجى تسجيل الدخول مرة أخرى."
                             },
                             "error": {
-                                "invalid_auth": "خطأ في اسم المستخدم أو كلمة المرور"
+                                "invalid_auth": "خطأ في اسم المستخدم أو كلمة المرور",
+                                "invalid_code": "رمز المصادقة غير صالح"
                             },
                             "step": {
                                 "init": {
                                     "data": {
-                                        "password": "كلمة السر",
+                                        "password": "كلمة المرور",
                                         "username": "اسم المستخدم"
                                     }
                                 },
@@ -3256,8 +3400,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "التالى",
-                    "intro": "شارك التحليلات من المثيل الخاص بك. ستكون هذه البيانات متاحة للجمهور على {link}"
+                    "finish": "التالى"
                 },
                 "core-config": {
                     "button_detect": "كشف",
@@ -3266,7 +3409,7 @@
                     "intro_location": "نود أن نعرف أين تعيش. ستساعد هذه المعلومات في عرض المعلومات وإعداد الأتمتة القائمة على الشمس. لا يتم ابدا مشاركة هذه البيانات خارج الشبكة الخاصة بك.",
                     "intro_location_detect": "يمكننا مساعدتك في ملء هذه المعلومات عن طريق تقديم طلب لمرة واحدة إلى خدمة خارجية.",
                     "location_name": "اسم تثبيت Home Assistant الخاص بك",
-                    "location_name_default": "المنزل "
+                    "location_name_default": "المنزل"
                 },
                 "finish": "انتهى",
                 "integration": {
@@ -3276,16 +3419,25 @@
                 },
                 "intro": "هل أنت مستعد لإيقاظ منزلك واستعادة خصوصيتك والانضمام إلى مجتمع عالمي من اللاعبين؟",
                 "next": "التالى",
+                "restore": {
+                    "addons": "الإضافات",
+                    "confirm_password": "تأكيد كلمة مرور اللقطة",
+                    "folders": "المجلدات",
+                    "password": "كلمة مرور اللقطة",
+                    "password_protection": "حماية كلمة المرور",
+                    "select_type": "تحديد ما يجب استعادته",
+                    "type": "نوع اللقطة"
+                },
                 "user": {
                     "create_account": "إنشاء حساب",
                     "data": {
                         "name": "الاسم",
-                        "password": "كلمه السر",
-                        "password_confirm": "تأكيد كلمة السر",
+                        "password": "كلمة المرور",
+                        "password_confirm": "تأكيد كلمة المرور",
                         "username": "المستخدم"
                     },
                     "error": {
-                        "password_not_match": "كلمة السر غير مطابقة",
+                        "password_not_match": "كلمات المرور غير متطابقة",
                         "required_fields": "املأ جميع الحقول المطلوبة"
                     },
                     "intro": "لنبدأ بإنشاء حساب مستخدم.",
@@ -3299,18 +3451,21 @@
                     "title": "الوضع المتقدم"
                 },
                 "change_password": {
-                    "confirm_new_password": "تأكيد كلمة السر الجديدة",
-                    "current_password": "كلمة السر الحالية",
+                    "confirm_new_password": "تأكيد كلمة المرور الجديدة",
+                    "current_password": "كلمة المرور الحالية",
+                    "error_new_is_old": "يجب أن تكون كلمة المرور الجديدة مختلفة عن كلمة المرور الحالية",
                     "error_new_mismatch": "كلمة المرور الجديدة التي تم إدخالها غير متطابقة",
                     "error_required": "مطلوب",
-                    "header": "تغيير كلمة السر",
+                    "header": "تغيير كلمة المرور",
                     "new_password": "كلمة السر الجديدة",
-                    "submit": "إرسال"
+                    "submit": "إرسال",
+                    "success": "تم تغيير كلمة المرور بنجاح"
                 },
                 "current_user": "أنت مسجّل الدخول حاليًا كـ {fullName} .",
                 "customize_sidebar": {
                     "button": "تعديل",
-                    "description": "يمكنك أيضًا الضغط مع الاستمرار على رأس الشريط الجانبي لتنشيط وضع التعديل."
+                    "description": "يمكنك أيضًا الضغط مع الاستمرار على رأس الشريط الجانبي لتنشيط وضع التعديل.",
+                    "header": "تغيير الترتيب وإخفاء العناصر من الشريط الجانبي"
                 },
                 "dashboard": {
                     "description": "اختر لوحة معلومات افتراضية لهذا الجهاز.",
@@ -3325,7 +3480,7 @@
                     "description": "سيؤدي ذلك إلى إخفاء الشريط الجانبي افتراضيا، على غرار تجربة الجوال.",
                     "header": "إخفاء الشريط الجانبي دوما"
                 },
-                "is_owner": "أنت مالك",
+                "is_owner": "أنت المالك",
                 "language": {
                     "dropdown_label": "اللغة",
                     "header": "اللغة",
@@ -3348,6 +3503,12 @@
                     "prompt_copy_token": "نسخ رمز الوصول الخاص بك. لن يتم عرضه مرة أخرى.",
                     "prompt_name": "إعط الرمز المميز اسماً"
                 },
+                "mfa": {
+                    "confirm_disable": "هل تريد حقا الغاء تفعيل {name}؟",
+                    "disable": "تعطيل",
+                    "enable": "تفعيل",
+                    "header": "وحدات التحقق متعددة العوامل"
+                },
                 "mfa_setup": {
                     "close": "إغلاق",
                     "step_done": "تم التنصيب لـ {step}",
@@ -3355,18 +3516,16 @@
                     "title_aborted": "تم الإلغاء",
                     "title_success": "تم بنجاح"
                 },
-                "mfa": {
-                    "confirm_disable": "هل تريد حقا الغاء تفعيل {name}؟",
-                    "disable": "تعطيل",
-                    "enable": "تفعيل",
-                    "header": "وحدات التحقق متعددة العوامل"
-                },
                 "number_format": {
+                    "description": "اختر كيفية تنسيق الأرقام.",
                     "dropdown_label": "تنسيق الأرقام",
                     "formats": {
+                        "comma_decimal": "1,234,567.89",
                         "decimal_comma": "1.234.567،89",
+                        "language": "تلقائي (استخدام إعدادات اللغة)",
                         "none": "لاشيء",
-                        "space_comma": "1 234 567,89"
+                        "space_comma": "1 234 567,89",
+                        "system": "استخدم لغة النظام"
                     },
                     "header": "تنسيق الأرقام"
                 },
diff --git a/translations/frontend/bg.json b/translations/frontend/bg.json
index af50e2574f..07a106371a 100644
--- a/translations/frontend/bg.json
+++ b/translations/frontend/bg.json
@@ -26,6 +26,14 @@
         "shopping_list": "Списък за пазаруване",
         "states": "Общ преглед"
     },
+    "state": {
+        "default": {
+            "off": "Изключен",
+            "on": "Включен",
+            "unavailable": "Недостъпен",
+            "unknown": "Неизвестно"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +102,6 @@
             "not_home": "Отсъства"
         }
     },
-    "state": {
-        "default": {
-            "off": "Изключен",
-            "on": "Включен",
-            "unavailable": "Недостъпен",
-            "unknown": "Неизвестно"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -235,6 +235,26 @@
                 "not_installed": "Добавката не е инсталирана"
             }
         },
+        "backup": {
+            "addons": "Добавки",
+            "confirm_password": "Потвърдете паролата за снапшота",
+            "could_not_create": "Не можа да се създаде снапшот",
+            "create": "Създаване",
+            "create_blocked_not_running": "Създаването на снапшот в момента не е възможно, тъй като системата е в състояние {state}.",
+            "created": "Създаден",
+            "delete_backup_confirm": "Изтрий",
+            "delete_selected": "Изтриване на избраните снапшоти",
+            "enter_password": "Моля, въведете парола.",
+            "failed_to_delete": "Изтриването не е успешно",
+            "folders": "Папки",
+            "name": "Име",
+            "password": "Парола",
+            "password_protection": "Защита с парола",
+            "passwords_not_matching": "Паролите не съвпадат",
+            "select_type": "Изберете какво да възстановите",
+            "selected": "{number} избрани",
+            "type": "Тип"
+        },
         "common": {
             "cancel": "Отказ",
             "close": "Затвори",
@@ -334,9 +354,6 @@
                 "text": "Искате ли да рестартирате добавката с вашите промени?"
             },
             "update": {
-                "create_snapshot": "Създаване на снапшот на {name} преди актуализиране",
-                "snapshot": "Снапшот",
-                "snapshotting": "Създава се снапшот на {name}",
                 "updating": "Актуализиране на {name} до версия {version}"
             }
         },
@@ -350,48 +367,9 @@
         },
         "panel": {
             "dashboard": "Табло",
-            "snapshots": "Снапшоти",
             "store": "Хранилище за добавки",
             "system": "Система"
         },
-        "snapshot": {
-            "addons": "Добавки",
-            "available_snapshots": "Налични снапшоти",
-            "confirm_password": "Потвърдете паролата за снапшота",
-            "could_not_create": "Не можа да се създаде снапшот",
-            "create": "Създаване",
-            "create_blocked_not_running": "Създаването на снапшот в момента не е възможно, тъй като системата е в състояние {state}.",
-            "create_snapshot": "Създаване на снапшот",
-            "created": "Създаден",
-            "delete_selected": "Изтриване на избраните снапшоти",
-            "delete_snapshot_confirm": "Изтрий",
-            "delete_snapshot_text": "Искате ли да изтриете {number} {number, plural,\n  one {резервно копие}\n other {резервни копия}\n}?",
-            "delete_snapshot_title": "Изтриване на снапшота",
-            "description": "Снапшотите ви позволяват лесно да архивирате и възстановявате всички данни от вашия екземпляр на Home Assistant.",
-            "enter_password": "Моля, въведете парола.",
-            "failed_to_delete": "Изтриването не е успешно",
-            "folder": {
-                "addons/local": "Локални добавки",
-                "homeassistant": "Конфигурация на Home Assistant",
-                "media": "Media",
-                "share": "Share",
-                "ssl": "SSL"
-            },
-            "folders": "Папки",
-            "full_snapshot": "Пълен снапшот",
-            "name": "Име",
-            "no_snapshots": "Все още нямате снапшоти",
-            "partial_snapshot": "Частичен снапшот",
-            "password": "Парола",
-            "password_protected": "защитен с парола",
-            "password_protection": "Защита с парола",
-            "passwords_not_matching": "Паролите не съвпадат",
-            "security": "Сигурност",
-            "select_type": "Изберете какво да възстановите",
-            "selected": "{number} избрани",
-            "type": "Тип",
-            "upload_snapshot": "Качване на снапшот"
-        },
         "store": {
             "missing_addons": "Липсват добавки? Активирайте разширения режим в страницата на потребителския си профил",
             "no_results_found": "Няма намерени резултати в {repository}.",
@@ -723,6 +701,12 @@
             },
             "date-range-picker": {
                 "end_date": "Крайна дата",
+                "ranges": {
+                    "last_week": "Миналата седмица",
+                    "this_week": "Тази седмица",
+                    "today": "Днес",
+                    "yesterday": "Вчера"
+                },
                 "select": "Изберете",
                 "start_date": "Начална дата"
             },
@@ -808,10 +792,10 @@
                 "documentation": "документация",
                 "learn_adding_local_media": "Научете повече за добавянето на мултимедия в {documentation} .",
                 "local_media_files": "Поставете вашите видео, аудио и графични файлове в медийната директория, за да можете да ги разглеждате и възпроизвеждате в браузъра или на поддържаните медийни плейъри.",
+                "media-player-browser": "Браузър на медийния плейър",
                 "media_browsing_error": "Грешка в медийния браузър",
                 "media_not_supported": "Плейърът на медийния браузър не поддържа този тип медия",
                 "media_player": "Медиен плейър",
-                "media-player-browser": "Браузър на медийния плейър",
                 "no_items": "Няма елементи",
                 "no_local_media_found": "Не са намерени местни медии",
                 "no_media_folder": "Изглежда, че все още не сте създали медийна директория.",
@@ -874,6 +858,9 @@
             "service-picker": {
                 "service": "Услуга"
             },
+            "statistic-picker": {
+                "statistic": "Статистика"
+            },
             "target-picker": {
                 "add_area_id": "Изберете област",
                 "add_device_id": "Изберете устройство",
@@ -1042,6 +1029,10 @@
                 "form": {
                     "header": "Опции"
                 },
+                "loading": {
+                    "loading_flow": "Моля, изчакайте, докато опциите за {integration} се инициализират",
+                    "loading_step": "Зарежда се следващата стъпка за {integration}"
+                },
                 "success": {
                     "description": "Опциите бяха запазени успешно."
                 }
@@ -1061,7 +1052,6 @@
                         "integrations": "Интеграции",
                         "logs": "Журнали",
                         "lovelace": "Табла на Lovelace",
-                        "navigate_to": "Отворете {panel}",
                         "person": "Хора",
                         "scene": "Сцени",
                         "script": "Скриптове",
@@ -1263,7 +1253,6 @@
                             "introduction": "Действията са това, което Home Assistant ще направи, когато се активира автоматизацията.",
                             "learn_more": "Научете повече за действията",
                             "name": "Действие",
-                            "type_select": "Тип действие",
                             "type": {
                                 "choose": {
                                     "add_option": "Добавяне на опция",
@@ -1304,7 +1293,6 @@
                                 "repeat": {
                                     "label": "Повторение",
                                     "sequence": "Действия",
-                                    "type_select": "Тип повторение",
                                     "type": {
                                         "count": {
                                             "label": "Брой"
@@ -1317,7 +1305,8 @@
                                             "conditions": "Докато условия",
                                             "label": "Докато"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Тип повторение"
                                 },
                                 "scene": {
                                     "label": "Активиране на сцена"
@@ -1337,6 +1326,7 @@
                                     "wait_template": "Шаблон за изчакване"
                                 }
                             },
+                            "type_select": "Тип действие",
                             "unsupported_action": "Няма поддръжка на потребителски интерфейс за действие: {action}"
                         },
                         "alias": "Име",
@@ -1354,7 +1344,6 @@
                             "introduction": "Условията са незадължителна част от правилото за автоматизация и могат да се използват, за да се предотврати настъпването на действие, когато се задейства тригера. Условията изглеждат много близки до тригерите, но са много различни. Тригерът ще разглежда събитията, случващи се в системата, докато условието разглежда само как системата изглежда в момента. Тригера може да наблюдава включването на ключ. Условието може само да види дали ключ е включен или изключен в момента.",
                             "learn_more": "Научете повече за условията",
                             "name": "Условие",
-                            "type_select": "Тип на условие",
                             "type": {
                                 "and": {
                                     "label": "И"
@@ -1415,12 +1404,18 @@
                                         "wed": "Сряда"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Идентификатор на тригера",
+                                    "label": "Тригер",
+                                    "no_triggers": "Няма налични тригери"
+                                },
                                 "zone": {
                                     "entity": "Обект с местоположение",
                                     "label": "Зона",
                                     "zone": "Зона"
                                 }
                             },
+                            "type_select": "Тип на условие",
                             "unsupported_condition": "Няма поддръжка на потребителски интерфейс за условие: {condition}"
                         },
                         "copy_to_clipboard": "Копиране в клипборда",
@@ -1454,10 +1449,10 @@
                             "delete_confirm": "Сигурни ли сте, че искате да изтриете?",
                             "duplicate": "Дублиране",
                             "header": "Тригери",
+                            "id": "Идентификатор на тригера (използва се от условието за тригер)",
                             "introduction": "Тригерите са това, което стартира обработката на правило за автоматизация. Възможно е да се зададат множество тригери за едно и също правило. След като тригера стартира, Home Assistant ще провери условията, ако има такива, и ще стартира действието.",
                             "learn_more": "Научете повече за тригерите",
                             "name": "Тригер",
-                            "type_select": "Тип на тригера",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1521,18 +1516,18 @@
                                     "label": "Шаблон",
                                     "value_template": "Шаблон за стойност"
                                 },
-                                "time_pattern": {
-                                    "hours": "Часове",
-                                    "label": "Времеви модел",
-                                    "minutes": "Минути",
-                                    "seconds": "Секунди"
-                                },
                                 "time": {
                                     "at": "Във",
                                     "label": "Време",
                                     "type_input": "Стойност на помощника за дата/час",
                                     "type_value": "Фиксирано време"
                                 },
+                                "time_pattern": {
+                                    "hours": "Часове",
+                                    "label": "Времеви модел",
+                                    "minutes": "Минути",
+                                    "seconds": "Секунди"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook идентификатор"
@@ -1546,6 +1541,7 @@
                                     "zone": "Зона"
                                 }
                             },
+                            "type_select": "Тип на тригера",
                             "unsupported_platform": "Няма поддръжка на потребителски интерфейс за платформа: {platform}"
                         },
                         "unsaved_confirm": "Имате незапазени промени. Сигурни ли сте, че искате да напуснете?"
@@ -1690,8 +1686,8 @@
                             "disable_hook_error_msg": "Неуспешно деактивиране на webhook:",
                             "loading": "Зареждане ...",
                             "manage": "Управление",
-                            "no_hooks_yet_link_integration": "webhook-базирана интеграция",
-                            "no_hooks_yet2": " или създавайки "
+                            "no_hooks_yet2": " или създавайки ",
+                            "no_hooks_yet_link_integration": "webhook-базирана интеграция"
                         }
                     },
                     "alexa": {
@@ -1797,41 +1793,13 @@
                     "description": "Променете общите настройки на Home Assistant",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Преди да активирате това, не забравяйте да посетите страницата с документация за анализа {link} за да разберете какво изпращате и как се съхранява.",
-                                "header": "Анализи",
-                                "instance_id": "Идент. № на инсталация: {huuid}",
-                                "introduction": "Споделете информация от вашата инсталация, за да  подобряваме още Home Assistant и да ни помогнете да убедим производителите да добавят функции за локален контрол с фокус върху поверителността.",
-                                "learn_more": "Как обработваме вашите данни",
-                                "needs_base": "Трябва да активирате базовия анализ, за да бъде налична тази опция",
-                                "preference": {
-                                    "base": {
-                                        "description": "Идентификационен номер на инсталацията, версия и тип на инсталиране.",
-                                        "title": "Базов анализ"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Споделяйте доклади за сривове и диагностична информация",
-                                        "title": "Диагностика"
-                                    },
-                                    "statistics": {
-                                        "description": "Общо използвани обекти, потребители и други елементи.",
-                                        "title": "Статистика за употребата"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Имена, версии и възможности.",
-                                        "title": "Използвани интеграции и добавки"
-                                    },
-                                    "usage": {
-                                        "description": "Информация за име и версия.",
-                                        "title": "Използвани интеграции"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Валута",
                                 "edit_requires_storage": "Редакторът е деактивиран, защото конфигурацията е съхранена в configuration.yaml.",
                                 "elevation": "Надморска височина",
                                 "elevation_meters": "метра",
                                 "external_url": "Външен URL",
+                                "find_currency_value": "Намерете своята стойност",
                                 "imperial_example": "Фаренхайт, паунд",
                                 "internal_url": "Вътрешен URL",
                                 "latitude": "Географска ширина",
@@ -1997,14 +1965,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Изчистване",
-                    "filtering_by": "Филтриране по",
-                    "show": "Покажи"
-                },
-                "hassio": {
-                    "button": "Конфигуриране"
-                },
                 "header": "Конфигуриране на Home Assistant",
                 "helpers": {
                     "description": "Елементи, които помагат за изграждането на автоматизации",
@@ -2059,8 +2019,6 @@
                         "depends_on_cloud": "Зависи от облака",
                         "device_unavailable": "Устройството е недостъпно",
                         "devices": "{count} {count, plural,\n  one {устройство}\n  other {устройства}\n}",
-                        "disable_error": "Активирането или деактивирането на интеграцията не бе успешно",
-                        "disable_restart_confirm": "Рестартирайте Home Assistant за да завършите деактивирането на тази интеграция",
                         "disable": {
                             "disable_confirm": "Наистина ли искате да забраните този конфигурационен запис? Устройствата и обекти му ще бъдат деактивирани.",
                             "disabled": "Деактивирана",
@@ -2071,6 +2029,8 @@
                             },
                             "disabled_cause": "Деактивирано от {cause}"
                         },
+                        "disable_error": "Активирането или деактивирането на интеграцията не бе успешно",
+                        "disable_restart_confirm": "Рестартирайте Home Assistant за да завършите деактивирането на тази интеграция",
                         "disabled_polling": "Автоматичното обновяване за данни е забранено",
                         "documentation": "Документация",
                         "enable_restart_confirm": "Рестартирайте Home Assistant за да завършите активирането на тази интеграция",
@@ -2078,11 +2038,9 @@
                         "entity_unavailable": "Обектът е недостъпен",
                         "firmware": "Фърмуер: {version}",
                         "hub": "Свързан чрез",
-                        "logs": "Журнали",
                         "manuf": "от {manufacturer}",
                         "no_area": "Без област",
                         "not_loaded": "Не е заредено, проверете {logs_link}",
-                        "options": "Настройки",
                         "reload": "Презареждане",
                         "reload_confirm": "Интеграцията беше презаредена",
                         "reload_restart_confirm": "Рестартирайте Home Assistant, за да завършите презареждането на тази интеграция",
@@ -2105,7 +2063,11 @@
                             "description": "Завършването на тази стъпка изисква да посетите външен уебсайт.",
                             "open_site": "Отваряне на уеб сайт"
                         },
-                        "loading_first_time": "Моля, изчакайте, докато се инсталира интеграцията",
+                        "loading": {
+                            "fallback_title": "интеграцията",
+                            "loading_flow": "Моля, изчакайте, докато се настройва {integration}",
+                            "loading_step": "Зарежда се следващата стъпка за {integration}"
+                        },
                         "next": "Следващ",
                         "not_all_required_fields": "Не всички задължителни полета са попълнени.",
                         "not_loaded": "Интеграцията не можа да бъде заредена, опитайте да рестартирате Home Assistant."
@@ -2116,7 +2078,6 @@
                     "description": "Управление на интеграции с услуги, устройства, ...",
                     "disable": {
                         "disabled_integrations": "{number} деактивирани",
-                        "hide_disabled": "Скриване на деактивираните интеграции",
                         "show": "Покажи",
                         "show_disabled": "Показване на деактивираните интеграции"
                     },
@@ -2125,7 +2086,6 @@
                     "ignore": {
                         "confirm_delete_ignore_title": "Да се спре ли игнорирането на {name}?",
                         "confirm_ignore": "Наистина ли не искате да настроите тази интеграция? Можете да отмените това, като кликнете върху „Показване на игнорирани интеграции“ в менюто горе вдясно.",
-                        "hide_ignored": "Скриване на игнорираните интеграции",
                         "ignore": "Игнориране",
                         "ignored": "Игнорирана",
                         "show_ignored": "Показване на игнорираните интеграции",
@@ -2234,11 +2194,9 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Конфигуриране",
                     "title": "MQTT"
                 },
                 "ozw": {
-                    "button": "Конфигуриране",
                     "common": {
                         "controller": "Контролер",
                         "network": "Мрежа",
@@ -2255,6 +2213,9 @@
                         },
                         "nodes": "Възли"
                     },
+                    "network": {
+                        "node_count": "{count} възли"
+                    },
                     "network_status": {
                         "details": {
                             "driverfailed": "Неуспешно свързване с Z-Wave контролера",
@@ -2268,8 +2229,9 @@
                         "starting": "Стартиране",
                         "unknown": "Неизвестно"
                     },
-                    "network": {
-                        "node_count": "{count} възли"
+                    "node": {
+                        "button": "Детайли за възела",
+                        "not_found": "Не е намерен възел"
                     },
                     "node_config": {
                         "header": "Конфигурация на възел"
@@ -2281,10 +2243,6 @@
                         "associations": "Обновяване на свързаните групи и членства",
                         "complete": "Разпита приключи"
                     },
-                    "node": {
-                        "button": "Детайли за възела",
-                        "not_found": "Не е намерен възел"
-                    },
                     "nodes_table": {
                         "failed": "Неуспешно",
                         "id": "ID",
@@ -2406,10 +2364,12 @@
                         },
                         "save_script": "Запазване на скрипта",
                         "sequence": "Последователност",
-                        "sequence_sentence": "Последователността на действията на този скрипт."
+                        "sequence_sentence": "Последователността на действията на този скрипт.",
+                        "show_trace": "Проследи"
                     },
                     "picker": {
                         "add_script": "Добавяне на скрипт",
+                        "dev_script": "Скрипт за отстраняване на грешки",
                         "duplicate": "Дублиране",
                         "duplicate_script": "Дублиране на скрипта",
                         "edit_script": "Редактиране на скрипта",
@@ -2548,7 +2508,6 @@
                         "search_again": "Потърси отново",
                         "spinner": "Търсене на ZHA Zigbee устройства..."
                     },
-                    "button": "Конфигуриране",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Атрибути на избрания клъстер"
                     },
@@ -2562,10 +2521,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Преки пътища",
-                        "update_button": "Актуализиране на конфигурацията",
-                        "zha_options": {
-                            "title": "Глобални опции"
-                        }
+                        "update_button": "Актуализиране на конфигурацията"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Конфигурирането завърши",
@@ -2628,73 +2584,7 @@
                     "edit_home_zone": "Радиусът на зоната \"Дом\" все още не може да бъде редактиран. Плъзнете маркера на картата, за да преместите въпросната зона.",
                     "no_zones_created_yet": "Изглежда, че все още не сте създали никакви зони."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "inclusion_failed": "Възелът не може да бъде добавен. Моля, проверете журналите за повече информация.",
-                        "inclusion_finished": "Възелът е добавен.",
-                        "interview_failed": "Разпита на устройството не бе успешен. Допълнителна информация може да е налична в логовете.",
-                        "interview_started": "Устройството се разпитва. Това може да отнеме известно време.",
-                        "title": "Добавяне на Z-Wave възел"
-                    },
-                    "button": "Конфигуриране",
-                    "common": {
-                        "add_node": "Добавяне на възел",
-                        "close": "Затвори",
-                        "network": "Мрежа",
-                        "node_id": "ID на възел",
-                        "remove_node": "Премахване на възел"
-                    },
-                    "dashboard": {
-                        "driver_version": "Версия на драйвера",
-                        "dump_dead_nodes_title": "Някои от вашите възли са мъртви",
-                        "dump_not_ready_confirm": "Изтегляне",
-                        "introduction": "Управлявайте вашата Z-Wave мрежа и Z-Wave възли",
-                        "server_version": "Версия на сървъра"
-                    },
-                    "device_info": {
-                        "device_config": "Конфигуриране на устройство",
-                        "node_status": "Състояние на възела"
-                    },
-                    "navigation": {
-                        "logs": "Логове",
-                        "network": "Мрежа"
-                    },
-                    "network_status": {
-                        "connected": "Свързан",
-                        "connecting": "Свързване",
-                        "unknown": "Неизвестен"
-                    },
-                    "node_config": {
-                        "attribution": "Параметрите и описанията на конфигурацията на устройството се предоставят от {device_database}",
-                        "battery_device_notice": "Устройствата на батерии трябва да са будни, за да актуализират конфигурацията си. Моля, вижте ръководството на устройството за инструкции как да го събудите.",
-                        "error_device_not_found": "Не е намерено устройство",
-                        "header": "Z-Wave конфигурация на устройството",
-                        "introduction": "Управление и настройване на специфични конфигурационни параметри на подбраното устройството (възел, node)",
-                        "parameter_is_read_only": "Този параметър е само за четене.",
-                        "set_param_accepted": "Параметърът е актуализиран.",
-                        "set_param_error": "Възникна грешка.",
-                        "zwave_js_device_database": "Z-Wave JS база данни с устройства"
-                    },
-                    "node_status": {
-                        "unknown": "Неизвестен"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Ще трябва да събудите устройствата, захранвани с батерии, преди да започнете повторното интервю. Вижте ръководството на вашето устройство за инструкции как да го събудите.",
-                        "in_progress": "Устройството се разпитва. Това може да отнеме известно време.",
-                        "interview_complete": "Разпита на устройството приключи.",
-                        "interview_failed": "Разпита на устройството не бе успешен. Допълнителна информация може да е налична в логовете.",
-                        "introduction": "Повторно разпитване на устройство във вашата Z-Wave мрежа. Използвайте тази функция, ако устройството има липсваща или неправилна функционалност.",
-                        "run_in_background": "Можете да затворите този диалогов прозорец и разпита ще продължи във фонов режим.",
-                        "start_reinterview": "Започване на нов разпит",
-                        "title": "Повторен разпит на Z-Wave устройство"
-                    },
-                    "remove_node": {
-                        "exclusion_failed": "Възелът не може да бъде премахнат. Моля, проверете журналите за повече информация.",
-                        "title": "Премахване на Z-Wave възел"
-                    }
-                },
                 "zwave": {
-                    "button": "Конфигуриране",
                     "common": {
                         "index": "Индекс",
                         "instance": "Устройство",
@@ -2758,6 +2648,86 @@
                     "values": {
                         "header": "Стойности на устройсто"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "inclusion_failed": "Възелът не може да бъде добавен. Моля, проверете журналите за повече информация.",
+                        "inclusion_finished": "Възелът е добавен.",
+                        "interview_failed": "Разпита на устройството не бе успешен. Допълнителна информация може да е налична в логовете.",
+                        "interview_started": "Устройството се разпитва. Това може да отнеме известно време.",
+                        "title": "Добавяне на Z-Wave възел"
+                    },
+                    "common": {
+                        "add_node": "Добавяне на възел",
+                        "close": "Затвори",
+                        "heal_network": "Заздравяване на мрежата",
+                        "network": "Мрежа",
+                        "node_id": "ID на възел",
+                        "reconfigure_server": "Пренастройване на сървъра",
+                        "remove_node": "Премахване на възел",
+                        "source": "Източник"
+                    },
+                    "dashboard": {
+                        "driver_version": "Версия на драйвера",
+                        "dump_dead_nodes_title": "Някои от вашите възли са мъртви",
+                        "dump_not_ready_confirm": "Изтегляне",
+                        "introduction": "Управлявайте вашата Z-Wave мрежа и Z-Wave възли",
+                        "server_version": "Версия на сървъра"
+                    },
+                    "device_info": {
+                        "device_config": "Конфигуриране на устройство",
+                        "node_status": "Състояние на възела"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Заздравяването на мрежата е отменено.",
+                        "healing_complete": "Заздравяването на мрежата е завършено.",
+                        "healing_failed": "Заздравяването не успя. Допълнителна информация може да бъде налична в дневниците.",
+                        "in_progress": "- Заздравяването на мрежата е в ход. Това ще отнеме известно време.",
+                        "introduction": "Започнете заздравяване на Z-Wave мрежата. Заздравяването на мрежата ще предизвика всички устройства да преизчислят маршрутите си към контролера, което е препоръчително, ако наскоро сте премествали устройства или контролера си.",
+                        "run_in_background": "Можете да затворите този диалогов прозорец и заздравяването на мрежата ще продължи във фонов режим.",
+                        "start_heal": "Започване на заздравяването",
+                        "stop_heal": "Спри заздравяването",
+                        "title": "Заздравяване на Z-wave мрежата",
+                        "traffic_warning": "Процесът на заздравяване генерира голямо количество трафик в мрежата на Z-Wave. Това може да накара устройствата да реагират бавно (или изобщо да не реагират), докато заздравяването е в ход."
+                    },
+                    "navigation": {
+                        "logs": "Логове",
+                        "network": "Мрежа"
+                    },
+                    "network_status": {
+                        "connected": "Свързан",
+                        "connecting": "Свързване",
+                        "unknown": "Неизвестен"
+                    },
+                    "node_config": {
+                        "attribution": "Параметрите и описанията на конфигурацията на устройството се предоставят от {device_database}",
+                        "battery_device_notice": "Устройствата на батерии трябва да са будни, за да актуализират конфигурацията си. Моля, вижте ръководството на устройството за инструкции как да го събудите.",
+                        "error_device_not_found": "Не е намерено устройство",
+                        "header": "Z-Wave конфигурация на устройството",
+                        "introduction": "Управление и настройване на специфични конфигурационни параметри на подбраното устройството (възел, node)",
+                        "parameter": "Параметър",
+                        "parameter_is_read_only": "Този параметър е само за четене.",
+                        "set_param_accepted": "Параметърът е актуализиран.",
+                        "set_param_error": "Възникна грешка.",
+                        "zwave_js_device_database": "Z-Wave JS база данни с устройства"
+                    },
+                    "node_status": {
+                        "unknown": "Неизвестен"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Ще трябва да събудите устройствата, захранвани с батерии, преди да започнете повторното интервю. Вижте ръководството на вашето устройство за инструкции как да го събудите.",
+                        "in_progress": "Устройството се разпитва. Това може да отнеме известно време.",
+                        "interview_complete": "Разпита на устройството приключи.",
+                        "interview_failed": "Разпита на устройството не бе успешен. Допълнителна информация може да е налична в логовете.",
+                        "introduction": "Повторно разпитване на устройство във вашата Z-Wave мрежа. Използвайте тази функция, ако устройството има липсваща или неправилна функционалност.",
+                        "run_in_background": "Можете да затворите този диалогов прозорец и разпита ще продължи във фонов режим.",
+                        "start_reinterview": "Започване на нов разпит",
+                        "title": "Повторен разпит на Z-Wave устройство"
+                    },
+                    "remove_node": {
+                        "exclusion_failed": "Възелът не може да бъде премахнат. Моля, проверете журналите за повече информация.",
+                        "title": "Премахване на Z-Wave възел"
+                    }
                 }
             },
             "developer-tools": {
@@ -2815,33 +2785,6 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Върнете се",
-                "supervisor": {
-                    "ask": "Помолете за помощ",
-                    "observer": "Проверете Надзорника",
-                    "reboot": "Опитайте да рестартирате хоста",
-                    "system_health": "Проверете здравето на системата",
-                    "title": "Не може да се зареди Супервайзър-панела!",
-                    "wait": "Ако току-що сте стартирали, дайте достатъчно време за старт на Супервайзъра."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Миналата седмица",
-                    "this_week": "Тази седмица",
-                    "today": "Днес",
-                    "yesterday": "Вчера"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Миналата седмица",
-                    "this_week": "Тази седмица",
-                    "today": "Днес",
-                    "yesterday": "Вчера"
-                }
-            },
             "lovelace": {
                 "add_entities": {
                     "generated_unsupported": "Можете да използвате тази функция само когато сте поели контрола над потребителския интерфейс на Lovelace.",
@@ -2933,7 +2876,6 @@
                         "entities": {
                             "description": "Картата Обекти е най-често срещаният тип карта. Тя групира елементите заедно в списъци.",
                             "edit_special_row": "Прегледайте подробностите за този ред, като щракнете върху бутона за редактиране",
-                            "entity_row_editor": "Редактор на обекти",
                             "entity_row": {
                                 "attribute": "Атрибут",
                                 "button": "Бутон",
@@ -2944,6 +2886,7 @@
                                 "section": "Раздел",
                                 "weblink": "Уеб връзка"
                             },
+                            "entity_row_editor": "Редактор на обекти",
                             "name": "Обекти",
                             "secondary_info_values": {
                                 "brightness": "Яркост",
@@ -3124,6 +3067,10 @@
                         "tab_badges": "Значки",
                         "tab_settings": "Настройки",
                         "tab_visibility": "Видимост",
+                        "types": {
+                            "panel": "Панел (1 карта)",
+                            "sidebar": "Странична лента"
+                        },
                         "visibility": {
                             "select_users": "Изберете кои потребители да виждат този изглед в навигацията"
                         }
@@ -3174,7 +3121,6 @@
                         "unsaved_changes": "Незапазени промени"
                     },
                     "save_config": {
-                        "cancel": "Няма значение",
                         "close": "Затвори",
                         "empty_config": "Започнете с празно табло",
                         "header": "Поемете контрол над потребителския интерфейс на Lovelace",
@@ -3194,8 +3140,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Това прави първата карта с пълна ширина. Другите карти в този изглед, както и значки, няма да бъдат изобразени.",
-                            "title": "Панелен режим?",
                             "warning_multiple_cards": "Този изглед съдържа повече от една карта, но изгледът на панел може да показва само 1 карта."
                         }
                     }
@@ -3388,8 +3332,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Следващ",
-                    "intro": "Споделяйте анализи от вашия екземпляр. Тези данни ще бъдат публично достъпни на адрес {link}"
+                    "finish": "Следващ"
                 },
                 "core-config": {
                     "button_detect": "Откриване",
@@ -3413,10 +3356,8 @@
                     "confirm_password": "Потвърдете паролата за снапшота",
                     "description": "Като алтернатива можете да възстановите от предишен снапшот.",
                     "folders": "Папки",
-                    "full_snapshot": "Пълен снапшот",
                     "hide_log": "Скриване на пълния дневник",
                     "in_progress": "Възстановяването е в ход",
-                    "partial_snapshot": "Частичен снапшот",
                     "password": "Парола",
                     "password_protection": "Защита с парола",
                     "select_type": "Изберете какво да възстановите",
@@ -3498,6 +3439,12 @@
                     "prompt_copy_token": "Копирайте кода си за достъп. Той няма да бъде показан отново.",
                     "prompt_name": "Дайте име на кода за достъп"
                 },
+                "mfa": {
+                    "confirm_disable": "Сигурни ли сте, че искате да деактивирате {name}?",
+                    "disable": "Деактивиране",
+                    "enable": "Активиране",
+                    "header": "Модули за много-факторна аутентикация"
+                },
                 "mfa_setup": {
                     "close": "Затвори",
                     "step_done": "Настройката е извършена за {step}",
@@ -3505,12 +3452,6 @@
                     "title_aborted": "Преустановено",
                     "title_success": "Успешно!"
                 },
-                "mfa": {
-                    "confirm_disable": "Сигурни ли сте, че искате да деактивирате {name}?",
-                    "disable": "Деактивиране",
-                    "enable": "Активиране",
-                    "header": "Модули за много-факторна аутентикация"
-                },
                 "number_format": {
                     "description": "Изберете как да се форматират числата.",
                     "dropdown_label": "Формат на числата",
diff --git a/translations/frontend/bn.json b/translations/frontend/bn.json
index 8702c22b58..39aa0ba89c 100644
--- a/translations/frontend/bn.json
+++ b/translations/frontend/bn.json
@@ -16,6 +16,12 @@
         "shopping_list": "কেনাকাটার তালিকা",
         "states": "ওভারভিউ"
     },
+    "state": {
+        "default": {
+            "unavailable": "পাওয়া যাচ্ছে না",
+            "unknown": "অজানা"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -24,12 +30,6 @@
             }
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "পাওয়া যাচ্ছে না",
-            "unknown": "অজানা"
-        }
-    },
     "ui": {
         "common": {
             "copied_clipboard": "ক্লিপবোর্ডে অনুলিপি করা হয়েছে"
diff --git a/translations/frontend/bs.json b/translations/frontend/bs.json
index 325e8f3948..d6cd35e3c8 100644
--- a/translations/frontend/bs.json
+++ b/translations/frontend/bs.json
@@ -9,6 +9,12 @@
         "shopping_list": "Spisak za kupovinu",
         "states": "Pregled"
     },
+    "state": {
+        "default": {
+            "unavailable": "Nedostupan",
+            "unknown": "Nepoznat"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -42,12 +48,6 @@
             "home": "Kod kuće"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "Nedostupan",
-            "unknown": "Nepoznat"
-        }
-    },
     "ui": {
         "common": {
             "cancel": "Odustani",
diff --git a/translations/frontend/ca.json b/translations/frontend/ca.json
index 82f813c997..4369da902b 100644
--- a/translations/frontend/ca.json
+++ b/translations/frontend/ca.json
@@ -17,6 +17,7 @@
         "calendar": "Calendari",
         "config": "Configuració",
         "developer_tools": "Eines per a desenvolupadors",
+        "energy": "Energia",
         "history": "Historial",
         "logbook": "Diari de registre",
         "mailbox": "Bústia",
@@ -26,6 +27,14 @@
         "shopping_list": "Llista de la compra",
         "states": "Visualització general"
     },
+    "state": {
+        "default": {
+            "off": "Off",
+            "on": "On",
+            "unavailable": "No disponible",
+            "unknown": "Desconegut"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Fora"
         }
     },
-    "state": {
-        "default": {
-            "off": "Off",
-            "on": "On",
-            "unavailable": "No disponible",
-            "unknown": "Desconegut"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "El complement no està instal·lat"
             }
         },
+        "backup": {
+            "addons": "Complements",
+            "confirm_password": "Confirma la contrasenya de la instantània",
+            "could_not_create": "No s'ha pogut crear la instantània",
+            "create": "Crea",
+            "create_blocked_not_running": "Ara mateix no és possible crear una instantània perquè el sistema es troba en estat {state}.",
+            "created": "Creada",
+            "delete_backup_confirm": "suprimeix",
+            "delete_selected": "Suprimeix les instantànies seleccionades",
+            "enter_password": "Introdueix una contrasenya.",
+            "failed_to_delete": "No s'ha pogut suprimir",
+            "folders": "Carpetes",
+            "name": "Nom de la instantània",
+            "password": "Contrasenya de la instantània",
+            "password_protection": "Protecció amb contrasenya",
+            "passwords_not_matching": "Les contrasenyes no coincideixen",
+            "select_type": "Selecciona què vols restaurar",
+            "selected": "{number} seleccionada/es",
+            "type": "Tipus d'instantània"
+        },
         "common": {
             "cancel": "Cancel·la",
             "close": "Tanca",
@@ -366,9 +387,6 @@
                 "text": "Vols reiniciar el complement amb els teus canvis?"
             },
             "update": {
-                "create_snapshot": "Crea una instantània de {name} abans d'actualitzar",
-                "snapshot": "Instantània",
-                "snapshotting": "Creant instantània de {name}",
                 "updating": "S'està actualitzant {name} a la versió {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Panell",
-            "snapshots": "Instantànies",
             "store": "Directori de complements",
             "system": "Sistema"
         },
-        "snapshot": {
-            "addons": "Complements",
-            "available_snapshots": "Instantànies disponibles",
-            "confirm_password": "Confirma la contrasenya de la instantània",
-            "could_not_create": "No s'ha pogut crear la instantània",
-            "create": "Crea",
-            "create_blocked_not_running": "Ara mateix no és possible crear una instantània perquè el sistema es troba en estat {state}.",
-            "create_snapshot": "Crea instantània",
-            "created": "Creada",
-            "delete_selected": "Suprimeix les instantànies seleccionades",
-            "delete_snapshot_confirm": "suprimeix",
-            "delete_snapshot_text": "Vols suprimir {number} {number, plural,\n  one {instantània}\n  other {instantànies}\n}?",
-            "delete_snapshot_title": "Suprimeix instantània",
-            "description": "Les instantànies et permeten fer una còpia de seguretat i recuperar les dades de la teva instància de Home Assistant.",
-            "enter_password": "Introdueix una contrasenya.",
-            "failed_to_delete": "No s'ha pogut suprimir",
-            "folder": {
-                "addons/local": "Complements locals",
-                "homeassistant": "Configuració de Home Assistant",
-                "media": "Mitjans",
-                "share": "Share",
-                "ssl": "SSL"
-            },
-            "folders": "Carpetes",
-            "full_snapshot": "Instantània completa",
-            "name": "Nom de la instantània",
-            "no_snapshots": "Encara no tens instantànies.",
-            "partial_snapshot": "Instantània parcial",
-            "password": "Contrasenya de la instantània",
-            "password_protected": "protegit amb contrasenya",
-            "password_protection": "Protecció amb contrasenya",
-            "passwords_not_matching": "Les contrasenyes no coincideixen",
-            "security": "Seguretat",
-            "select_type": "Selecciona què vols restaurar",
-            "selected": "{number} seleccionada/es",
-            "type": "Tipus d'instantània",
-            "upload_snapshot": "Puja instantània"
-        },
         "store": {
             "missing_addons": "Falten complements? Activa el mode avançat a la pàgina de perfil d'usuari",
             "no_results_found": "No s'han trobat resultats a {repository}.",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Data final",
+                "ranges": {
+                    "last_week": "Setmana passada",
+                    "this_week": "Aquesta setmana",
+                    "today": "Avui",
+                    "yesterday": "Ahir"
+                },
                 "select": "Selecciona",
                 "start_date": "Data inici"
             },
@@ -851,10 +836,10 @@
                 "documentation": "documentació",
                 "learn_adding_local_media": "Més informació sobre com afegir contingut multimèdia a la {documentation}.",
                 "local_media_files": "Col·loca els fitxers de vídeo, àudio i imatge al directori multimèdia i podràs navegar-hi i reproduir-los des del navegador o els reproductors multimèdia compatibles.",
+                "media-player-browser": "Navegador multimèdia",
                 "media_browsing_error": "Error de navegació multimèdia",
                 "media_not_supported": "El reproductor multimèdia de navegador no és compatible amb aquest tipus de mitjà",
                 "media_player": "Reproductor multimèdia",
-                "media-player-browser": "Navegador multimèdia",
                 "no_items": "Sense elements",
                 "no_local_media_found": "No s'ha trobat cap mitjà local",
                 "no_media_folder": "Sembla que encara no has creat cap directori multimèdia.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Servei"
             },
+            "statistic-picker": {
+                "learn_more": "Més informació sobre les estadístiques",
+                "missing_entity": "Per què no apareix una entitat?",
+                "no_match": "No s'ha trobat cap estadística coincident",
+                "no_statistics": "No tens estadístiques",
+                "statistic": "Estadística"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Carregant estadístiques...",
+                "no_statistics_found": "No s'han trobat estadístiques.",
+                "statistic_types": {
+                    "max": "màxims",
+                    "mean": "mitjana",
+                    "min": "mínims",
+                    "sum": "suma"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Selecciona àrea",
                 "add_device_id": "Selecciona dispositiu",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Opcions"
                 },
+                "loading": {
+                    "loading_flow": "Espera mentre s'inicialitzen les opcions de {integration}",
+                    "loading_step": "Carregant el següent pas de {integration}"
+                },
                 "success": {
                     "description": "Opcions guardades amb èxit."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "General",
                         "customize": "Personalització",
                         "devices": "Dispositius",
+                        "energy": "Energia",
                         "entities": "Entitats",
                         "helpers": "Ajudants",
                         "info": "Informació",
                         "integrations": "Integracions",
                         "logs": "Registres",
                         "lovelace": "Panells Lovelace",
-                        "navigate_to": "Vés a {panel}",
                         "person": "Persones",
                         "scene": "Escenes",
                         "script": "Programes (scripts)",
@@ -1360,7 +1366,6 @@
                             "introduction": "Les accions són allò que farà Home Assistant quan es dispari l'automatització.",
                             "learn_more": "Més informació sobre les accions",
                             "name": "Acció",
-                            "type_select": "Tipus d'acció",
                             "type": {
                                 "choose": {
                                     "add_option": "Afegeix opció",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Repeteix",
                                     "sequence": "Accions",
-                                    "type_select": "Tipus de repetició",
                                     "type": {
                                         "count": {
                                             "label": "Comptador"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Condicions de \"Mentre\"",
                                             "label": "Mentre"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Tipus de repetició"
                                 },
                                 "scene": {
                                     "label": "Activa escena"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Plantilla d'espera"
                                 }
                             },
+                            "type_select": "Tipus d'acció",
                             "unsupported_action": "Acció no compatible amb l'editor visual: {action}"
                         },
                         "alias": "Nom",
@@ -1452,7 +1458,6 @@
                             "introduction": "Les condicions són opcionals i impedeixen que s'executi l'automatització tret de que totes elles se satisfacin.",
                             "learn_more": "Més informació sobre les condicions",
                             "name": "Condició",
-                            "type_select": "Tipus de condició",
                             "type": {
                                 "and": {
                                     "label": "I (AND lògic)"
@@ -1524,6 +1529,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipus de condició",
                             "unsupported_condition": "Condició no compatible amb l'editor visual: {condition}"
                         },
                         "copy_to_clipboard": "Copia al porta-retalls",
@@ -1543,7 +1549,7 @@
                             "queued": "Longitud de la cua"
                         },
                         "modes": {
-                            "description": "El mode controla què passa quan es dispara l'automatització i encara hi ha accions d'un disparament anterior executant-se. Consulta {documentation_link} per a més informació.",
+                            "description": "El mode controla què passa quan es dispara l'automatització i encara hi ha accions d'un disparament anterior executant-se. Consulta la {documentation_link} per a més informació.",
                             "documentation": "documentació d'automatització",
                             "label": "Mode",
                             "parallel": "Paral·lel",
@@ -1563,9 +1569,8 @@
                             "header": "Disparadors",
                             "id": "ID del disparador (utilitzat per la condició de disparador)",
                             "introduction": "Els disparadors són les regles que fan que s'executi una automatització. Pots definir més d'un disparador per a cada automatització. Una vegada salti un disparador, Home Assistant validarà les condicions (si n'hi ha) i finalment cridarà l'acció.",
-                            "learn_more": "Més informació sobre els activadors",
+                            "learn_more": "Més informació sobre els disparadors",
                             "name": "Disparador",
-                            "type_select": "Tipus de disparador",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1636,18 @@
                                     "label": "Plantilla",
                                     "value_template": "Plantilla de valor"
                                 },
-                                "time_pattern": {
-                                    "hours": "Hores",
-                                    "label": "Patró temporal",
-                                    "minutes": "Minuts",
-                                    "seconds": "Segons"
-                                },
                                 "time": {
                                     "at": "A les",
                                     "label": "Temporal",
                                     "type_input": "Valor d'un ajudant de data/hora",
                                     "type_value": "Temps fix"
                                 },
+                                "time_pattern": {
+                                    "hours": "Hores",
+                                    "label": "Patró temporal",
+                                    "minutes": "Minuts",
+                                    "seconds": "Segons"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "ID de Webhook"
@@ -1656,6 +1661,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipus de disparador",
                             "unsupported_platform": "Plataforma no compatible amb l'editor visual: {platform}"
                         },
                         "unsaved_confirm": "Hi ha canvis no desats. Segur que vols sortir?"
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "La teva instància estarà disponible a",
                             "link_learn_how_it_works": "Informació sobre com funciona",
                             "not_connected": "No connectat",
+                            "reconnecting": "Tornant a connectar",
                             "remote_enabled": {
                                 "caption": "Connexió automàtica",
                                 "description": "Activa aquesta opció per assegurar-te que la teva instància de Home Assistant sempre sigui accessible de forma remota."
@@ -1818,9 +1825,9 @@
                             "loading": "Carregant...",
                             "manage": "Gestiona",
                             "no_hooks_yet": "Sembla que encara no tens cap webhook. Comença configurant una ",
+                            "no_hooks_yet2": "o bé creant una",
                             "no_hooks_yet_link_automation": "automatització de webhook",
                             "no_hooks_yet_link_integration": "integració basada en webhook",
-                            "no_hooks_yet2": "o bé creant una",
                             "title": "Webhooks"
                         }
                     },
@@ -1935,41 +1942,13 @@
                     "description": "Sistema d'unitats, ubicació, zona horària i altres paràmetres generals",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Abans d'activar això, revisa't la documentació d'anàlisi a {link}, per entendre el què s'enviarà i com s'emmagatzemarà.",
-                                "header": "Dades analítiques",
-                                "instance_id": "ID de la instància: {huuid}",
-                                "introduction": "Comparteix informació de la teva instal·lació per ajudar a millorar Home Assistant i ajudar-nos a convèncer als fabricants perquè afegeixin control local i funcions centrades en la privadesa.",
-                                "learn_more": "Com processem les teves dades",
-                                "needs_base": "Has d'habilitar l'anàlisi bàsica perquè aquesta opció estigui disponible",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID de la instància, versió i tipus d'instal·lació.",
-                                        "title": "Anàlisi bàsica"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Comparteix informes d'error quan es produeixin errors inesperats.",
-                                        "title": "Diagnòstics"
-                                    },
-                                    "statistics": {
-                                        "description": "Nombre total d'entitats utilitzades, usuaris i altres elements.",
-                                        "title": "Estadístiques d’ús"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Noms, versions i funcionalitats.",
-                                        "title": "Integracions i complements utilitzats"
-                                    },
-                                    "usage": {
-                                        "description": "Noms i informació de versió.",
-                                        "title": "Integracions utilitzades"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Moneda",
                                 "edit_requires_storage": "L'editor està desactivat ja que la configuració es troba a configuration.yaml.",
                                 "elevation": "Altitud",
                                 "elevation_meters": "metres",
                                 "external_url": "URL extern",
+                                "find_currency_value": "Troba el teu valor",
                                 "imperial_example": "Fahrenheit, lliures",
                                 "internal_url": "URL intern",
                                 "latitude": "Latitud",
@@ -2098,6 +2077,63 @@
                     "update": "Actualitza",
                     "update_device_error": "No s'ha pogut actualitzar el dispositiu"
                 },
+                "energy": {
+                    "caption": "Energia",
+                    "description": "Monitoritza la teva producció i consum d'energia",
+                    "device_consumption": {
+                        "add_stat": "Tria una entitat per fer-li el seguiment d'energia",
+                        "dialog": {
+                            "selected_stat_intro": "Seleccional l'entitat que representa el consum d'energia del dispositiu."
+                        },
+                        "learn_more": "Més informació sobre com començar.",
+                        "selected_stat": "Seguint energia de",
+                        "sub": "El seguiment de consum d'energia de dispositius individuals permet a Home Assistant desglossar l'ús d'energia per dispositius.",
+                        "title": "Dispositius individuals"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Utilitza una entitat amb el preu actual",
+                                "cost_entity_input": "Entitat amb el preu actual",
+                                "cost_number": "Utilitza un preu estàtic",
+                                "cost_number_input": "Preu per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Tria com vols que Home Assistant faci el seguiment dels costos de l'energia consumida.",
+                                "cost_stat": "Utilitza una entitat que segueix els costos totals",
+                                "cost_stat_input": "Entitat de costos totals",
+                                "energy_stat": "Energia consumida (kWh)",
+                                "header": "Configura el consum de xarxa",
+                                "no_cost": "No facis seguiment de costos",
+                                "paragraph": "El consum de xarxa és l'energia que va des de la xarxa pública a casa teva."
+                            },
+                            "to": {
+                                "cost_entity": "Utilitza una entitat amb el preu actual",
+                                "cost_entity_input": "Entitat amb el preu actual",
+                                "cost_number": "Utilitza un preu estàtic",
+                                "cost_number_input": "Preu per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Et retornen diners quan exportes energia a la xarxa?",
+                                "cost_stat": "Utilitza una entitat que segueix el total de diners rebuts",
+                                "cost_stat_input": "Entitat de compensació total",
+                                "energy_stat": "Energia exportada a la xarxa (kWh)",
+                                "header": "Configura la producció a xarxa",
+                                "no_cost": "No em retornen diners",
+                                "paragraph": "La producció a xarxa és l'energia que va des dels teus panells fotovoltaics a la xarxa pública."
+                            }
+                        },
+                        "learn_more": "Més informació sobre com començar.",
+                        "sub": "Configura la quantitat d'energia que consumeixes i retornes a la xarxa (en cas que també en produeixis). Això fa que Home Assistant faci un seguiment complet de l'energia utilitzada a casa.",
+                        "title": "Xarxa elèctrica"
+                    },
+                    "solar": {
+                        "learn_more": "Més informació sobre com començar.",
+                        "stat_predicted_production": "Previsió de la teva producció d'energia solar",
+                        "stat_production": "Producció d'energia solar",
+                        "stat_return_to_grid": "Energia solar exportada a la xarxa",
+                        "sub": "Fes que Home Assistant analitzi els panells solars i et doni informació sobre el seu rendiment.",
+                        "title": "Panells fotovoltaics"
+                    }
+                },
                 "entities": {
                     "caption": "Entitats",
                     "description": "Gestiona les entitats conegudes",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Esborra",
-                    "filtering_by": "Filtratge per",
-                    "show": "Mostra"
-                },
-                "hassio": {
-                    "button": "Configura"
-                },
                 "header": "Configuració de Home Assistant",
                 "helpers": {
                     "caption": "Ajudants",
@@ -2205,16 +2233,11 @@
                     "server": "servidor",
                     "setup_time": "Temps de configuració",
                     "source": "Font:",
-                    "system_health_error": "El component Estat del Sistema no està configurat. Afegeix 'system_health:' a configuration.yaml",
                     "system_health": {
                         "manage": "Gestiona",
                         "more_info": "més informació"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "pàgina d'integracions",
-                    "missing_zha": "Trobes a faltar el panell de configuració de ZHA? S'ha traslladat a l'entrada ZHA de la {integrations_page}.",
-                    "missing_zwave": "Trobes a faltar el panell de configuració de Z-Wave? S'ha traslladat a l'entrada Z-Wave de la {integrations_page}."
+                    },
+                    "system_health_error": "El component Estat del Sistema no està configurat. Afegeix 'system_health:' a configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Afegeix integració",
@@ -2229,8 +2252,6 @@
                         "depends_on_cloud": "Depèn del núvol",
                         "device_unavailable": "Dispositiu no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositiu}\n  other {dispositius}\n}",
-                        "disable_error": "S'ha produït un error en activar o desactivar la integració",
-                        "disable_restart_confirm": "Reinicia Home Assistant per acabar de desactivar aquesta integració",
                         "disable": {
                             "disable_confirm": "Estàs segur que vols desactivar aquesta entrada de configuració? Els seus dispositius i entitats es desactivaran.",
                             "disabled": "Desactivada",
@@ -2241,6 +2262,8 @@
                             },
                             "disabled_cause": "Desactivada per {cause}"
                         },
+                        "disable_error": "S'ha produït un error en activar o desactivar la integració",
+                        "disable_restart_confirm": "Reinicia Home Assistant per acabar de desactivar aquesta integració",
                         "disabled_polling": "Sondeig automàtic per l'obtenció de dades actualitzades desactivat",
                         "documentation": "Documentació",
                         "enable_restart_confirm": "Reinicia Home Assistant per acabar d'activar aquesta integració",
@@ -2248,11 +2271,9 @@
                         "entity_unavailable": "Entitat no disponible",
                         "firmware": "Firmware: {version}",
                         "hub": "Connectat a través de",
-                        "logs": "registres",
                         "manuf": "de {manufacturer}",
                         "no_area": "Sense àrea",
                         "not_loaded": "No carregada",
-                        "options": "Opcions",
                         "provided_by_custom_integration": "Proporcionada per una integració personalitzada",
                         "reload": "Torna a carregar",
                         "reload_confirm": "La integració s'ha tornat a carregar",
@@ -2284,7 +2305,11 @@
                             "open_site": "Vés al lloc web"
                         },
                         "finish": "Finalitza",
-                        "loading_first_time": "Espera mentre s'instal·la la integració",
+                        "loading": {
+                            "fallback_title": "la integració",
+                            "loading_flow": "Espera mentre es configura {integration}",
+                            "loading_step": "Carregant el següent pas de {integration}"
+                        },
                         "next": "Següent",
                         "not_all_required_fields": "No s'han omplert tots els camps obligatoris.",
                         "not_loaded": "No s'ha pogut carregar la integració, prova de reiniciar Home Assistant.",
@@ -2301,7 +2326,6 @@
                     "details": "Detalls de la integració",
                     "disable": {
                         "disabled_integrations": "{number} desactivada/es",
-                        "hide_disabled": "Amaga integracions desactivades",
                         "show": "Mostra",
                         "show_disabled": "Mostra integracions desactivades"
                     },
@@ -2312,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Vols deixar d'ignorar {name}?",
                         "confirm_ignore": "Estàs segur que no vols configurar aquesta integració? Pots desfer-ho fent clic a 'Mostra les integracions ignorades' al menú de la part superior dreta.",
                         "confirm_ignore_title": "Ignorar descobriment de {name}?",
-                        "hide_ignored": "Amaga les integracions ignorades",
                         "ignore": "Ignora",
                         "ignored": "Ignorada",
                         "show_ignored": "Mostra les integracions ignorades",
@@ -2432,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configura",
                     "description_listen": "Escolta d'un tòpic",
                     "description_publish": "Publicació d'un paquet",
                     "listening_to": "Escoltant a",
@@ -2446,7 +2468,6 @@
                     "topic": "tòpic"
                 },
                 "ozw": {
-                    "button": "Configura",
                     "common": {
                         "controller": "Controlador",
                         "instance": "Instància",
@@ -2471,6 +2492,11 @@
                         "nodes": "Nodes",
                         "select_instance": "Selecciona instància"
                     },
+                    "network": {
+                        "header": "Gestió de la xarxa",
+                        "introduction": "Gestiona les funcions de tota la xarxa.",
+                        "node_count": "{count} nodes"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "S'han cosultat tots els nodes",
@@ -2491,10 +2517,9 @@
                         "starting": "Iniciant",
                         "unknown": "Desconegut"
                     },
-                    "network": {
-                        "header": "Gestió de la xarxa",
-                        "introduction": "Gestiona les funcions de tota la xarxa.",
-                        "node_count": "{count} nodes"
+                    "node": {
+                        "button": "Detalls del node",
+                        "not_found": "No s'ha trobat el node"
                     },
                     "node_config": {
                         "header": "Configuració de node",
@@ -2524,10 +2549,6 @@
                         "versions": "Obtenint informació de programari i versions de classes de comandes",
                         "wakeup": "Configurant el suport per a cues de despertar i missatges"
                     },
-                    "node": {
-                        "button": "Detalls del node",
-                        "not_found": "No s'ha trobat el node"
-                    },
                     "nodes_table": {
                         "failed": "Ha fallat",
                         "id": "ID",
@@ -2711,7 +2732,7 @@
                             "input_number": "Entrades numèriques",
                             "input_select": "Entrades de selecció",
                             "input_text": "Entrades de text",
-                            "introduction": "Algunes parts de Home Assistant es poden actualitzar sense necessitat reiniciar-lo. Si prems actualitza s'esborrarà la configuració YAML actual i se'n carregarà la nova.",
+                            "introduction": "Algunes parts de Home Assistant es poden actualitzar sense necessitar reiniciar-lo. Si prems alguna de les opcions de sota s'esborrarà la seva configuració YAML actual i se'n carregarà la nova.",
                             "min_max": "Entitats min/max",
                             "mqtt": "Entitats MQTT configurades manualment",
                             "person": "Persones",
@@ -2832,7 +2853,6 @@
                         "search_again": "Torna a cercar",
                         "spinner": "S'estan cercant dispositius ZHA Zigbee..."
                     },
-                    "button": "Configura",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributs del clúster seleccionat",
                         "get_zigbee_attribute": "Obtenir l'atribut Zigbee",
@@ -2862,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Dreceres",
-                        "update_button": "Actualitza la configuració",
-                        "zha_options": {
-                            "default_light_transition": "Temps de transició predeterminat (segons)",
-                            "enable_identify_on_join": "Activa l'efecte d'identificació quan els dispositius s'uneixin a la xarxa",
-                            "title": "Opcions globals"
-                        }
+                        "update_button": "Actualitza la configuració"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuració completada",
@@ -2949,123 +2964,7 @@
                     "introduction": "Les zones et permeten definir certes regions del planeta. Quan una persona es trobi dins d'una zona, l'estat prendrà el nom d'aquesta zona. També es poden utilitzar com a disparadors o condicions durant la creació d'automatitzacions.",
                     "no_zones_created_yet": "Sembla que encara no has creat cap zona."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Cancel·la la inclusió",
-                        "controller_in_inclusion_mode": "El controlador Z-Wave ara està en mode d'inclusió.",
-                        "follow_device_instructions": "Segueix les instruccions del teu dispositiu per activar la vinculació al dispositiu.",
-                        "inclusion_failed": "No s'ha pogut afegir el node. Consulta els registres per a més informació.",
-                        "inclusion_finished": "S'ha afegit el node.",
-                        "interview_failed": "Ha fallat la consulta del dispositiu. Pots trobar informació addicional als registres.",
-                        "interview_started": "S'està consultant el dispositiu. Això pot trigar una estona.",
-                        "introduction": "Aquest assistent et guiarà perquè afegeixis un node a la teva xarxa Z-Wave.",
-                        "secure_inclusion_warning": "Els dispositius segurs necessiten una amplada de banda més gran; si tens molts dispositius segurs pot ser que la xarxa Z-Wave vagi més lenta. Et recomanem que utilitzis la inclusió segura només en dispositius que realment ho necessitin com ara panys i controls de portes.",
-                        "start_inclusion": "Inicia la inclusió",
-                        "start_secure_inclusion": "Inicia la inclusió segura",
-                        "title": "Afegeix un node Z-Wave",
-                        "use_secure_inclusion": "Utilitza la inclusió segura",
-                        "view_device": "Mostra el dispositiu"
-                    },
-                    "button": "Configura",
-                    "common": {
-                        "add_node": "Afegeix node",
-                        "close": "Tanca",
-                        "heal_network": "Guareix la xarxa",
-                        "home_id": "ID principal",
-                        "network": "Xarxa",
-                        "node_id": "ID del node",
-                        "reconfigure_server": "Torna a configurar el servidor",
-                        "remove_node": "Elimina node"
-                    },
-                    "dashboard": {
-                        "driver_version": "Versió del controlador",
-                        "dump_dead_nodes_text": "Alguns dels nodes no han respost i s'han donat com a morts. Aquests no s'exportaran completament.",
-                        "dump_dead_nodes_title": "Alguns dels teus nodes estan morts",
-                        "dump_debug": "Baixa un fitxer de buidatge de la xarxa per ajudar-te a diagnosticar problemes",
-                        "dump_not_ready_confirm": "Baixa",
-                        "dump_not_ready_text": "Si fas una exportació mentre tots els nodes no estan preparats, pots perdre dades útils. Deixa més temps perque la xarxa consulti tots els nodes. Vols seguir amb el procés?",
-                        "dump_not_ready_title": "Encara no tots els nodes estan preparats",
-                        "header": "Gestiona la teva xarxa Z-Wave",
-                        "home_id": "ID principal",
-                        "introduction": "Gestiona la teva xarxa i nodes Z-Wave",
-                        "nodes_ready": "Nodes preparats",
-                        "server_version": "Versió del servidor"
-                    },
-                    "device_info": {
-                        "device_config": "Configura dispositiu",
-                        "node_ready": "Node preparat",
-                        "node_status": "Estat del node",
-                        "zwave_info": "Informació Z-Wave"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "La guarició de la xarxa s'ha cancel·lat.",
-                        "healing_complete": "La guarició de la xarxa s'ha completat.",
-                        "healing_failed": "La guarició ha fallat. Pots trobar informació addicional als registres.",
-                        "in_progress": "La guarició de la xarxa està en curs. Trigarà una estona.",
-                        "introduction": "Inicia una guarició de la teva xarxa Z-Wave. La guarició de xarxa farà que tots els dispositius tornin a calcular les seves rutes cap al controlador. Es recomana si recentment has canviat o mogut dispositius o el controlador.",
-                        "run_in_background": "Pots tancar aquest diàleg, la guarició de la xarxa continuarà en segon pla.",
-                        "start_heal": "Comença la guarició",
-                        "stop_heal": "Atura la guarició",
-                        "title": "Guareix la xarxa Z-Wave",
-                        "traffic_warning": "El procés de guarició genera una gran quantitat de trànsit a la xarxa Z-Wave. Això pot fer que els dispositius responguin lentament (o gens) mentre la guarició està en procés."
-                    },
-                    "logs": {
-                        "log_level": "Nivell dels registres",
-                        "log_level_changed": "Nivell de registre canviat a: {level}",
-                        "subscribed_to_logs": "Subscrit a missatges de registre Z-Wave JS...",
-                        "title": "Registres de Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "Registres",
-                        "network": "Xarxa"
-                    },
-                    "network_status": {
-                        "connected": "Connectat",
-                        "connecting": "Connectant",
-                        "unknown": "Desconegut"
-                    },
-                    "node_config": {
-                        "attribution": "Els paràmetres de configuració i descripcions del dispositiu els proporcionen {device_database}",
-                        "battery_device_notice": "Els dispositius amb bateria han d'estar desperts per actualitzar-ne la configuració. Consulta el manual del dispositiu per saber com despertar-lo.",
-                        "error_device_not_found": "Dispositiu no trobat",
-                        "header": "Configuració de dispositiu Z-Wave",
-                        "introduction": "Gestiona i ajusta els paràmetres de configuració específics del dispositiu (node) seleccionat",
-                        "parameter_is_read_only": "Aquest paràmetre de només lectura.",
-                        "set_param_accepted": "El paràmetre s'ha actualitzat.",
-                        "set_param_error": "S'ha produït un error.",
-                        "set_param_queued": "El canvi de paràmetre s'ha posat en espera i s'actualitzarà quan es desperti el dispositiu.",
-                        "zwave_js_device_database": "Base de dades de dispositiu Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Viu",
-                        "asleep": "Adormit",
-                        "awake": "Despert",
-                        "dead": "Mort",
-                        "unknown": "Desconegut"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Hauràs de despertar els dispositius amb bateria abans d'iniciar el procés de consulta. Fes un cop d'ull al manual del dispositiu per saber com despertar-lo.",
-                        "in_progress": "S'està consultant el dispositiu. Això pot trigar una estona.",
-                        "interview_complete": "Consulta del dispositiu completada.",
-                        "interview_failed": "Ha fallat la consulta del dispositiu. Pots trobar informació addicional als registres.",
-                        "introduction": "Torna a consultar un dispositiu de la xarxa Zigbee. Fes-ho si el dispositiu no funciona correctament.",
-                        "run_in_background": "Pots tancar aquest diàleg, la consulta continuarà en segon pla.",
-                        "start_reinterview": "Torna a iniciar consulta",
-                        "title": "Torna a consultar un dispositiu Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Cancel·la l'exclusió",
-                        "controller_in_exclusion_mode": "El controlador Z-Wave ara està en mode d'exclusió.",
-                        "exclusion_failed": "No s'ha pogut eliminar el node. Consulta els registres per a més informació.",
-                        "exclusion_finished": "El node {id} s'ha eliminat de la teva xarxa Z-Wave.",
-                        "follow_device_instructions": "Segueix les instruccions del teu dispositiu per activar l'exclusió al dispositiu.",
-                        "introduction": "Elimina un node de la xarxa Z-Wave i suprimeix el dispositiu i entitats associades de Home Assistant.",
-                        "start_exclusion": "Inicia l'exclusió",
-                        "title": "Elimina un node Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Configura",
                     "common": {
                         "index": "Índex",
                         "instance": "Instància",
@@ -3136,7 +3035,7 @@
                         "add_node_secure": "Afegeix node amb seguretat",
                         "cancel_command": "Cancel·lar ordre",
                         "heal_network": "Guareix la xarxa",
-                        "heal_node": "Guareix node",
+                        "heal_node": "Cura node",
                         "node_info": "Informació de node",
                         "print_node": "Imprimeix node",
                         "refresh_entity": "Actualitza l'entitat",
@@ -3154,6 +3053,144 @@
                     "values": {
                         "header": "Valors dels node"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Cancel·la la inclusió",
+                        "controller_in_inclusion_mode": "El controlador Z-Wave ara està en mode d'inclusió.",
+                        "follow_device_instructions": "Segueix les instruccions del teu dispositiu per activar la vinculació al dispositiu.",
+                        "inclusion_failed": "No s'ha pogut afegir el node. Consulta els registres per a més informació.",
+                        "inclusion_finished": "S'ha afegit el node.",
+                        "interview_failed": "Ha fallat la consulta del dispositiu. Pots trobar informació addicional als registres.",
+                        "interview_started": "S'està consultant el dispositiu. Això pot trigar una estona.",
+                        "introduction": "Aquest assistent et guiarà perquè afegeixis un node a la teva xarxa Z-Wave.",
+                        "secure_inclusion_warning": "Els dispositius segurs necessiten una amplada de banda més gran; si tens molts dispositius segurs pot ser que la xarxa Z-Wave vagi més lenta. Et recomanem que utilitzis la inclusió segura només en dispositius que realment ho necessitin com ara panys i controls de portes.",
+                        "start_inclusion": "Inicia la inclusió",
+                        "start_secure_inclusion": "Inicia la inclusió segura",
+                        "title": "Afegeix un node Z-Wave",
+                        "use_secure_inclusion": "Utilitza la inclusió segura",
+                        "view_device": "Mostra el dispositiu"
+                    },
+                    "common": {
+                        "add_node": "Afegeix node",
+                        "close": "Tanca",
+                        "heal_network": "Guareix la xarxa",
+                        "home_id": "ID principal",
+                        "network": "Xarxa",
+                        "node_id": "ID del node",
+                        "reconfigure_server": "Torna a configurar el servidor",
+                        "remove_node": "Elimina node",
+                        "source": "Font"
+                    },
+                    "dashboard": {
+                        "driver_version": "Versió del controlador",
+                        "dump_dead_nodes_text": "Alguns dels nodes no han respost i s'han donat com a morts. Aquests no s'exportaran completament.",
+                        "dump_dead_nodes_title": "Alguns dels teus nodes estan morts",
+                        "dump_debug": "Baixa un fitxer de buidatge de la xarxa per ajudar-te a diagnosticar problemes",
+                        "dump_not_ready_confirm": "Baixa",
+                        "dump_not_ready_text": "Si fas una exportació mentre tots els nodes no estan preparats, pots perdre dades útils. Deixa més temps perque la xarxa consulti tots els nodes. Vols seguir amb el procés?",
+                        "dump_not_ready_title": "Encara no tots els nodes estan preparats",
+                        "header": "Gestiona la teva xarxa Z-Wave",
+                        "home_id": "ID principal",
+                        "introduction": "Gestiona la teva xarxa i nodes Z-Wave",
+                        "nodes_ready": "Nodes preparats",
+                        "server_version": "Versió del servidor"
+                    },
+                    "device_info": {
+                        "device_config": "Configura dispositiu",
+                        "heal_node": "Cura node",
+                        "node_ready": "Node preparat",
+                        "node_status": "Estat del node",
+                        "reinterview_device": "Torna a consultar dispositiu",
+                        "remove_failed": "Suprimeix dispositiu fallit",
+                        "zwave_info": "Informació Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "La guarició de la xarxa s'ha cancel·lat.",
+                        "healing_complete": "La guarició de la xarxa s'ha completat.",
+                        "healing_failed": "La guarició ha fallat. Pots trobar informació addicional als registres.",
+                        "in_progress": "La guarició de la xarxa està en curs. Trigarà una estona.",
+                        "introduction": "Inicia una guarició de la teva xarxa Z-Wave. La guarició de xarxa farà que tots els dispositius tornin a calcular les seves rutes cap al controlador. Es recomana si recentment has canviat o mogut dispositius o el controlador.",
+                        "run_in_background": "Pots tancar aquest diàleg, la guarició de la xarxa continuarà en segon pla.",
+                        "start_heal": "Comença la guarició",
+                        "stop_heal": "Atura la guarició",
+                        "title": "Guareix la xarxa Z-Wave",
+                        "traffic_warning": "El procés de guarició genera una gran quantitat de trànsit a la xarxa Z-Wave. Això pot fer que els dispositius responguin lentament (o gens) mentre la guarició està en procés."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} s'ha curat.",
+                        "healing_failed": "{device} no s'ha pogut curar.",
+                        "healing_failed_check_logs": "Pots trobar informació addicional als registres.",
+                        "in_progress": "La curació de {device} està en curs.",
+                        "introduction": "Fes que {device} actualitzi les seves rutes cap al controlador. Això pot ajudar amb problemes de comunicació si recentment has canviat o mogut el dispositiu o el controlador.",
+                        "network_heal_in_progress": "Una curació de xarxa Z-Wave ja està en curs. Espera que acabi abans de curar un dispositiu específic.",
+                        "start_heal": "Cura dispositiu",
+                        "title": "Cura dispositiu Z-Wave",
+                        "traffic_warning": "El procés de curació genera una gran quantitat de trànsit a la xarxa Z-Wave. Això pot fer que els dispositius responguin lentament (o gens) mentre dura el procés."
+                    },
+                    "logs": {
+                        "log_level": "Nivell dels registres",
+                        "log_level_changed": "Nivell de registre canviat a: {level}",
+                        "subscribed_to_logs": "Subscrit a missatges de registre Z-Wave JS...",
+                        "title": "Registres de Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Registres",
+                        "network": "Xarxa"
+                    },
+                    "network_status": {
+                        "connected": "Connectat",
+                        "connecting": "Connectant",
+                        "unknown": "Desconegut"
+                    },
+                    "node_config": {
+                        "attribution": "Els paràmetres de configuració i descripcions del dispositiu els proporcionen {device_database}",
+                        "battery_device_notice": "Els dispositius amb bateria han d'estar desperts per actualitzar-ne la configuració. Consulta el manual del dispositiu per saber com despertar-lo.",
+                        "error_device_not_found": "Dispositiu no trobat",
+                        "header": "Configuració de dispositiu Z-Wave",
+                        "introduction": "Gestiona i ajusta els paràmetres de configuració específics del dispositiu (node) seleccionat",
+                        "parameter": "Paràmetre",
+                        "parameter_is_read_only": "Aquest paràmetre de només lectura.",
+                        "set_param_accepted": "El paràmetre s'ha actualitzat.",
+                        "set_param_error": "S'ha produït un error.",
+                        "set_param_queued": "El canvi de paràmetre s'ha posat en espera i s'actualitzarà quan es desperti el dispositiu.",
+                        "zwave_js_device_database": "Base de dades de dispositiu Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Viu",
+                        "asleep": "Adormit",
+                        "awake": "Despert",
+                        "dead": "Mort",
+                        "unknown": "Desconegut"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Hauràs de despertar els dispositius amb bateria abans d'iniciar el procés de consulta. Fes un cop d'ull al manual del dispositiu per saber com despertar-lo.",
+                        "in_progress": "S'està consultant el dispositiu. Això pot trigar una estona.",
+                        "interview_complete": "Consulta del dispositiu completada.",
+                        "interview_failed": "Ha fallat la consulta del dispositiu. Pots trobar informació addicional als registres.",
+                        "introduction": "Torna a consultar un dispositiu de la xarxa Zigbee. Fes-ho si el dispositiu no funciona correctament.",
+                        "run_in_background": "Pots tancar aquest diàleg, la consulta continuarà en segon pla.",
+                        "start_reinterview": "Torna a iniciar consulta",
+                        "title": "Torna a consultar un dispositiu Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "La supressió del dispositiu està en curs.",
+                        "introduction": "Suprimeix un dispositiu fallit de la xarxa Z-Wave. Fes-ho si no pots excloure un dispositiu de forma normal (perquè està malmès).",
+                        "removal_failed": "El dispositiu no s'ha pogut suprimir de la xarxa Z-Wave.",
+                        "removal_finished": "El node {id} s'ha suprimit de la xarxa Z-Wave.",
+                        "remove_device": "Suprimeix dispositiu",
+                        "title": "Suprimeix un dispositiu Z-Wave fallit"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Cancel·la l'exclusió",
+                        "controller_in_exclusion_mode": "El controlador Z-Wave ara està en mode d'exclusió.",
+                        "exclusion_failed": "No s'ha pogut eliminar el node. Consulta els registres per a més informació.",
+                        "exclusion_finished": "El node {id} s'ha eliminat de la teva xarxa Z-Wave.",
+                        "follow_device_instructions": "Segueix les instruccions del teu dispositiu per activar l'exclusió al dispositiu.",
+                        "introduction": "Elimina un node de la xarxa Z-Wave i suprimeix el dispositiu i entitats associades de Home Assistant.",
+                        "start_exclusion": "Inicia l'exclusió",
+                        "title": "Elimina un node Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3236,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Torna",
-                "supervisor": {
-                    "ask": "Sol·licita ajuda",
-                    "observer": "Comprova l'observador",
-                    "reboot": "Intenta reiniciar l'amfitrió",
-                    "system_health": "Comprova l'estat del sistema",
-                    "title": "No s'ha pogut carregar el panell del Supervisor!",
-                    "wait": "Si acabes de començar, assegura't que has deixat passar prou temps perquè el Supervisor s'iniciï."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "La setmana passada",
-                    "this_week": "Aquesta setmana",
-                    "today": "Avui",
-                    "yesterday": "Ahir"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "La setmana passada",
-                    "this_week": "Aquesta setmana",
-                    "today": "Avui",
-                    "yesterday": "Ahir"
+            "energy": {
+                "charts": {
+                    "by_device": "Consum per dispositiu",
+                    "solar": "Solar",
+                    "stat_house_energy_meter": "Consum total d'energia"
+                },
+                "setup": {
+                    "back": "Torna",
+                    "done": "Mostra'm el tauler d'energia!",
+                    "next": "Següent"
                 }
             },
             "lovelace": {
@@ -3374,7 +3396,6 @@
                         "entities": {
                             "description": "La targeta entitats és la més habitual. Agrupa diferents tipus d'entitats en una llista.",
                             "edit_special_row": "Fes clic al botó edita per veure els detalls de la fila",
-                            "entity_row_editor": "Editor de files d'entitats",
                             "entity_row": {
                                 "attribute": "Atribut",
                                 "button": "Botó",
@@ -3386,6 +3407,7 @@
                                 "section": "Secció",
                                 "weblink": "Enllaç web"
                             },
+                            "entity_row_editor": "Editor de files d'entitats",
                             "name": "Entitats",
                             "secondary_info_values": {
                                 "brightness": "Brillantor",
@@ -3412,6 +3434,7 @@
                         "gauge": {
                             "description": "La galga és una targeta bàsica que et permet mostrar les dades d'un sensor de manera visual.",
                             "name": "Galga",
+                            "needle_gauge": "Mostrar indicador d'agulla?",
                             "severity": {
                                 "define": "Definir gravetat?",
                                 "green": "Verd",
@@ -3424,6 +3447,7 @@
                             "attribute": "Atribut",
                             "camera_image": "Entitat de càmera",
                             "camera_view": "Visualització de càmera",
+                            "days_to_show": "Dies a mostrar",
                             "double_tap_action": "Acció en tocar dues vegades",
                             "entities": "Entitats",
                             "entity": "Entitat",
@@ -3537,6 +3561,10 @@
                             "integration_not_loaded": "Aquesta targeta necessita que la integració `shopping_list` estigui configurada.",
                             "name": "Llista de compres"
                         },
+                        "statistics-graph": {
+                            "description": "Amb la targeta gràfic d'estadístiques pot visualitzar un gràfic amb estadístiques de cadascuna de les entitats establertes.",
+                            "name": "Gràfic d'estadístiques"
+                        },
                         "thermostat": {
                             "description": "La targeta termòstat et permet controlar una entitat de tipus climatització. Pots canviar-ne tant la temperatura com el mode.",
                             "name": "Termòstat"
@@ -3606,6 +3634,12 @@
                         "tab_badges": "Insígnies",
                         "tab_settings": "Configuració",
                         "tab_visibility": "Visibilitat",
+                        "type": "Tipus de visualització",
+                        "types": {
+                            "masonry": "Maçonari (predeterminat)",
+                            "panel": "Panell (1 targeta)",
+                            "sidebar": "Barra lateral"
+                        },
                         "visibility": {
                             "select_users": "Selecciona quins usuaris podran veure aquesta visualització a la navegació"
                         }
@@ -3660,7 +3694,6 @@
                         "unsaved_changes": "Canvis sense desar"
                     },
                     "save_config": {
-                        "cancel": "M'ho he repensat",
                         "close": "Tanca",
                         "empty_config": "Comença amb un panell buit",
                         "header": "Pren el control de la interfície d'usuari Lovelace",
@@ -3689,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Això renderitza la primera targeta a amplada completa. Les altres targetes i insígnies d'aquesta visualització no es renderitzaran.",
-                            "title": "Mode panell?",
                             "warning_multiple_cards": "Aquesta visualització conté més d'una targeta, però les visualitzacions en mode panell només poden mostrar una targeta."
                         }
                     }
@@ -3893,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Següent",
-                    "intro": "Comparteix dades analítiques de la teva instància. Aquestes dades estaran disponibles públicament a {link}"
+                    "finish": "Següent"
                 },
                 "core-config": {
                     "button_detect": "Detecta",
@@ -3918,10 +3948,8 @@
                     "confirm_password": "Confirma la contrasenya de la instantània",
                     "description": "També pots restaurar des d'una instantània anterior.",
                     "folders": "Carpetes",
-                    "full_snapshot": "Instantània completa",
                     "hide_log": "Amaga el registre complet",
                     "in_progress": "Restauració en curs",
-                    "partial_snapshot": "Instantània parcial",
                     "password": "Contrasenya de la instantània",
                     "password_protection": "Protecció amb contrasenya",
                     "select_type": "Selecciona què vols restaurar",
@@ -4003,6 +4031,12 @@
                     "prompt_copy_token": "Copia't el token d'autenticació d'accés. No es tornarà a mostrar més endavant.",
                     "prompt_name": "Posa un nom al token"
                 },
+                "mfa": {
+                    "confirm_disable": "Estàs segur que vols desactivar {name}?",
+                    "disable": "Desactiva",
+                    "enable": "Activa",
+                    "header": "Mòduls d'autenticació amb múltiples passos"
+                },
                 "mfa_setup": {
                     "close": "Tanca",
                     "step_done": "Configuració feta per a {step}",
@@ -4010,12 +4044,6 @@
                     "title_aborted": "S'ha avortat",
                     "title_success": "Èxit!"
                 },
-                "mfa": {
-                    "confirm_disable": "Estàs segur que vols desactivar {name}?",
-                    "disable": "Desactiva",
-                    "enable": "Activa",
-                    "header": "Mòduls d'autenticació amb múltiples passos"
-                },
                 "number_format": {
                     "description": "Tria el format dels números.",
                     "dropdown_label": "Format dels números",
diff --git a/translations/frontend/cs.json b/translations/frontend/cs.json
index 235d8f11b9..f374ff8f6a 100644
--- a/translations/frontend/cs.json
+++ b/translations/frontend/cs.json
@@ -17,6 +17,7 @@
         "calendar": "Kalendář",
         "config": "Nastavení",
         "developer_tools": "Vývojářské nástroje",
+        "energy": "Energie",
         "history": "Historie",
         "logbook": "Záznamy",
         "mailbox": "Schránka",
@@ -26,6 +27,14 @@
         "shopping_list": "Nákupní seznam",
         "states": "Přehled"
     },
+    "state": {
+        "default": {
+            "off": "Vypnuto",
+            "on": "Zapnuto",
+            "unavailable": "Není k dispozici",
+            "unknown": "Nezjištěno"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Pryč"
         }
     },
-    "state": {
-        "default": {
-            "off": "Vypnuto",
-            "on": "Zapnuto",
-            "unavailable": "Není k dispozici",
-            "unknown": "Nezjištěno"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Doplněk není nainstalován"
             }
         },
+        "backup": {
+            "addons": "Doplňky",
+            "confirm_password": "Potvrďte heslo zálohy",
+            "could_not_create": "Nelze vytvořit zálohu",
+            "create": "Vytvořit",
+            "create_blocked_not_running": "Vytvoření zálohy není momentálně možné, protože systém je ve \"{state}\".",
+            "created": "Vytvořeno",
+            "delete_backup_confirm": "smazat",
+            "delete_selected": "Smazat vybrané zálohy",
+            "enter_password": "Prosím zadejte heslo.",
+            "failed_to_delete": "Smazání se nezdařilo",
+            "folders": "Složky",
+            "name": "Název zálohy",
+            "password": "Heslo zálohy",
+            "password_protection": "Ochrana heslem",
+            "passwords_not_matching": "Hesla se neshodují",
+            "select_type": "Vyberte, co chcete obnovit",
+            "selected": "{number} vybraných",
+            "type": "Typ zálohy"
+        },
         "common": {
             "cancel": "Zrušit",
             "close": "Zavřít",
@@ -366,9 +387,6 @@
                 "text": "Chcete doplněk restartovat se svými změnami?"
             },
             "update": {
-                "create_snapshot": "Vytvořit zálohu {name} před aktualizací",
-                "snapshot": "Záloha",
-                "snapshotting": "Vytváří se záloha {name}",
                 "updating": "Aktualizuje se {name} na verzi {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Ovládací panel",
-            "snapshots": "Zálohy",
             "store": "Obchod s doplňky",
             "system": "Systém"
         },
-        "snapshot": {
-            "addons": "Doplňky",
-            "available_snapshots": "Dostupné zálohy",
-            "confirm_password": "Potvrďte heslo zálohy",
-            "could_not_create": "Nelze vytvořit zálohu",
-            "create": "Vytvořit",
-            "create_blocked_not_running": "Vytvoření zálohy není momentálně možné, protože systém je ve \"{state}\".",
-            "create_snapshot": "Vytvořit zálohu",
-            "created": "Vytvořeno",
-            "delete_selected": "Smazat vybrané zálohy",
-            "delete_snapshot_confirm": "smazat",
-            "delete_snapshot_text": "Chcete smazat {number} {number, plural,\n  one {zálohu}\n  few {zálohy}\n  other {záloh}\n}?",
-            "delete_snapshot_title": "Smazat zálohu",
-            "description": "Zálohy umožňují snadno zálohovat a obnovovat všechna data vaší instance Home Assistant.",
-            "enter_password": "Prosím zadejte heslo.",
-            "failed_to_delete": "Smazání se nezdařilo",
-            "folder": {
-                "addons/local": "Místní doplňky",
-                "homeassistant": "Nastavení Home Asistent",
-                "media": "Média",
-                "share": "Sdílení",
-                "ssl": "SSL"
-            },
-            "folders": "Složky",
-            "full_snapshot": "Úplná záloha",
-            "name": "Název zálohy",
-            "no_snapshots": "Zatím nemáte žádné zálohy.",
-            "partial_snapshot": "Částečná záloha",
-            "password": "Heslo zálohy",
-            "password_protected": "chráněno heslem",
-            "password_protection": "Ochrana heslem",
-            "passwords_not_matching": "Hesla se neshodují",
-            "security": "Zabezpečení",
-            "select_type": "Vyberte, co chcete obnovit",
-            "selected": "{number} vybraných",
-            "type": "Typ zálohy",
-            "upload_snapshot": "Nahrát zálohu"
-        },
         "store": {
             "missing_addons": "Chybí doplňky? Na stránce svého uživatelského profilu povolte pokročilý režim",
             "no_results_found": "V {repository} nebyly nalezeny žádné výsledky.",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Koncové datum",
+                "ranges": {
+                    "last_week": "Minulý týden",
+                    "this_week": "Tento týden",
+                    "today": "Dnes",
+                    "yesterday": "Včera"
+                },
                 "select": "Vybrat",
                 "start_date": "Počáteční datum"
             },
@@ -851,10 +836,10 @@
                 "documentation": "dokumentace",
                 "learn_adding_local_media": "Další informace o přidávání médií naleznete v {documentation}.",
                 "local_media_files": "Umístěte svá videa, zvukové či obrazové soubory do adresáře médií, abyste je mohli procházet a přehrávat v prohlížeči nebo na podporovaných přehrávačích médií.",
+                "media-player-browser": "Prohlížeč přehrávače médií",
                 "media_browsing_error": "Chyba při procházení médií",
                 "media_not_supported": "Přehrávač médií v prohlížeči nepodporuje tento typ média",
                 "media_player": "Přehrávač médií",
-                "media-player-browser": "Prohlížeč přehrávače médií",
                 "no_items": "Žádné položky",
                 "no_local_media_found": "Nebyla nalezena žádná místní média",
                 "no_media_folder": "Vypadá to, že jste dosud nevytvořili adresář médií.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Služba"
             },
+            "statistic-picker": {
+                "learn_more": "Další informace o statistikách",
+                "missing_entity": "Proč není moje entita uvedena v seznamu?",
+                "no_match": "Nebyly nalezeny žádné odpovídající statistiky",
+                "no_statistics": "Nemáte žádné statistiky",
+                "statistic": "Statistika"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Načítám statistiky...",
+                "no_statistics_found": "Nebyly nalezeny žádné statistiky.",
+                "statistic_types": {
+                    "max": "maximum",
+                    "mean": "průměr",
+                    "min": "minimum",
+                    "sum": "součet"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Vyberte oblast",
                 "add_device_id": "Vyberte zařízení",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Nastavení"
                 },
+                "loading": {
+                    "loading_flow": "Počkejte prosím, než se připraví možnosti pro {integration}.",
+                    "loading_step": "Načítání dalšího kroku pro {integraci}"
+                },
                 "success": {
                     "description": "Volby byly úspěšně uloženy."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Obecné",
                         "customize": "Přizpůsobení",
                         "devices": "Zařízení",
+                        "energy": "Energie",
                         "entities": "Entity",
                         "helpers": "Pomocníci",
                         "info": "Informace",
                         "integrations": "Integrace",
                         "logs": "Logy",
                         "lovelace": "Ovládací panely Lovelace",
-                        "navigate_to": "Přejít na {panel}",
                         "person": "Osoby",
                         "scene": "Scény",
                         "script": "Skripty",
@@ -1360,7 +1366,6 @@
                             "introduction": "Akce jsou to, co Home Assistant provede při spuštění automatizace.",
                             "learn_more": "Další informace o akcích",
                             "name": "Akce",
-                            "type_select": "Typ akce",
                             "type": {
                                 "choose": {
                                     "add_option": "Přidat volbu",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Opakovaní",
                                     "sequence": "Akce",
-                                    "type_select": "Typ opakování",
                                     "type": {
                                         "count": {
                                             "label": "Počet"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Podmínky \"Pokud platí\"",
                                             "label": "Pokud platí"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Typ opakování"
                                 },
                                 "scene": {
                                     "label": "Aktivovat scénu"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Šablona pro čekání"
                                 }
                             },
+                            "type_select": "Typ akce",
                             "unsupported_action": "Akce {action} není podporována v uživatelském rozhraní"
                         },
                         "alias": "Název",
@@ -1452,7 +1458,6 @@
                             "introduction": "Podmínky jsou volitelné a pokud nejsou všechny splněny, zabrání dalšímu provádění automatizace.",
                             "learn_more": "Další informace o podmínkách",
                             "name": "Podmínka",
-                            "type_select": "Typ podmínky",
                             "type": {
                                 "and": {
                                     "label": "A"
@@ -1524,6 +1529,7 @@
                                     "zone": "Zóna"
                                 }
                             },
+                            "type_select": "Typ podmínky",
                             "unsupported_condition": "Podmínka {condition} není podporována v uživatelském rozhraní"
                         },
                         "copy_to_clipboard": "Zkopírovat do schránky",
@@ -1561,11 +1567,10 @@
                             "delete_confirm": "Opravdu smazat?",
                             "duplicate": "Duplikovat",
                             "header": "Spouštěče",
-                            "id": "ID spouštěče (použitého podmínkou \"spouštěč\")",
+                            "id": "ID spouštěče (pro podmínku \"spouštěč\")",
                             "introduction": "Spouštěče spouštějí automatizaci. Pro jednu automatizaci je možné zadat více spouštěčů. Po spuštění ověří Home Assistant případné podmínky a zavolá akci.",
                             "learn_more": "Další informace o spouštěčích",
                             "name": "Spouštěč",
-                            "type_select": "Typ spouštěče",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1636,18 @@
                                     "label": "Šablona",
                                     "value_template": "Šablona hodnoty"
                                 },
-                                "time_pattern": {
-                                    "hours": "Hodiny",
-                                    "label": "Časový vzorec",
-                                    "minutes": "Minuty",
-                                    "seconds": "Sekundy"
-                                },
                                 "time": {
                                     "at": "V",
                                     "label": "Čas",
                                     "type_input": "Hodnota pomocníka \"Datum a/nebo čas\"",
                                     "type_value": "Pevný čas"
                                 },
+                                "time_pattern": {
+                                    "hours": "Hodiny",
+                                    "label": "Časový vzorec",
+                                    "minutes": "Minuty",
+                                    "seconds": "Sekundy"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1656,6 +1661,7 @@
                                     "zone": "Zóna"
                                 }
                             },
+                            "type_select": "Typ spouštěče",
                             "unsupported_platform": "Platforma {platform} není podporována v uživatelském rozhraní"
                         },
                         "unsaved_confirm": "Máte neuložené změny. Opravdu chcete odejít?"
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "Vaše instance bude k dispozici na",
                             "link_learn_how_it_works": "Zjistěte, jak to funguje",
                             "not_connected": "Nepřipojeno",
+                            "reconnecting": "Obnova připojení",
                             "remote_enabled": {
                                 "caption": "Automaticky se připojit",
                                 "description": "Povolením této možnosti zajistíte, aby byla vaše instance Home Assistant vždy vzdáleně přístupná."
@@ -1818,9 +1825,9 @@
                             "loading": "Načítání ...",
                             "manage": "Spravovat",
                             "no_hooks_yet": "Vypadá to, že ještě nemáte žádné webhooky. Začněte nastavením ",
+                            "no_hooks_yet2": "nebo vytvořením",
                             "no_hooks_yet_link_automation": "automatizace webhooků",
                             "no_hooks_yet_link_integration": "integrace založené na webhooku",
-                            "no_hooks_yet2": "nebo vytvořením",
                             "title": "Webhooky"
                         }
                     },
@@ -1837,7 +1844,7 @@
                         "not_exposed_entities": "Nevystavené entity",
                         "title": "Alexa"
                     },
-                    "description_features": "Ovládejte, i když nejste doma, a propojte s Alexou a Google Assistantem",
+                    "description_features": "Ovládejte domov, i když nejste doma, a propojte s Alexou a Google Assistantem",
                     "description_login": "Přihlášen jako {email}",
                     "description_not_login": "Nepřihlášen",
                     "dialog_certificate": {
@@ -1935,41 +1942,13 @@
                     "description": "Jednotkový systém, umístění, časové pásmo a další obecné parametry",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Před povolením této možnosti se ujistěte, že jste navštívili stránku dokumentace analytiky {link}, abyste pochopili, co odesíláte za data a jak budou uložena.",
-                                "header": "Analytika",
-                                "instance_id": "ID instance: {huuid}",
-                                "introduction": "Sdílejte informace o instalaci, abyste pomohli vylepšit Home Assistant a pomohli nám přesvědčit výrobce, aby přidali funkce místního ovládání a ochrany soukromí.",
-                                "learn_more": "Jak budou vaše údaje zpracovány",
-                                "needs_base": "Aby byla tato možnost k dispozici, musíte povolit základní analytiku",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID instance, verze a typ instalace.",
-                                        "title": "Základní analytika"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Sdílejte zprávy o selhání, když dojde k neočekávané chybě.",
-                                        "title": "Diagnostika"
-                                    },
-                                    "statistics": {
-                                        "description": "Celkový počet entit, uživatelů a dalších prvků.",
-                                        "title": "Statistiky používání"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Názvy, verze a funkce.",
-                                        "title": "Použité integrace a doplňky"
-                                    },
-                                    "usage": {
-                                        "description": "Informace o názvech a verzích.",
-                                        "title": "Použité integrace"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Měna",
                                 "edit_requires_storage": "Editor je zakázán, protože nastavení je uloženo v configuration.yaml.",
                                 "elevation": "Nadmořská výška",
                                 "elevation_meters": "metrů",
                                 "external_url": "Externí adresa URL",
+                                "find_currency_value": "Najděte svou hodnotu",
                                 "imperial_example": "Stupně Fahrenheita, libry",
                                 "internal_url": "Interní adresa URL",
                                 "latitude": "Zeměpisná šířka",
@@ -2098,6 +2077,63 @@
                     "update": "Aktualizovat",
                     "update_device_error": "Aktualizace zařízení se nezdařila"
                 },
+                "energy": {
+                    "caption": "Energie",
+                    "description": "Sledujte svou výrobu a spotřebu energie",
+                    "device_consumption": {
+                        "add_stat": "Vyberte entitu pro sledování energie",
+                        "dialog": {
+                            "selected_stat_intro": "Vyberte entitu, která představuje spotřebu energie zařízení."
+                        },
+                        "learn_more": "Více informací jak začít.",
+                        "selected_stat": "Sledování energie pro",
+                        "sub": "Při sledování spotřeby energie jednotlivých zařízení může Home Assistant rozdělit spotřebu energie dle jednotlivých zařízení.",
+                        "title": "Jednotlivá zařízení"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Použít entitu s aktuální cenou",
+                                "cost_entity_input": "Entita s aktuální cenou",
+                                "cost_number": "Použít fixní cenu",
+                                "cost_number_input": "Cena za kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Zvolte, jak má Home Assistant sledovat náklady na spotřebovanou energii.",
+                                "cost_stat": "Použít entitu sledující celkové náklady",
+                                "cost_stat_input": "Entita celkových nákladů",
+                                "energy_stat": "Spotřebovaná energie (kWh)",
+                                "header": "Nastavení spotřeby sítě",
+                                "no_cost": "Nesledovat náklady",
+                                "paragraph": "Spotřeba sítě je energie, která proudí z rozvodné sítě do vaší domácnosti."
+                            },
+                            "to": {
+                                "cost_entity": "Použít entitu s aktuální sazbou",
+                                "cost_entity_input": "Entita s aktuální sazbou",
+                                "cost_number": "Použít fixní sazbu",
+                                "cost_number_input": "Sazba za kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Dostáváte peníze zpět, když vracíte energii do sítě?",
+                                "cost_stat": "Použít entitu sledující celkovou částku přijatých peněz",
+                                "cost_stat_input": "Entita celkové kompenzace",
+                                "energy_stat": "Energie vrácená do sítě (kWh)",
+                                "header": "Nastavení výroby sítě",
+                                "no_cost": "Nedostávám peníze zpět",
+                                "paragraph": "Výroba sítě je energie, která proudí ze solárních panelů do rozvodné sítě."
+                            }
+                        },
+                        "learn_more": "Více informací jak začít.",
+                        "sub": "Nastavte množství energie, kterou spotřebováváte z rozvodné sítě, a případně také množství energie, kterou do rozvodné sítě vracíte. Home Assistant tak bude moci sledovat spotřebu energie celé vaší domácnosti.",
+                        "title": "Rozvodná síť"
+                    },
+                    "solar": {
+                        "learn_more": "Více informací jak začít.",
+                        "stat_predicted_production": "Předpověď výroby solární energie",
+                        "stat_production": "Vaše výroba solární energie",
+                        "stat_return_to_grid": "Solární energie vrácená do sítě",
+                        "sub": "Nechte Home Assistant sledovat vaše solární panely a získejte přehled o jejich výkonu.",
+                        "title": "Solární panely"
+                    }
+                },
                 "entities": {
                     "caption": "Entity",
                     "description": "Správa známých entit",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Vymazat",
-                    "filtering_by": "Filtrování podle",
-                    "show": "Zobrazit"
-                },
-                "hassio": {
-                    "button": "Nastavit"
-                },
                 "header": "Nastavení Home Assistant",
                 "helpers": {
                     "caption": "Pomocníci",
@@ -2205,16 +2233,11 @@
                     "server": "server",
                     "setup_time": "Doba nastavení",
                     "source": "Zdroj:",
-                    "system_health_error": "Součást System Health není načtena. Přidejte 'system_health:' do configuration.yaml",
                     "system_health": {
                         "manage": "Spravovat",
                         "more_info": "více informací"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "stránka integrací",
-                    "missing_zha": "Hledáte nastavení ZHA? Bylo přesunuto do položky ZHA na {integrations_page}.",
-                    "missing_zwave": "Hledáte nastavení Z-Wave? Bylo přesunuto do položky Z-Wave na {integrations_page}."
+                    },
+                    "system_health_error": "Součást System Health není načtena. Přidejte 'system_health:' do configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Přidat integraci",
@@ -2229,8 +2252,6 @@
                         "depends_on_cloud": "Závisí na cloudu",
                         "device_unavailable": "Zařízení není dostupné",
                         "devices": "{count} {count, plural,\n  one {zařízení}\n  other {zařízení}\n}",
-                        "disable_error": "Povolení nebo zakázání integrace se nezdařilo",
-                        "disable_restart_confirm": "Restartujte Home Assistant pro dokončení odstranění této integrace",
                         "disable": {
                             "disable_confirm": "Opravdu chcete zakázat tuto položku konfigurace? Její zařízení a entity budou zakázány.",
                             "disabled": "Zakázáno",
@@ -2241,6 +2262,8 @@
                             },
                             "disabled_cause": "Zakázáno {cause}"
                         },
+                        "disable_error": "Povolení nebo zakázání integrace se nezdařilo",
+                        "disable_restart_confirm": "Restartujte Home Assistant pro dokončení odstranění této integrace",
                         "disabled_polling": "Automatické dotazování na aktualizovaná data je zakázáno",
                         "documentation": "Dokumentace",
                         "enable_restart_confirm": "Restartujte Home Assistant pro dokončení přidání této integrace",
@@ -2248,11 +2271,9 @@
                         "entity_unavailable": "Entita není dostupná",
                         "firmware": "Firmware: {version}",
                         "hub": "Připojeno přes",
-                        "logs": "logy",
                         "manuf": "od {manufacturer}",
                         "no_area": "Žádná oblast",
                         "not_loaded": "Nenačteno",
-                        "options": "Možnosti",
                         "provided_by_custom_integration": "Poskytováno vlastní integrací",
                         "reload": "Nově načíst",
                         "reload_confirm": "Integrace byla nově načtena",
@@ -2284,7 +2305,11 @@
                             "open_site": "Otevřít webové stránky"
                         },
                         "finish": "Dokončit",
-                        "loading_first_time": "Počkejte prosím, než bude integrace nainstalována.",
+                        "loading": {
+                            "fallback_title": "integrace",
+                            "loading_flow": "Počkejte prosím, než se nastaví {integrace}.",
+                            "loading_step": "Načítání dalšího kroku pro {integraci}"
+                        },
                         "next": "Další",
                         "not_all_required_fields": "Nejsou vyplněna všechna povinná pole.",
                         "not_loaded": "Integraci se nepodařilo načíst, zkuste restartovat Home Assistant.",
@@ -2301,7 +2326,6 @@
                     "details": "Podrobnosti o integraci",
                     "disable": {
                         "disabled_integrations": "{number} zakázáno",
-                        "hide_disabled": "Skrýt zakázané integrace",
                         "show": "Zobrazit",
                         "show_disabled": "Zobrazit zakázané integrace"
                     },
@@ -2312,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Přestat ignorovat {name}?",
                         "confirm_ignore": "Opravdu nechcete tuto integraci nastavit? Tuto akci můžete vrátit zpět klepnutím na \"Zobrazit ignorované integrace\" v nabídce vpravo nahoře.",
                         "confirm_ignore_title": "Ignorovat objevený {name}?",
-                        "hide_ignored": "Skrýt ignorované integrace",
                         "ignore": "Ignorovat",
                         "ignored": "Ignorováno",
                         "show_ignored": "Zobrazit ignorované integrace",
@@ -2432,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Nastavit",
                     "description_listen": "Naslouchat tématu",
                     "description_publish": "Publikovat paket",
                     "listening_to": "Naslouchám",
@@ -2446,7 +2468,6 @@
                     "topic": "téma"
                 },
                 "ozw": {
-                    "button": "Nastavit",
                     "common": {
                         "controller": "Ovladač",
                         "instance": "Instance",
@@ -2471,6 +2492,11 @@
                         "nodes": "Uzly",
                         "select_instance": "Vyberte instanci"
                     },
+                    "network": {
+                        "header": "Správa sítě",
+                        "introduction": "Správa funkcí pro celou síť",
+                        "node_count": "{count} uzlů"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Všechny uzly byly zkontaktovány",
@@ -2491,10 +2517,9 @@
                         "starting": "Spouštění",
                         "unknown": "Nezjištěno"
                     },
-                    "network": {
-                        "header": "Správa sítě",
-                        "introduction": "Správa funkcí pro celou síť",
-                        "node_count": "{count} uzlů"
+                    "node": {
+                        "button": "Podrobnosti uzlu",
+                        "not_found": "Uzel nenalezen"
                     },
                     "node_config": {
                         "header": "Nastavení uzlu",
@@ -2524,10 +2549,6 @@
                         "versions": "Získávám informace o verzích firmwaru a typech příkazů",
                         "wakeup": "Nastavuji podporu pro probouzecí fronty a zprávy"
                     },
-                    "node": {
-                        "button": "Podrobnosti uzlu",
-                        "not_found": "Uzel nenalezen"
-                    },
                     "nodes_table": {
                         "failed": "Selhalo",
                         "id": "ID",
@@ -2711,7 +2732,7 @@
                             "input_number": "Pomocníci - čísla",
                             "input_select": "Pomocníci - výběry",
                             "input_text": "Pomocníci - texty",
-                            "introduction": "Některé části Home Assistant lze nově načíst bez nutnosti restartování. Nové načtení zahodí jejich aktuální nastavení a načte nové.",
+                            "introduction": "Některé části Home Assistant lze nově načíst bez restartování. Kliknutím na jednu z níže uvedených možností se zruší jejich aktuální YAML konfigurace a načte se nová.",
                             "min_max": "Entity integrace Min/Max",
                             "mqtt": "Ručně nastavené entity integrace MQTT",
                             "person": "Osoby",
@@ -2753,7 +2774,7 @@
                     "confirm_remove": "Opravdu chcete odebrat štítek {tag}?",
                     "confirm_remove_title": "Odebrat štítek?",
                     "create_automation": "Vytvořit automatizaci se štítkem",
-                    "description": "Spusťte automatizaci skenováním NFC tagu, QR kódu atd.",
+                    "description": "Spusťte automatizaci skenováním NFC tagu, QR kódu atd",
                     "detail": {
                         "companion_apps": "doprovodné aplikace",
                         "create": "Vytvořit",
@@ -2832,7 +2853,6 @@
                         "search_again": "Hledat znovu",
                         "spinner": "Hledání zařízení ZHA Zigbee ..."
                     },
-                    "button": "Nastavit",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributy vybraného klastru",
                         "get_zigbee_attribute": "Získat atribut Zigbee",
@@ -2862,11 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Zástupci",
-                        "update_button": "Aktualizovat nastavení",
-                        "zha_options": {
-                            "default_light_transition": "Výchozí doba přechodu světla (sekundy)",
-                            "title": "Globální možnosti"
-                        }
+                        "update_button": "Aktualizovat nastavení"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Nastavení dokončeno",
@@ -2948,105 +2964,7 @@
                     "introduction": "Zóny umožňují určit určité oblasti na zemi. Když je osoba v zóně, stav převezme název ze zóny. Zóny lze také použít jako aktivační událost nebo podmínku v nastavení automatizace.",
                     "no_zones_created_yet": "Vypadá to, že nejsou vytvořené žádné zóny."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Zrušit začlenění",
-                        "controller_in_inclusion_mode": "Váš ovladač Z-Wave je nyní v režimu začlenění.",
-                        "follow_device_instructions": "Podle pokynů dodaných se zařízením aktivujte párování na zařízení.",
-                        "inclusion_failed": "Uzel nelze přidat. Další informace najdete v protokolech.",
-                        "inclusion_finished": "Uzel byl přidán.",
-                        "interview_failed": "Komunikace se zařízením se nezdařila. V logách mohou být k dispozici další informace.",
-                        "introduction": "Tento průvodce vás provede přidáním uzlu do vaší sítě Z-Wave.",
-                        "secure_inclusion_warning": "Zabezpečená zařízení vyžadují větší šířku pásma; příliš mnoho zabezpečených zařízení může zpomalit vaši síť Z-Wave. Bezpečné začlenění doporučujeme používat pouze u zařízení, která to vyžadují, jako jsou zámky nebo otvírače garážových vrat.",
-                        "start_inclusion": "Zahájit začlenění",
-                        "start_secure_inclusion": "Spusťte zabezpečené začlenění",
-                        "title": "Přidejte uzel Z-Wave",
-                        "use_secure_inclusion": "Použijte zabezpečené začlenění",
-                        "view_device": "Zobrazit zařízení"
-                    },
-                    "button": "Nastavit",
-                    "common": {
-                        "add_node": "Přidat uzel",
-                        "close": "Zavřít",
-                        "home_id": "ID domácnosti",
-                        "network": "Síť",
-                        "node_id": "ID uzlu",
-                        "remove_node": "Odebrat uzel"
-                    },
-                    "dashboard": {
-                        "driver_version": "Verze ovladače",
-                        "dump_dead_nodes_text": "Některé uzly neodpověděly a předpokládá se, že jsou mrtvé. Ty nebudou plně exportovány.",
-                        "dump_dead_nodes_title": "Některé uzly jsou mrtvé",
-                        "dump_debug": "Stáhněte si výpis své sítě a pomozte diagnostikovat problémy",
-                        "dump_not_ready_confirm": "Stáhnout",
-                        "dump_not_ready_text": "Pokud vytvoříte export, zatímco ne všechny uzly jsou připraveny, mohla by vám chybět potřebná data. Dejte své síti nějaký čas na dotazování všech uzlů. Chcete pokračovat s výpisem?",
-                        "dump_not_ready_title": "Ne všechny uzly jsou ještě připraveny",
-                        "header": "Spravujte svoji síť Z-Wave",
-                        "home_id": "ID domácnosti",
-                        "introduction": "Správa sítě Z-Wave a uzlů Z-Wave",
-                        "nodes_ready": "Uzly připraveny",
-                        "server_version": "Verze serveru"
-                    },
-                    "device_info": {
-                        "device_config": "Nakonfigurujte zařízení",
-                        "node_ready": "Uzel připraven",
-                        "node_status": "Stav uzlu",
-                        "zwave_info": "Z-Wave Info"
-                    },
-                    "logs": {
-                        "log_level": "Úroveň protokolu",
-                        "log_level_changed": "Úroveň protokolu změněna na: {level}",
-                        "title": "Z-Wave JS protokoly"
-                    },
-                    "navigation": {
-                        "logs": "Protokoly",
-                        "network": "Síť"
-                    },
-                    "network_status": {
-                        "connected": "Připojeno",
-                        "connecting": "Připojování",
-                        "unknown": "Nezjištěno"
-                    },
-                    "node_config": {
-                        "attribution": "Konfigurační parametry a popis zařízení poskytuje {device_database}",
-                        "battery_device_notice": "Aby bylo možné aktualizovat konfiguraci, musí být bateriová zařízení vzhůru. Pokyny k probuzení zařízení naleznete v příručce k zařízení.",
-                        "error_device_not_found": "Zařízení nenalezeno",
-                        "header": "Konfigurace zařízení Z-Wave",
-                        "introduction": "Spravujte a upravujte specifické konfigurační parametry zařízení (uzlu) pro vybrané zařízení",
-                        "parameter_is_read_only": "Tento parametr je jen pro čtení.",
-                        "set_param_accepted": "Parametr byl aktualizován.",
-                        "set_param_error": "Vyskytla se chyba.",
-                        "set_param_queued": "Změna parametru byla zařazena do fronty a bude aktualizována, jakmile se zařízení probudí.",
-                        "zwave_js_device_database": "Databáze zařízení Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Naživu",
-                        "asleep": "Spící",
-                        "awake": "Probuzený",
-                        "dead": "Mrtvý",
-                        "unknown": "Nezjištěno"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Před zahájením opakovaného rozhovoru je třeba probudit zařízení napájená z baterie. Pokyny k probuzení zařízení naleznete v příručce k zařízení.",
-                        "in_progress": "Zařízení je dotazováno. To může nějakou dobu trvat.",
-                        "interview_complete": "Pohovor se zařízením dokončen.",
-                        "interview_failed": "Dotazování zařízení se nezdařilo. Další informace mohou být k dispozici v protokolech.",
-                        "run_in_background": "Toto dialogové okno můžete zavřít a rozhovor bude pokračovat na pozadí.",
-                        "start_reinterview": "Zahájit opakovaný rozhovor"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Zrušit vyloučení",
-                        "controller_in_exclusion_mode": "Kontroler Z-Wave je nyní v režimu vyloučení.",
-                        "exclusion_failed": "Uzel nelze odstranit. Další informace najdete v protokolech.",
-                        "exclusion_finished": "Uzel {id} byl odebrán z vaší sítě Z-Wave.",
-                        "follow_device_instructions": "Postupujte podle pokynů dodanéch se zařízením a aktivujte vyloučení na zařízení.",
-                        "introduction": "Odeberte uzel ze sítě Z-Wave a odeberte přidružené zařízení a entity z Home Assistant.",
-                        "start_exclusion": "Zahájit vyloučení",
-                        "title": "Odebrání uzlu Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Nastavit",
                     "common": {
                         "index": "Index",
                         "instance": "Instance",
@@ -3135,6 +3053,129 @@
                     "values": {
                         "header": "Hodnoty uzlu"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Zrušit začlenění",
+                        "controller_in_inclusion_mode": "Váš ovladač Z-Wave je nyní v režimu začlenění.",
+                        "follow_device_instructions": "Podle pokynů dodaných se zařízením aktivujte párování na zařízení.",
+                        "inclusion_failed": "Uzel nelze přidat. Další informace najdete v protokolech.",
+                        "inclusion_finished": "Uzel byl přidán.",
+                        "interview_failed": "Komunikace se zařízením se nezdařila. V logách mohou být k dispozici další informace.",
+                        "introduction": "Tento průvodce vás provede přidáním uzlu do vaší sítě Z-Wave.",
+                        "secure_inclusion_warning": "Zabezpečená zařízení vyžadují větší šířku pásma; příliš mnoho zabezpečených zařízení může zpomalit vaši síť Z-Wave. Bezpečné začlenění doporučujeme používat pouze u zařízení, která to vyžadují, jako jsou zámky nebo otvírače garážových vrat.",
+                        "start_inclusion": "Zahájit začlenění",
+                        "start_secure_inclusion": "Spusťte zabezpečené začlenění",
+                        "title": "Přidejte uzel Z-Wave",
+                        "use_secure_inclusion": "Použijte zabezpečené začlenění",
+                        "view_device": "Zobrazit zařízení"
+                    },
+                    "common": {
+                        "add_node": "Přidat uzel",
+                        "close": "Zavřít",
+                        "heal_network": "Uzdravit síť",
+                        "home_id": "ID domácnosti",
+                        "network": "Síť",
+                        "node_id": "ID uzlu",
+                        "reconfigure_server": "Znovu nastavit server",
+                        "remove_node": "Odebrat uzel",
+                        "source": "Zdroj"
+                    },
+                    "dashboard": {
+                        "driver_version": "Verze ovladače",
+                        "dump_dead_nodes_text": "Některé uzly neodpověděly a předpokládá se, že jsou mrtvé. Ty nebudou plně exportovány.",
+                        "dump_dead_nodes_title": "Některé uzly jsou mrtvé",
+                        "dump_debug": "Stáhněte si výpis své sítě a pomozte diagnostikovat problémy",
+                        "dump_not_ready_confirm": "Stáhnout",
+                        "dump_not_ready_text": "Pokud vytvoříte export, zatímco ne všechny uzly jsou připraveny, mohla by vám chybět potřebná data. Dejte své síti nějaký čas na dotazování všech uzlů. Chcete pokračovat s výpisem?",
+                        "dump_not_ready_title": "Ne všechny uzly jsou ještě připraveny",
+                        "header": "Spravujte svoji síť Z-Wave",
+                        "home_id": "ID domácnosti",
+                        "introduction": "Správa sítě Z-Wave a uzlů Z-Wave",
+                        "nodes_ready": "Uzly připraveny",
+                        "server_version": "Verze serveru"
+                    },
+                    "device_info": {
+                        "device_config": "Nakonfigurujte zařízení",
+                        "heal_node": "Uzdravit uzel",
+                        "node_ready": "Uzel připraven",
+                        "node_status": "Stav uzlu",
+                        "zwave_info": "Z-Wave Info"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Uzdravení sítě bylo zrušeno.",
+                        "healing_complete": "Uzdravení sítě je dokončeno.",
+                        "in_progress": "Probíhá uzdravování sítě. Bude to chvíli trvat.",
+                        "start_heal": "Spustit uzdravování",
+                        "stop_heal": "Zastavit uzdravování",
+                        "title": "Uzdravte svou síť Z-Wave"
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} bylo uzdraveno.",
+                        "healing_failed": "{device} nemohlo být uzdraveno.",
+                        "healing_failed_check_logs": "Další informace mohou být k dispozici v protokolech.",
+                        "in_progress": "Probíhá uzdravování {device}.",
+                        "start_heal": "Uzdravit zařízení",
+                        "title": "Uzdravit zařízení Z-Wave"
+                    },
+                    "logs": {
+                        "log_level": "Úroveň protokolu",
+                        "log_level_changed": "Úroveň protokolu změněna na: {level}",
+                        "title": "Z-Wave JS protokoly"
+                    },
+                    "navigation": {
+                        "logs": "Protokoly",
+                        "network": "Síť"
+                    },
+                    "network_status": {
+                        "connected": "Připojeno",
+                        "connecting": "Připojování",
+                        "unknown": "Nezjištěno"
+                    },
+                    "node_config": {
+                        "attribution": "Konfigurační parametry a popis zařízení poskytuje {device_database}",
+                        "battery_device_notice": "Aby bylo možné aktualizovat konfiguraci, musí být bateriová zařízení vzhůru. Pokyny k probuzení zařízení naleznete v příručce k zařízení.",
+                        "error_device_not_found": "Zařízení nenalezeno",
+                        "header": "Konfigurace zařízení Z-Wave",
+                        "introduction": "Spravujte a upravujte specifické konfigurační parametry zařízení (uzlu) pro vybrané zařízení",
+                        "parameter": "Parametr",
+                        "parameter_is_read_only": "Tento parametr je jen pro čtení.",
+                        "set_param_accepted": "Parametr byl aktualizován.",
+                        "set_param_error": "Vyskytla se chyba.",
+                        "set_param_queued": "Změna parametru byla zařazena do fronty a bude aktualizována, jakmile se zařízení probudí.",
+                        "zwave_js_device_database": "Databáze zařízení Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Naživu",
+                        "asleep": "Spící",
+                        "awake": "Probuzený",
+                        "dead": "Mrtvý",
+                        "unknown": "Nezjištěno"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Před zahájením opakovaného rozhovoru je třeba probudit zařízení napájená z baterie. Pokyny k probuzení zařízení naleznete v příručce k zařízení.",
+                        "in_progress": "Zařízení je dotazováno. To může nějakou dobu trvat.",
+                        "interview_complete": "Pohovor se zařízením dokončen.",
+                        "interview_failed": "Dotazování zařízení se nezdařilo. Další informace mohou být k dispozici v protokolech.",
+                        "run_in_background": "Toto dialogové okno můžete zavřít a rozhovor bude pokračovat na pozadí.",
+                        "start_reinterview": "Zahájit opakovaný rozhovor"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Probíhá odstraňování zařízení.",
+                        "removal_failed": "Zařízení se nepodařilo odebrat z vaší sítě Z-Wave.",
+                        "removal_finished": "Uzel {id} byl odebrán z vaší sítě Z-Wave.",
+                        "remove_device": "Odebrat zařízení"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Zrušit vyloučení",
+                        "controller_in_exclusion_mode": "Kontroler Z-Wave je nyní v režimu vyloučení.",
+                        "exclusion_failed": "Uzel nelze odstranit. Další informace najdete v protokolech.",
+                        "exclusion_finished": "Uzel {id} byl odebrán z vaší sítě Z-Wave.",
+                        "follow_device_instructions": "Postupujte podle pokynů dodanéch se zařízením a aktivujte vyloučení na zařízení.",
+                        "introduction": "Odeberte uzel ze sítě Z-Wave a odeberte přidružené zařízení a entity z Home Assistant.",
+                        "start_exclusion": "Zahájit vyloučení",
+                        "title": "Odebrání uzlu Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3217,31 +3258,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Vrátit se",
-                "supervisor": {
-                    "ask": "Požádat o pomoc",
-                    "observer": "Zkontrolujte pozorovatele",
-                    "reboot": "Zkuste restartovat hostitele",
-                    "system_health": "Kontrola stavu systému",
-                    "title": "Nelze načíst panel pro správu!",
-                    "wait": "Pokud jste právě začali, ujistěte se, že jste správci poskytli dostatek času k rozběhnutí."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Minulý týden",
-                    "this_week": "Tento týden",
-                    "today": "Dnes",
-                    "yesterday": "Včera"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Minulý týden",
-                    "this_week": "Tento týden",
-                    "today": "Dnes",
-                    "yesterday": "Včera"
+            "energy": {
+                "charts": {
+                    "by_device": "Spotřeba podle zařízení",
+                    "solar": "Solární",
+                    "stat_house_energy_meter": "Celková spotřeba energie"
+                },
+                "setup": {
+                    "back": "Zpět",
+                    "done": "Ukažte mi můj energetický panel!",
+                    "next": "Další"
                 }
             },
             "lovelace": {
@@ -3355,7 +3381,6 @@
                         "entities": {
                             "description": "Karta Entity je nejběžnějším typem karty. Seskupuje položky do seznamů.",
                             "edit_special_row": "Použijte tlačítko Upravit k zobrazení podrobností tohoto řádku",
-                            "entity_row_editor": "Editor řádku entity",
                             "entity_row": {
                                 "attribute": "Atribut",
                                 "button": "Tlačítko",
@@ -3367,6 +3392,7 @@
                                 "section": "Sekce",
                                 "weblink": "Webový odkaz"
                             },
+                            "entity_row_editor": "Editor řádku entity",
                             "name": "Entity",
                             "secondary_info_values": {
                                 "brightness": "Jas",
@@ -3393,6 +3419,7 @@
                         "gauge": {
                             "description": "Karta Ručičkový ukazatel je základní karta pro vizuální zobrazení hodnoty senzoru.",
                             "name": "Ručičkový ukazatel",
+                            "needle_gauge": "Zobrazit s ukazatelem?",
                             "severity": {
                                 "define": "Definovat závažnost?",
                                 "green": "Zelená",
@@ -3405,6 +3432,7 @@
                             "attribute": "Atribut",
                             "camera_image": "Entita kamery",
                             "camera_view": "Zobrazení kamery",
+                            "days_to_show": "Počet dní k zobrazení",
                             "double_tap_action": "Akce při dvojitém poklepání",
                             "entities": "Entity",
                             "entity": "Entita",
@@ -3518,6 +3546,10 @@
                             "integration_not_loaded": "Tato karta vyžaduje integraci `shopping_list`.",
                             "name": "Nákupní seznam"
                         },
+                        "statistics-graph": {
+                            "description": "Karta Statistický graf umožňuje zobrazit graf statistik pro každou z uvedených entit.",
+                            "name": "Statistický graf"
+                        },
                         "thermostat": {
                             "description": "Karta Termostat poskytuje kontrolu nad vaší klimatickou entitou. Umožňuje změnit teplotu a režim entity.",
                             "name": "Termostat"
@@ -3587,6 +3619,12 @@
                         "tab_badges": "Odznaky",
                         "tab_settings": "Nastavení",
                         "tab_visibility": "Viditelnost",
+                        "type": "Typ zobrazení",
+                        "types": {
+                            "masonry": "Zdivo (výchozí)",
+                            "panel": "Panel (1 karta)",
+                            "sidebar": "Postranní panel"
+                        },
                         "visibility": {
                             "select_users": "Vyberte, kteří uživatelé by měli vidět tento pohled v navigaci"
                         }
@@ -3641,7 +3679,6 @@
                         "unsaved_changes": "Neuložené změny"
                     },
                     "save_config": {
-                        "cancel": "Zahodit změnu",
                         "close": "Zavřít",
                         "empty_config": "Začít s prázdným ovládacím panel",
                         "header": "Převzít kontrolu nad vaší Lovelace UI",
@@ -3670,8 +3707,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "První karta bude zobrazena v plné šířce. Ostatní karty nebo odznaky nebudou v tomto pohledu vůbec zobrazeny.",
-                            "title": "Režim panelu?",
                             "warning_multiple_cards": "Toto zobrazení obsahuje více než jednu kartu, ale v panelovém zobrazení může zobrazovat pouze 1 kartu."
                         }
                     }
@@ -3874,8 +3909,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Další",
-                    "intro": "Sdílejte analytiku ze své instance. Tato data budou veřejně dostupná na {link}"
+                    "finish": "Další"
                 },
                 "core-config": {
                     "button_detect": "Rozpoznat",
@@ -3899,10 +3933,8 @@
                     "confirm_password": "Potvrďte heslo zálohy",
                     "description": "Případně můžete Home Assistant obnovit z poslední zálohy.",
                     "folders": "Složky",
-                    "full_snapshot": "Úplná záloha",
                     "hide_log": "Skrýt celý log",
                     "in_progress": "Probíhá obnovení",
-                    "partial_snapshot": "Částečná záloha",
                     "password": "Heslo zálohy",
                     "password_protection": "Ochrana heslem",
                     "select_type": "Vyberte, co chcete obnovit",
@@ -3984,6 +4016,12 @@
                     "prompt_copy_token": "Zkopírujte přístupový token. Už nikdy nebude znovu zobrazen.",
                     "prompt_name": "Pojmenujte token"
                 },
+                "mfa": {
+                    "confirm_disable": "Opravdu chcete zakázat {name}?",
+                    "disable": "Zakázat",
+                    "enable": "Povolit",
+                    "header": "Multifaktorové autentizační moduly"
+                },
                 "mfa_setup": {
                     "close": "Zavřít",
                     "step_done": "Dokončen krok {step}",
@@ -3991,12 +4029,6 @@
                     "title_aborted": "Zrušeno",
                     "title_success": "Úspěch!"
                 },
-                "mfa": {
-                    "confirm_disable": "Opravdu chcete zakázat {name}?",
-                    "disable": "Zakázat",
-                    "enable": "Povolit",
-                    "header": "Multifaktorové autentizační moduly"
-                },
                 "number_format": {
                     "description": "Zvolte způsob formátování čísel.",
                     "dropdown_label": "Formát čísel",
diff --git a/translations/frontend/cy.json b/translations/frontend/cy.json
index 6394314cf6..ed655b6618 100644
--- a/translations/frontend/cy.json
+++ b/translations/frontend/cy.json
@@ -14,6 +14,12 @@
         "shopping_list": "Rhestr siopa",
         "states": "Trosolwg"
     },
+    "state": {
+        "default": {
+            "unavailable": "Ddim ar gael",
+            "unknown": "Anhysbys"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -61,12 +67,6 @@
             "not_home": "I ffwrdd"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "Ddim ar gael",
-            "unknown": "Anhysbys"
-        }
-    },
     "ui": {
         "card": {
             "alarm_control_panel": {
@@ -314,7 +314,6 @@
                             "introduction": "Y camau gweithredu yw'r hyn mae Home Assistant yn gwneud pan mae'r awtomeiddio yn cael ei sbarduno\n\n[Dysgwch mwy am weithred.](https://home-assistant.io/docs/automation/action/)",
                             "learn_more": "Dysgu mwy am gamau gweithredu",
                             "name": "Gweithredu",
-                            "type_select": "Math weithrediad",
                             "type": {
                                 "condition": {
                                     "label": "Cyflwr"
@@ -337,6 +336,7 @@
                                     "wait_template": "Templed Aros"
                                 }
                             },
+                            "type_select": "Math weithrediad",
                             "unsupported_action": "Gweithredu heb gefnogaeth: {action}"
                         },
                         "alias": "Enw",
@@ -349,7 +349,6 @@
                             "introduction": "Mae'r amodau'n rhan ddewisol o reol awtomeiddio, a gellir eu defnyddio i atal camau rhag digwydd pan fyddant yn cael eu sbarduno. Mae'r amodau'n edrych yn debyg iawn i sbardunau ond maent yn wahanol iawn. Bydd sbardun yn edrych ar ddigwyddiadau sy'n digwydd yn y system tra bod amod yn edrych ar sut mae'r system yn edrych ar hyn o bryd. Gall sbarduno arsylwi bod switsh yn cael ei droi ymlaen. Dim ond os yw switsh ar neu i ffwrdd ar hyn o bryd y gall cyflwr weld. \n\n [Dysgwch fwy am amodau.] (Https://home-assistant.io/docs/scripts/conditions/)",
                             "learn_more": "Dysgu mwy am amodau",
                             "name": "Cyflwr",
-                            "type_select": "Math o gyflwr",
                             "type": {
                                 "numeric_state": {
                                     "above": "Uwch",
@@ -388,6 +387,7 @@
                                     "zone": "Ardal"
                                 }
                             },
+                            "type_select": "Math o gyflwr",
                             "unsupported_condition": "Cyflwr heb gymorth: {condition}"
                         },
                         "copy_to_clipboard": "Copïo i'r Clipfwrdd",
@@ -407,7 +407,6 @@
                             "introduction": "Sbarduno yw'r hyn sy'n dechrau proses rheol awtomeiddio.  Mae'n bosib dewis nifer o sbardunau i'run rheol. Unwaith mae sbardun yn cychwyn, bydd Home Assistant yn dilysu'r amodau, os o gwbl, a galw'r gweithred. \n\n[dysgwch mwy am sbardunau.] (https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "Dysgu mwy am sbardunau",
                             "name": "Sbardun",
-                            "type_select": "Math sbardun",
                             "type": {
                                 "event": {
                                     "context_user_pick": "Ychwanegu defnyddiwr",
@@ -458,16 +457,16 @@
                                     "label": "Templed",
                                     "value_template": "Templed gwerth"
                                 },
+                                "time": {
+                                    "at": "Ar",
+                                    "label": "Amser"
+                                },
                                 "time_pattern": {
                                     "hours": "Oriau",
                                     "label": "Patrwm Amser",
                                     "minutes": "Munudau",
                                     "seconds": "Eiliadau"
                                 },
-                                "time": {
-                                    "at": "Ar",
-                                    "label": "Amser"
-                                },
                                 "webhook": {
                                     "label": "Gwefachiad",
                                     "webhook_id": "Enw Gwefachiad"
@@ -481,6 +480,7 @@
                                     "zone": "Parth"
                                 }
                             },
+                            "type_select": "Math sbardun",
                             "unsupported_platform": "Llwyfan heb gymorth: {platform}"
                         },
                         "unsaved_confirm": "Mae gennych newidiadau heb eu cadw. Ydych chi'n siŵr bod chi eisiau gadael?"
@@ -615,7 +615,6 @@
                             "open_site": "Gwefan agored"
                         },
                         "finish": "Gorffen",
-                        "loading_first_time": "Arhoswch tra bo'r integreiddiad yn cael ei osod",
                         "not_all_required_fields": "Nid yw pob maes gofynnol wedi'i lenwi.",
                         "submit": "Cyflwyno"
                     },
@@ -654,7 +653,6 @@
                     "title": "MQTT"
                 },
                 "ozw": {
-                    "button": "Ffurfweddu",
                     "common": {
                         "controller": "Rheolwr",
                         "instance": "Enghraifft",
@@ -671,6 +669,11 @@
                         "nodes": "Nodau",
                         "select_instance": "Dewis Enghraifft"
                     },
+                    "network": {
+                        "header": "Rheolaeth Rhwydwaith",
+                        "introduction": "Rheoli swyddogaethau rhwydwaith-lydan",
+                        "node_count": "nodau {count}"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Holwyd pob nod",
@@ -691,11 +694,6 @@
                         "starting": "Cychwyn",
                         "unknown": "Anhysbys"
                     },
-                    "network": {
-                        "header": "Rheolaeth Rhwydwaith",
-                        "introduction": "Rheoli swyddogaethau rhwydwaith-lydan",
-                        "node_count": "nodau {count}"
-                    },
                     "node_config": {
                         "header": "Ffurfweddu nod",
                         "help_source": "Darperir disgrifiadau paramedr a thestun cymorth gan brosiect OpenZWave.",
@@ -1115,7 +1113,6 @@
                         "unsaved_changes": "Newidiadau heb eu cadw"
                     },
                     "save_config": {
-                        "cancel": "Dim ots",
                         "empty_config": "Dechreuwch gyda dangosfwrdd gwag",
                         "header": "Cymerwch reolaeth ar eich rhyngwyneb defnyddiwr Lovelace",
                         "para": "Gwneith Home Assistant gynnal eich rhyngwyneb defnyddiwr yn ddiofyn, a'i diweddaru pan fydd endidau neu gydrannau Lovelace newydd yn dod ar gael. Os ydych yn cymryd rheolaeth nawn ddim gwneud newidiadau awtomatig pellach i chi.",
@@ -1125,7 +1122,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Mae hyn yn golygu bod y cerdyn cyntaf yn ei led llawn. Ni fydd cardiau eraill yn y gweddlun hon yn ogystal â bathodynnau yn cael ei rendro.",
                             "warning_multiple_cards": "Mae'r golwg yn cynnwys mwy nag un cerdyn, ond dim ond un cerdyn gall y golwg panel ei ddangos."
                         }
                     }
diff --git a/translations/frontend/da.json b/translations/frontend/da.json
index 4bf3348140..b61665a3a2 100644
--- a/translations/frontend/da.json
+++ b/translations/frontend/da.json
@@ -17,6 +17,7 @@
         "calendar": "Kalender",
         "config": "Indstillinger",
         "developer_tools": "Udviklerværktøjer",
+        "energy": "Energi",
         "history": "Historik",
         "logbook": "Logbog",
         "mailbox": "Postkasse",
@@ -26,6 +27,14 @@
         "shopping_list": "Indkøbsliste",
         "states": "Oversigt"
     },
+    "state": {
+        "default": {
+            "off": "Fra",
+            "on": "Til",
+            "unavailable": "Utilgængelig",
+            "unknown": "Ukendt"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Ude"
         }
     },
-    "state": {
-        "default": {
-            "off": "Fra",
-            "on": "Til",
-            "unavailable": "Utilgængelig",
-            "unknown": "Ukendt"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Tilføjelsesprogrammet er ikke installeret"
             }
         },
+        "backup": {
+            "addons": "Tilføjelsesprogrammer",
+            "confirm_password": "Bekræft backup kodeord",
+            "could_not_create": "Kunne ikke oprette backup",
+            "create": "Opret",
+            "create_blocked_not_running": "Det er ikke muligt at oprette et backup lige nu, fordi systemet er i tilstanden {state}.",
+            "created": "Oprettet",
+            "delete_backup_confirm": "Slet",
+            "delete_selected": "Slet valgte backups",
+            "enter_password": "Venligst indtast et kodeord.",
+            "failed_to_delete": "Kunne ikke slette",
+            "folders": "Mapper",
+            "name": "Navn",
+            "password": "Kodeord",
+            "password_protection": "Kodeordsbeskyttelse",
+            "passwords_not_matching": "Kodeordene er forskellige",
+            "select_type": "Vælg, hvad der skal gendannes",
+            "selected": "{number} valgt",
+            "type": "Type"
+        },
         "common": {
             "cancel": "Annuller",
             "close": "Luk",
@@ -288,7 +309,7 @@
             "reset_options": "Nulstil indstillinger",
             "restart": "Genstart",
             "restart_name": "Genstart {name}",
-            "running_version": "Du bruger pt. version",
+            "running_version": "Du bruger pt. version {version}",
             "save": "Gem",
             "show_more": "Vis flere oplysninger om dette",
             "update": "Opdater",
@@ -366,9 +387,6 @@
                 "text": "Vil du genstarte tilføjelsesprogrammet med ændringerne?"
             },
             "update": {
-                "create_snapshot": "Opret et snapshot af {name} før opdatering",
-                "snapshot": "Snapshot",
-                "snapshotting": "Opretter snapshot af {name}",
                 "updating": "Opdaterer {name} til version {version}"
             }
         },
@@ -377,54 +395,15 @@
             "error_addon_no_ingress": "Tilføjelsesprogrammet understøtter ikke ingress",
             "error_addon_not_found": "Tilføjelsesprogrammet blev ikke fundet",
             "error_addon_not_installed": "Tilføjelsesprogrammet er ikke installeret  venligst installer det først",
-            "error_addon_not_started": "Tilføjelsesprogrammet kører ikke  venligst start det først",
+            "error_addon_not_started": "Tilføjelsesprogrammet kører ikke. Du skal starte det først",
             "faq_link": "Ofte stillede spørgsmål om Home Assistant",
             "not_supported": "Denne omdirigering understøttes ikke af din Home Assistant installation. Kontroller {link} for de understøttede omdirigeringer og den version, de blev introduceret i."
         },
         "panel": {
             "dashboard": "Betjeningspanel",
-            "snapshots": "Snapshots",
             "store": "Butik for tilføjelsesprogrammer",
             "system": "System"
         },
-        "snapshot": {
-            "addons": "Tilføjelsesprogrammer",
-            "available_snapshots": "Tilgængelige snapshots",
-            "confirm_password": "Bekræft snapshot kodeord",
-            "could_not_create": "Kunne ikke oprette snapshot",
-            "create": "Opret",
-            "create_blocked_not_running": "Det er ikke muligt at oprette et snapshot lige nu, fordi systemet er i tilstanden {state}.",
-            "create_snapshot": "Opret snapshot",
-            "created": "Oprettet",
-            "delete_selected": "Slet valgte snapshots",
-            "delete_snapshot_confirm": "Slet",
-            "delete_snapshot_text": "Vil du slette {number} \n{number, plural,\n  one {snapshot}\n  other {snapshots}\n}?",
-            "delete_snapshot_title": "Slet snapshot",
-            "description": "Snapshots giver dig mulighed for nemt at sikkerhedskopiere og gendanne alle data fra dit instans af Home Assistant.",
-            "enter_password": "Venligst indtast et kodeord.",
-            "failed_to_delete": "Kunne ikke slette",
-            "folder": {
-                "addons/local": "Lokale tilføjelsesprogrammer",
-                "homeassistant": "Home Assistant konfiguration",
-                "media": "Medie",
-                "share": "Del",
-                "ssl": "SSL"
-            },
-            "folders": "Mapper",
-            "full_snapshot": "Fuldt snapshot",
-            "name": "Navn",
-            "no_snapshots": "Du har endnu ingen snapshots.",
-            "partial_snapshot": "Delvist snapshot",
-            "password": "Kodeord",
-            "password_protected": "beskyttet med kodeord",
-            "password_protection": "Kodeordsbeskyttelse",
-            "passwords_not_matching": "Kodeordene er forskellige",
-            "security": "Sikkerhed",
-            "select_type": "Vælg, hvad der skal gendannes",
-            "selected": "{number} valgt",
-            "type": "Type",
-            "upload_snapshot": "Upload snapshot"
-        },
         "store": {
             "missing_addons": "Mangler du tilføjelsesprogrammer? Aktivér avanceret tilstand på din brugerprofilside.",
             "no_results_found": "Der blev ikke fundet nogen resultater i {repository}.",
@@ -754,12 +733,18 @@
             "data-table": {
                 "clear": "Nulstil",
                 "filtering_by": "Filtrering efter",
-                "hidden": "{nummer} skjult",
+                "hidden": "{number} skjult",
                 "no-data": "Ingen data",
                 "search": "Søg"
             },
             "date-range-picker": {
                 "end_date": "Slutdato",
+                "ranges": {
+                    "last_week": "Sidste uge",
+                    "this_week": "Denne uge",
+                    "today": "I dag",
+                    "yesterday": "I går"
+                },
                 "select": "Vælg",
                 "start_date": "Startdato"
             },
@@ -820,6 +805,7 @@
                     "was_unplugged": "blev frakoblet strøm",
                     "was_unsafe": "blev usikker"
                 },
+                "retrieval_error": "Fejl under indlæsning af logbogsregistreringer",
                 "show_trace": "Vis sporing"
             },
             "media-browser": {
@@ -850,10 +836,10 @@
                 "documentation": "Dokumentation",
                 "learn_adding_local_media": "Få flere oplysninger om tilføjelse af medier i {documentation} .",
                 "local_media_files": "Placer dine video-, lyd- og billedfiler i mediekataloget for at kunne gennemse og afspille dem i browseren eller på understøttede medieafspillere.",
+                "media-player-browser": "Medieafspiller",
                 "media_browsing_error": "Fejl ved mediebrowsing",
                 "media_not_supported": "Medieafspilleren understøtter ikke denne type medier",
                 "media_player": "Medieafspiller",
-                "media-player-browser": "Medieafspiller",
                 "no_items": "Ingen medier til afspilning",
                 "no_local_media_found": "Ingen lokale medier fundet",
                 "no_media_folder": "Det ser ud til, at du ikke har oprettet medie katalog endnu.",
@@ -923,6 +909,23 @@
             "service-picker": {
                 "service": "Tjeneste"
             },
+            "statistic-picker": {
+                "learn_more": "Få mere at vide om statistik",
+                "missing_entity": "Hvorfor vises min entitet ikke?",
+                "no_match": "Der blev ikke fundet nogen matchende statistik",
+                "no_statistics": "Du har ingen statistik",
+                "statistic": "Statistik"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Indlæser statistik ...",
+                "no_statistics_found": "Ingen statistik fundet.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "mean",
+                    "min": "min",
+                    "sum": "sum"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Vælg område",
                 "add_device_id": "Vælg enhed",
@@ -1111,6 +1114,10 @@
                 "form": {
                     "header": "Indstillinger"
                 },
+                "loading": {
+                    "loading_flow": "Vent venligst, mens indstillingerne for {integration} bliver klargjort",
+                    "loading_step": "Indlæser næste trin for {integration}"
+                },
                 "success": {
                     "description": "Indstillingerne blev gemt."
                 }
@@ -1124,13 +1131,13 @@
                         "core": "Generelt",
                         "customize": "Tilpasninger",
                         "devices": "Enheder",
+                        "energy": "Energi",
                         "entities": "Entiteter",
                         "helpers": "Hjælpere",
                         "info": "Oplysninger",
                         "integrations": "Integrationer",
                         "logs": "Logs",
                         "lovelace": "Lovelace-betjeningspaneler",
-                        "navigate_to": "Naviger til {panel}",
                         "person": "Personer",
                         "scene": "Scener",
                         "script": "Scripts",
@@ -1359,7 +1366,6 @@
                             "introduction": "Handlinger er, hvad Home Assistant skal gøre, når automatiseringen udløses.",
                             "learn_more": "Lær om handlinger",
                             "name": "Handling",
-                            "type_select": "Begivenhedstype",
                             "type": {
                                 "choose": {
                                     "add_option": "Tilføj mulighed",
@@ -1400,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Gentag",
                                     "sequence": "Handlinger",
-                                    "type_select": "Gentagelsestype",
                                     "type": {
                                         "count": {
                                             "label": "Tæl"
@@ -1413,7 +1418,8 @@
                                             "conditions": "Mens betingelserne",
                                             "label": "Mens"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Gentagelsestype"
                                 },
                                 "scene": {
                                     "label": "Aktivér scene"
@@ -1433,6 +1439,7 @@
                                     "wait_template": "Vente-skabelon"
                                 }
                             },
+                            "type_select": "Begivenhedstype",
                             "unsupported_action": "Ingen UI-understøttelse af handling: {action}"
                         },
                         "alias": "Navn",
@@ -1451,7 +1458,6 @@
                             "introduction": "Betingelser er valgfri og forhindrer yderligere udførelse, medmindre alle betingelser er opfyldt.",
                             "learn_more": "Lær om betingelser",
                             "name": "Betingelse",
-                            "type_select": "Betingelsestype",
                             "type": {
                                 "and": {
                                     "label": "Og"
@@ -1512,12 +1518,18 @@
                                         "wed": "Onsdag"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Udløser Id",
+                                    "label": "Udløser",
+                                    "no_triggers": "Ingen udløsere er tilgængelige"
+                                },
                                 "zone": {
                                     "entity": "Entitet med lokalitet",
                                     "label": "Zone",
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Betingelsestype",
                             "unsupported_condition": "Ingen UI-understøttelse af betingelse: {condition}"
                         },
                         "copy_to_clipboard": "Kopier til udklipsholder",
@@ -1555,10 +1567,10 @@
                             "delete_confirm": "Er du sikker på, at du vil slette?",
                             "duplicate": "Dupliker",
                             "header": "Udløsere",
+                            "id": "Udløser Id (anvendt af udløserbetingelsen)",
                             "introduction": "Udløsere er, hvad der starter behandlingen af en automatiseringsregel. Det er muligt at angive flere udløsere til samme regel. Når en udløser starter, vil Home Assistant validere eventuelle betingelser og udføre handlingen.",
                             "learn_more": "Lær om udløsere",
                             "name": "Udløser",
-                            "type_select": "Udløsertype",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1624,18 +1636,18 @@
                                     "label": "Skabelon",
                                     "value_template": "Værdi-skabelon"
                                 },
-                                "time_pattern": {
-                                    "hours": "Timer",
-                                    "label": "Tidsmønster",
-                                    "minutes": "Minutter",
-                                    "seconds": "Sekunder"
-                                },
                                 "time": {
                                     "at": "Klokken",
                                     "label": "Tid",
                                     "type_input": "Værdien af en dato / tid hjælper",
                                     "type_value": "Fast tid"
                                 },
+                                "time_pattern": {
+                                    "hours": "Timer",
+                                    "label": "Tidsmønster",
+                                    "minutes": "Minutter",
+                                    "seconds": "Sekunder"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook-id"
@@ -1649,6 +1661,7 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Udløsertype",
                             "unsupported_platform": "Ingen UI-understøttelse af platform: {platform}"
                         },
                         "unsaved_confirm": "Du har ikke-gemte ændringer. Er du sikker på, at du vil forlade?"
@@ -1781,6 +1794,7 @@
                             "instance_will_be_available": "Din instans vil være tilgængelig på",
                             "link_learn_how_it_works": "Lær hvordan det fungerer",
                             "not_connected": "Ikke tilsluttet",
+                            "reconnecting": "Tilslutter igen",
                             "remote_enabled": {
                                 "caption": "Forbind automatisk",
                                 "description": "Slå denne indstilling til for at sikre din Home Assistant applikation er tilgængelig udefra "
@@ -1811,9 +1825,9 @@
                             "loading": "Indlæser...",
                             "manage": "Administrer",
                             "no_hooks_yet": "Det ser ud til, at du endnu ikke har nogen webhooks. Kom godt i gang ved at konfigurere en ",
+                            "no_hooks_yet2": "eller ved at oprette en",
                             "no_hooks_yet_link_automation": "webhook-automatisering",
                             "no_hooks_yet_link_integration": "webhook-baseret integration",
-                            "no_hooks_yet2": "eller ved at oprette en",
                             "title": "Webhooks"
                         }
                     },
@@ -1928,41 +1942,13 @@
                     "description": "Ændre Home Assistants generelle konfiguration",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Før du aktiverer dette, skal du sørge for at besøge dokumentationssiden {link} for at forstå, hvilke data du sender, og hvordan de opbevares og anvendes.",
-                                "header": "Analytics",
-                                "instance_id": "Instans-id: {huuid}",
-                                "introduction": "Del dine installationsoplysninger med os for at gøre Home Assistant bedre og hjælpe os med at overbevise producenter om at tilføje lokale funktioner, der fokuserer på beskyttelse af personlige oplysninger.",
-                                "learn_more": "Sådan behandler vi dine data",
-                                "needs_base": "Du skal aktivere basisanalyser, for at denne indstilling er tilgængelig",
-                                "preference": {
-                                    "base": {
-                                        "description": "Instans-id, version og installationstype.",
-                                        "title": "Basisanalyser"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Del fejlrapporter, hvis der opstår uventede fejl.",
-                                        "title": "Diagnostik"
-                                    },
-                                    "statistics": {
-                                        "description": "Samlet antal anvendte enheder, brugere og andre data.",
-                                        "title": "Brugsstatistikker"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Navne, versioner og funktioner.",
-                                        "title": "Anvendte integrationer og tilføjelsesprogrammer"
-                                    },
-                                    "usage": {
-                                        "description": "Navne og versionsoplysninger.",
-                                        "title": "Anvendte integrationer"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Valuta",
                                 "edit_requires_storage": "Editor er deaktiveret, fordi config er gemt i 'configuration.yaml'.",
                                 "elevation": "Højde",
                                 "elevation_meters": "meter",
                                 "external_url": "Ekstern webadresse",
+                                "find_currency_value": "Find din værdi",
                                 "imperial_example": "Fahrenheit, pund",
                                 "internal_url": "Intern webadresse",
                                 "latitude": "Breddegrad",
@@ -2091,6 +2077,63 @@
                     "update": "Opdater",
                     "update_device_error": "Enhedsopdateringen fejlede"
                 },
+                "energy": {
+                    "caption": "Energi",
+                    "description": "Overvåg din energiproduktion og dit forbrug",
+                    "device_consumption": {
+                        "add_stat": "Vælg entitet til at overvåge energiforbrug fra",
+                        "dialog": {
+                            "selected_stat_intro": "Vælg den entitet, der måler enhedens energiforbrug."
+                        },
+                        "learn_more": "Flere oplysninger om, hvordan du kommer i gang.",
+                        "selected_stat": "Overvåger energiforbrug for",
+                        "sub": "Ved at spore energiforbruget for de enkelte enheder kan Home Assistant opdele dit energiforbrug efter enhed.",
+                        "title": "Individuelle enheder"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Brug en entitet med den aktuelle pris",
+                                "cost_entity_input": "Entitet med den aktuelle pris",
+                                "cost_number": "Anvend en fast pris",
+                                "cost_number_input": "Pris pr. kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Vælg, hvordan Home Assistant skal overvåge omkostningerne ved den forbrugte energi.",
+                                "cost_stat": "Brug en entitet, der overvåger de samlede omkostninger",
+                                "cost_stat_input": "Entitet med samlede omkostninger",
+                                "energy_stat": "Forbrugt energi (kWh)",
+                                "header": "Konfigurer netforbrug",
+                                "no_cost": "Spor ikke omkostninger",
+                                "paragraph": "Netforbrug er den energi dit hjem  modtager fra energinettet."
+                            },
+                            "to": {
+                                "cost_entity": "Brug en enhed med den aktuelle enhedspris",
+                                "cost_entity_input": "Enhed med den aktuelle enhedspris",
+                                "cost_number": "Brug en fast enhedspris",
+                                "cost_number_input": "Enhedspris pr. kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Får du penge tilbage, når du sender energi til nettet?",
+                                "cost_stat": "Brug en entitet, der måler det samlede modtagne beløb",
+                                "cost_stat_input": "Entitet\nmed modtaget kompensation",
+                                "energy_stat": "Energi sendt retur til nettet (kWh)",
+                                "header": "Konfigurer netproduktion",
+                                "no_cost": "Jeg får ikke penge tilbage",
+                                "paragraph": "Netproduktion er den energi, der sendes retur til energinettet fra dine solceller."
+                            }
+                        },
+                        "learn_more": "Flere oplysninger om, hvordan du kommer i gang.",
+                        "sub": "Konfigurer den mængde energi, du forbruger fra nettet, og sender tilbage til nettet, hvis du producerer energi. Dette giver Home Assistant mulighed for at overvåge dit samlede   energiforbrug i hjemmet.",
+                        "title": "Elnet"
+                    },
+                    "solar": {
+                        "learn_more": "Flere oplysninger om, hvordan du kommer i gang.",
+                        "stat_predicted_production": "Forventet energiproduktion fra solceller",
+                        "stat_production": "Din energiproduktion fra solceller",
+                        "stat_return_to_grid": "Solenergi sendt tilbage til nettet",
+                        "sub": "Lad Home Assistant overvåge dine solceller og give dig oplysninger om deres produktion.",
+                        "title": "Solceller"
+                    }
+                },
                 "entities": {
                     "caption": "Entiteter",
                     "description": "Administrer kendte entiteter",
@@ -2141,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Ryd",
-                    "filtering_by": "Filtrering efter",
-                    "show": "Vis"
-                },
-                "hassio": {
-                    "button": "Konfigurer"
-                },
                 "header": "Konfigurer Home Assistant",
                 "helpers": {
                     "caption": "Hjælpere",
@@ -2198,16 +2233,11 @@
                     "server": "server",
                     "setup_time": "Opsætningstid",
                     "source": "Kilde:",
-                    "system_health_error": "System Health-komponenten er ikke indlæst. Føj 'system_health:' til 'config.yaml'",
                     "system_health": {
                         "manage": "Administrer",
                         "more_info": "mere info"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "integrationssiden",
-                    "missing_zha": "Mangler ZHA-konfigurationspanelet? Det er blevet flyttet til ZHA-posten på {integrations_page}.",
-                    "missing_zwave": "Mangler Z-wave-konfigurationspanelet? Det er blevet flyttet til Z-wave-posten på {integrations_page}."
+                    },
+                    "system_health_error": "System Health-komponenten er ikke indlæst. Føj 'system_health:' til 'config.yaml'"
                 },
                 "integrations": {
                     "add_integration": "Tilføj integration",
@@ -2222,8 +2252,6 @@
                         "depends_on_cloud": "Afhængig af Cloud tjenester",
                         "device_unavailable": "Enheden er utilgængelig",
                         "devices": "{count} {count, plural,\n  one {enhed}\n  other {enheder}\n}",
-                        "disable_error": "Aktivering eller deaktivering af integrationen fejlede",
-                        "disable_restart_confirm": "Genstart Home Assistant for at fuldføre deaktivering af denne integration",
                         "disable": {
                             "disable_confirm": "Er du sikker på, at du vil deaktivere denne integration? Integrationens enheder og entiteter vil blive deaktiveret.",
                             "disabled": "Deaktiveret",
@@ -2234,6 +2262,8 @@
                             },
                             "disabled_cause": "Deaktiveret af {cause}"
                         },
+                        "disable_error": "Aktivering eller deaktivering af integrationen fejlede",
+                        "disable_restart_confirm": "Genstart Home Assistant for at fuldføre deaktivering af denne integration",
                         "disabled_polling": "Den automatiske hentning af opdateret data er frakoblet",
                         "documentation": "Dokumentation",
                         "enable_restart_confirm": "Genstart Home Assistant for at fuldføre aktivering af denne integration",
@@ -2241,11 +2271,9 @@
                         "entity_unavailable": "Entiteten er utilgængelig",
                         "firmware": "Firmware: {version}",
                         "hub": "Forbundet via",
-                        "logs": "logfiler",
                         "manuf": "af {manufacturer}",
                         "no_area": "Intet område",
                         "not_loaded": "Ikke indlæst",
-                        "options": "Indstillinger",
                         "provided_by_custom_integration": "Leveret af en brugerdefineret integration",
                         "reload": "Genindlæs",
                         "reload_confirm": "Integrationen blev genindlæst",
@@ -2277,7 +2305,11 @@
                             "open_site": "Åbn websted"
                         },
                         "finish": "Afslut",
-                        "loading_first_time": "Vent mens integrationen installeres",
+                        "loading": {
+                            "fallback_title": "integrationen",
+                            "loading_flow": "Vent, mens {integration} konfigureres",
+                            "loading_step": "Indlæser næste trin for {integration}"
+                        },
                         "next": "Næste",
                         "not_all_required_fields": "Ikke alle påkrævede felter er udfyldt.",
                         "not_loaded": "Integrationen kunne ikke indlæses, prøv at genstarte Home Assistant.",
@@ -2294,7 +2326,6 @@
                     "details": "Integrationsdetaljer",
                     "disable": {
                         "disabled_integrations": "{number} er deaktiveret",
-                        "hide_disabled": "Skjul deaktiverede integrationer",
                         "show": "Vis",
                         "show_disabled": "Vis deaktiverede integrationer"
                     },
@@ -2305,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Stop med at ignorere {name}?",
                         "confirm_ignore": "Er du sikker på, at du ikke vil konfigurere denne integration? Du kan fortryde dette ved at klikke på 'Vis ignorerede integrationer' i menuen øverst til højre.",
                         "confirm_ignore_title": "Ignorer fundet af {name}?",
-                        "hide_ignored": "Skjul ignorerede integrationer",
                         "ignore": "Ignorer",
                         "ignored": "Ignoreret",
                         "show_ignored": "Vis ignorerede integrationer",
@@ -2425,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfigurer",
                     "description_listen": "Lyt til et emne",
                     "description_publish": "Udsend en pakke",
                     "listening_to": "Lytter til",
@@ -2439,7 +2468,6 @@
                     "topic": "emne"
                 },
                 "ozw": {
-                    "button": "Konfigurer",
                     "common": {
                         "controller": "Controller",
                         "instance": "Instans",
@@ -2464,6 +2492,11 @@
                         "nodes": "Noder",
                         "select_instance": "Vælg Instans"
                     },
+                    "network": {
+                        "header": "Netværksadministration",
+                        "introduction": "Administrer funktioner for hele netværket.",
+                        "node_count": "{count} noder"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Alle noder er blevet forespurgt",
@@ -2484,10 +2517,9 @@
                         "starting": "Starter",
                         "unknown": "Ukendt"
                     },
-                    "network": {
-                        "header": "Netværksadministration",
-                        "introduction": "Administrer funktioner for hele netværket.",
-                        "node_count": "{count} noder"
+                    "node": {
+                        "button": "Nodeoplysninger",
+                        "not_found": "Noden blev ikke fundet"
                     },
                     "node_config": {
                         "header": "Konfiguration af node",
@@ -2517,10 +2549,6 @@
                         "versions": "Henter oplysninger om firmware- og kommandoklasseversioner",
                         "wakeup": "Konfigurerer understøttelse af vækningskøer og meddelelser"
                     },
-                    "node": {
-                        "button": "Nodeoplysninger",
-                        "not_found": "Noden blev ikke fundet"
-                    },
                     "nodes_table": {
                         "failed": "Mislykkedes",
                         "id": "Id",
@@ -2663,10 +2691,12 @@
                         },
                         "save_script": "Gem script",
                         "sequence": "Sekvens",
-                        "sequence_sentence": "Sekvensen af handlinger i dette script."
+                        "sequence_sentence": "Sekvensen af handlinger i dette script.",
+                        "show_trace": "Vis sporing"
                     },
                     "picker": {
                         "add_script": "Tilføj script",
+                        "dev_script": "Fejlfinding af script",
                         "duplicate": "Kopier",
                         "duplicate_script": "Kopier script",
                         "edit_script": "Rediger script",
@@ -2702,7 +2732,7 @@
                             "input_number": "Genindlæs inputnumre",
                             "input_select": "Genindlæs inputvalg",
                             "input_text": "Genindlæs inputtekster",
-                            "introduction": "Nogle dele af Home Assistant kan genindlæses uden en genstart. Tryk på genindlæs for at aflæse den nuværende YAML-konfiguration og indlæse den nye.",
+                            "introduction": "Nogle dele af Home Assistant kan genindlæses uden en genstart. Tryk på genindlæs for at erstatte den nuværende YAML-konfiguration med den nye.",
                             "min_max": "Genindlæs min / max entiteter",
                             "mqtt": "Genindlæs manuelt konfigurerede MQTT-entiteter",
                             "person": "Genindlæs personer",
@@ -2731,7 +2761,7 @@
                         "validation": {
                             "check_config": "Tjek konfiguration",
                             "heading": "Validering af konfiguration",
-                            "introduction": "Valider din konfiguration, hvis du for nylig har foretaget nogle ændringer i din konfiguration og vil sikre dig, at den er gyldig",
+                            "introduction": "Valider din konfiguration, hvis du for nylig har foretaget ændringer i konfigurationen og vil sikre dig, at den er gyldig",
                             "invalid": "Konfiguration ugyldig",
                             "valid": "Konfiguration gyldig!"
                         }
@@ -2823,7 +2853,6 @@
                         "search_again": "Søg igen",
                         "spinner": "Søger efter ZHA Zigbee-enheder..."
                     },
-                    "button": "Konfigurer",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Egenskaber for den valgte klynge",
                         "get_zigbee_attribute": "Hent Zigbee-egenskab",
@@ -2853,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Genveje",
-                        "update_button": "Opdater konfiguration",
-                        "zha_options": {
-                            "default_light_transition": "Standard overgangstid for lys (sekunder)",
-                            "enable_identify_on_join": "Aktiver identifikation, når enheder tilsluttes netværket",
-                            "title": "Globale indstillinger"
-                        }
+                        "update_button": "Opdater konfiguration"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Konfiguration fuldført",
@@ -2940,109 +2964,7 @@
                     "introduction": "Zoner giver dig mulighed for at angive bestemte områder på jorden. Når en person er inden for en zone, vil tilstanden antage navnet fra zonen. Zoner kan også bruges som udløser eller tilstand inde i automatiseringsopsætninger.",
                     "no_zones_created_yet": "Det ser ud til, at du ikke har oprettet nogen zoner endnu."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Afbryd inklusionstilstand",
-                        "controller_in_inclusion_mode": "Din Z-Wave-controller er nu i inklusionstilstand.",
-                        "follow_device_instructions": "Følg instruktionerne, der fulgte med din enhed for at starte parring af enheden.",
-                        "inclusion_failed": "Noden kunne ikke tilføjes. Se i logfilerne for at få flere oplysninger.",
-                        "inclusion_finished": "Noden er blevet tilføjet. Det kan tage et par minutter før alle enheder dukker op, mens konfiguration af noden fuldføres.",
-                        "interview_failed": "Forespørgsel af enheden er mislykkedes. Der kan være yderligere oplysninger i logfilerne.",
-                        "interview_started": "Enheden forespørges. Dette kan tage noget tid.",
-                        "introduction": "Denne guide hjælper dig med at føje en node til dit Z-Wave-netværk.",
-                        "secure_inclusion_warning": "Sikre enheder kræver ekstra båndbredde. For mange sikre enheder kan gøre dit Z-Wave-netværk langsomt. Det anbefaler kun at bruge sikker inklusion til de enheder, hvor det er nødvendigt. For eksempel til låse eller garageportåbnere.",
-                        "start_inclusion": "Start inklusionstilstand",
-                        "start_secure_inclusion": "Start sikker inklusionstilstand",
-                        "title": "Tilføj en Z-Wave-node",
-                        "use_secure_inclusion": "Brug sikker inklusionstilstand",
-                        "view_device": "Vis enhed"
-                    },
-                    "button": "Konfigurer",
-                    "common": {
-                        "add_node": "Tilføj node",
-                        "close": "Luk",
-                        "home_id": "Hjem-id",
-                        "network": "Netværk",
-                        "node_id": "Node-id",
-                        "remove_node": "Fjern node"
-                    },
-                    "dashboard": {
-                        "driver_version": "Driverversion",
-                        "dump_dead_nodes_text": "Nogle af dine noder svarede ikke og antages døde. De vil ikke blive eksporteret.",
-                        "dump_dead_nodes_title": "Nogle af dine noder er døde",
-                        "dump_debug": "Download et udtræk af dit netværk for at hjælpe med at diagnosticere problemer",
-                        "dump_not_ready_confirm": "Hent",
-                        "dump_not_ready_text": "Hvis du opretter en eksport, når ikke alle noder er klar, kan du mangle nødvendige data i udtrækket. Vent på, at dit netværk søger på alle noder. Vil du fortsætte med eksporten?",
-                        "dump_not_ready_title": "Ikke alle noder er klar endnu",
-                        "header": "Administrer dit Z-Wave-netværk",
-                        "home_id": "Hjem-id",
-                        "introduction": "Administrer dit Z-Wave-netværk og Z-Wave-noder",
-                        "nodes_ready": "Noder er klar",
-                        "server_version": "Serverversion"
-                    },
-                    "device_info": {
-                        "device_config": "Konfigurer enhed",
-                        "node_ready": "Node klar",
-                        "node_status": "Nodestatus",
-                        "zwave_info": "Z-Wave-info"
-                    },
-                    "logs": {
-                        "log_level": "Log niveau",
-                        "log_level_changed": "Logniveauet er ændret til: {level}",
-                        "subscribed_to_logs": "Abboner på Z-Wave JS Log beskeder",
-                        "title": "Z-Wave JS-logfiler"
-                    },
-                    "navigation": {
-                        "logs": "Logfiler",
-                        "network": "Netværk"
-                    },
-                    "network_status": {
-                        "connected": "Forbundet",
-                        "connecting": "Forbinder",
-                        "unknown": "Ukendt"
-                    },
-                    "node_config": {
-                        "attribution": "Enheds konfigurations parametre og beskrivelser leveres af {device_database}",
-                        "battery_device_notice": "Batterienheder skal være tændt for at opdatere deres konfiguration. Se din enhedsmanual for instruktioner om, hvordan du tænder enheden.",
-                        "error_device_not_found": "Enhed blev ikke fundet",
-                        "header": "Konfiguration af Z-Wave-enhed",
-                        "introduction": "Administrer og juster enheds (node) specifikke konfigurationsparametre for den valgte enhed",
-                        "parameter_is_read_only": "Denne parameter er skrivebeskyttet.",
-                        "set_param_accepted": "Parameteren er blevet opdateret.",
-                        "set_param_error": "Der opstod en fejl",
-                        "set_param_queued": "Parameterændringen er sat i kø, og vil blive udført når enheden vågner",
-                        "zwave_js_device_database": "Z-Wave JS-enhedsdatabasen"
-                    },
-                    "node_status": {
-                        "alive": "I live",
-                        "asleep": "Dvale",
-                        "awake": "Vågen",
-                        "dead": "Død",
-                        "unknown": "Ukendt"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Du skal vække batteridrevne enheder, inden du starter forespørgslen. Se enhedens manual for instruktioner om, hvordan du vækker enheden.",
-                        "in_progress": "Enheden forespørges. Dette kan tage noget tid.",
-                        "interview_complete": "Enhedsinformationsudveksling er færdig",
-                        "interview_failed": "Forespørgsel af enheden er mislykkedes. Der kan være yderligere oplysninger i logfilerne.",
-                        "introduction": "Gentag forespørgsel af en enhed på dit Z-Wave-netværk. Brug denne funktion, hvis enheden har manglende eller forkert funktionalitet.",
-                        "run_in_background": "Du kan lukke denne dialog og forespørgslen fortsætter i baggrunden.",
-                        "start_reinterview": "Gentag forespørgsel",
-                        "title": "Gentag forespørgsel af en Z-Wave enhed"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Annuller udelukkelse",
-                        "controller_in_exclusion_mode": "Din Z-Wave-controller er nu i eksklusionstilstand.",
-                        "exclusion_failed": "Noden kunne ikke fjernes. Se i logfilerne for at få flere oplysninger.",
-                        "exclusion_finished": "Node {id} er fjernet fra dit Z-Wave-netværk.",
-                        "follow_device_instructions": "Følg de anvisninger, der fulgte med enheden, for at foretage eksklusion på enheden.",
-                        "introduction": "Fjern en node fra dit Z-Wave-netværk, og fjern den tilknyttede enhed og entiteter fra Home Assistant.",
-                        "start_exclusion": "Start udelukkelse",
-                        "title": "Fjern en Z-Wave-node"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfigurer",
                     "common": {
                         "index": "Indeks",
                         "instance": "Instans",
@@ -3131,6 +3053,144 @@
                     "values": {
                         "header": "Knudepunktsværdier"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Afbryd inklusionstilstand",
+                        "controller_in_inclusion_mode": "Din Z-Wave-controller er nu i inklusionstilstand.",
+                        "follow_device_instructions": "Følg instruktionerne, der fulgte med din enhed for at starte parring af enheden.",
+                        "inclusion_failed": "Noden kunne ikke tilføjes. Se i logfilerne for at få flere oplysninger.",
+                        "inclusion_finished": "Noden er blevet tilføjet. Det kan tage et par minutter før alle enheder dukker op, mens konfiguration af noden fuldføres.",
+                        "interview_failed": "Forespørgsel af enheden er mislykkedes. Der kan være yderligere oplysninger i logfilerne.",
+                        "interview_started": "Enheden forespørges. Dette kan tage noget tid.",
+                        "introduction": "Denne guide hjælper dig med at føje en node til dit Z-Wave-netværk.",
+                        "secure_inclusion_warning": "Sikre enheder kræver ekstra båndbredde. For mange sikre enheder kan gøre dit Z-Wave-netværk langsomt. Det anbefaler kun at bruge sikker inklusion til de enheder, hvor det er nødvendigt. For eksempel til låse eller garageportåbnere.",
+                        "start_inclusion": "Start inklusionstilstand",
+                        "start_secure_inclusion": "Start sikker inklusionstilstand",
+                        "title": "Tilføj en Z-Wave-node",
+                        "use_secure_inclusion": "Brug sikker inklusionstilstand",
+                        "view_device": "Vis enhed"
+                    },
+                    "common": {
+                        "add_node": "Tilføj node",
+                        "close": "Luk",
+                        "heal_network": "Helbred netværk",
+                        "home_id": "Hjem-id",
+                        "network": "Netværk",
+                        "node_id": "Node-id",
+                        "reconfigure_server": "Konfigurer serveren igen",
+                        "remove_node": "Fjern node",
+                        "source": "Kilde"
+                    },
+                    "dashboard": {
+                        "driver_version": "Driverversion",
+                        "dump_dead_nodes_text": "Nogle af dine noder svarede ikke og antages døde. De vil ikke blive eksporteret.",
+                        "dump_dead_nodes_title": "Nogle af dine noder er døde",
+                        "dump_debug": "Download et udtræk af dit netværk for at hjælpe med at diagnosticere problemer",
+                        "dump_not_ready_confirm": "Hent",
+                        "dump_not_ready_text": "Hvis du opretter en eksport, når ikke alle noder er klar, kan du mangle nødvendige data i udtrækket. Vent på, at dit netværk søger på alle noder. Vil du fortsætte med eksporten?",
+                        "dump_not_ready_title": "Ikke alle noder er klar endnu",
+                        "header": "Administrer dit Z-Wave-netværk",
+                        "home_id": "Hjem-id",
+                        "introduction": "Administrer dit Z-Wave-netværk og Z-Wave-noder",
+                        "nodes_ready": "Noder er klar",
+                        "server_version": "Serverversion"
+                    },
+                    "device_info": {
+                        "device_config": "Konfigurer enhed",
+                        "heal_node": "Helbred knudepunkt",
+                        "node_ready": "Node klar",
+                        "node_status": "Nodestatus",
+                        "reinterview_device": "Gentag forespørgsel af en Z-Wave enhed",
+                        "remove_failed": "Fjern fejlbehæftet enhed",
+                        "zwave_info": "Z-Wave-info"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Netværkshelbredelsen er blevet afbrudt.",
+                        "healing_complete": "Netværkshelbredelsen er færdig.",
+                        "healing_failed": "Helbredelse mislykkedes. Yderligere oplysninger kan evt. findes i logfilerne.",
+                        "in_progress": "Netværkshelbredelse er i gang. Dette vil tage noget tid.",
+                        "introduction": "Start en helbredelse af dit Z-Wave-netværk. En netværkshelbredelse vil få alle enheder til at genberegne deres ruter tilbage til controlleren . Dette anbefales, hvis du for nylig har flyttet enheder eller din controller.",
+                        "run_in_background": "Du kan lukke dette vindue, og netværkshelbredelsen vil fortsætte i baggrunden.",
+                        "start_heal": "Start helbredelse",
+                        "stop_heal": "Stop helbredelsen",
+                        "title": "Helbred dit Z-Wave-netværk",
+                        "traffic_warning": "Helbredelsen medfører stor trafik på Z-Wave-netværket. Dette kan få enheder til at reagere langsomt (eller slet ikke), mens helbredelsen er i gang."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} er helbredt.",
+                        "healing_failed": "{device} kunne ikke helbredes.",
+                        "healing_failed_check_logs": "Yderligere oplysninger kan være tilgængelige i logfilerne.",
+                        "in_progress": "Helbredelse af {device} er i gang.",
+                        "introduction": "Bed {device} om at opdatere sine ruter tilbage til controlleren. Dette kan hjælpe med kommunikationsproblemer, hvis du for nylig har flyttet enheden eller controlleren.",
+                        "network_heal_in_progress": "En helbredelse af dit Z-Wave-netværk er allerede i gang. Vent til den er færdig, før du helbreder en individuel enhed.",
+                        "start_heal": "Helbred enhed",
+                        "title": "Helbred en Z-Wave-enhed",
+                        "traffic_warning": "Helbredelsen medfører stor trafik på Z-Wave-netværket. Dette kan få enheder til at reagere langsomt (eller slet ikke), mens helbredelsen er i gang."
+                    },
+                    "logs": {
+                        "log_level": "Log niveau",
+                        "log_level_changed": "Logniveauet er ændret til: {level}",
+                        "subscribed_to_logs": "Abboner på Z-Wave JS Log beskeder",
+                        "title": "Z-Wave JS-logfiler"
+                    },
+                    "navigation": {
+                        "logs": "Logfiler",
+                        "network": "Netværk"
+                    },
+                    "network_status": {
+                        "connected": "Forbundet",
+                        "connecting": "Forbinder",
+                        "unknown": "Ukendt"
+                    },
+                    "node_config": {
+                        "attribution": "Enheds konfigurations parametre og beskrivelser leveres af {device_database}",
+                        "battery_device_notice": "Batterienheder skal være tændt for at opdatere deres konfiguration. Se din enhedsmanual for instruktioner om, hvordan du tænder enheden.",
+                        "error_device_not_found": "Enhed blev ikke fundet",
+                        "header": "Konfiguration af Z-Wave-enhed",
+                        "introduction": "Administrer og juster enheds (node) specifikke konfigurationsparametre for den valgte enhed",
+                        "parameter": "Parameter",
+                        "parameter_is_read_only": "Denne parameter er skrivebeskyttet.",
+                        "set_param_accepted": "Parameteren er blevet opdateret.",
+                        "set_param_error": "Der opstod en fejl",
+                        "set_param_queued": "Parameterændringen er sat i kø, og vil blive udført når enheden vågner",
+                        "zwave_js_device_database": "Z-Wave JS-enhedsdatabasen"
+                    },
+                    "node_status": {
+                        "alive": "I live",
+                        "asleep": "Dvale",
+                        "awake": "Vågen",
+                        "dead": "Død",
+                        "unknown": "Ukendt"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Du skal vække batteridrevne enheder, inden du starter forespørgslen. Se enhedens manual for instruktioner om, hvordan du vækker enheden.",
+                        "in_progress": "Enheden forespørges. Dette kan tage noget tid.",
+                        "interview_complete": "Enhedsinformationsudveksling er færdig",
+                        "interview_failed": "Forespørgsel af enheden er mislykkedes. Der kan være yderligere oplysninger i logfilerne.",
+                        "introduction": "Gentag forespørgsel af en enhed på dit Z-Wave-netværk. Brug denne funktion, hvis enheden har manglende eller forkert funktionalitet.",
+                        "run_in_background": "Du kan lukke denne dialog og forespørgslen fortsætter i baggrunden.",
+                        "start_reinterview": "Gentag forespørgsel",
+                        "title": "Gentag forespørgsel af en Z-Wave enhed"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Fjernelse af enheden er i gang.",
+                        "introduction": "Fjern en fejlbehæftet enhed fra dit Z-Wave-netværk. Brug denne funktion, hvis du ikke kan udelukke en enhed normalt, fordi den er defekt.",
+                        "removal_failed": "Enheden kunne ikke fjernes fra dit Z-Wave-netværk.",
+                        "removal_finished": "Noden {id} er fjernet fra dit Z-Wave-netværk.",
+                        "remove_device": "Fjern enhed",
+                        "title": "Fjern en mislykket Z-Wave-enhed"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Annuller udelukkelse",
+                        "controller_in_exclusion_mode": "Din Z-Wave-controller er nu i eksklusionstilstand.",
+                        "exclusion_failed": "Noden kunne ikke fjernes. Se i logfilerne for at få flere oplysninger.",
+                        "exclusion_finished": "Node {id} er fjernet fra dit Z-Wave-netværk.",
+                        "follow_device_instructions": "Følg de anvisninger, der fulgte med enheden, for at foretage eksklusion på enheden.",
+                        "introduction": "Fjern en node fra dit Z-Wave-netværk, og fjern den tilknyttede enhed og entiteter fra Home Assistant.",
+                        "start_exclusion": "Start udelukkelse",
+                        "title": "Fjern en Z-Wave-node"
+                    }
                 }
             },
             "custom": {
@@ -3213,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Gå tilbage",
-                "supervisor": {
-                    "ask": "Bed om hjælp",
-                    "observer": "Tjek observatøren",
-                    "reboot": "Prøv at genstarte værten",
-                    "system_health": "Kontroller systemets tilstand",
-                    "title": "Panelet Supervisor kunne ikke indlæses!",
-                    "wait": "Hvis du lige er startet, skal du sørge for, at du har givet supervisoren tid nok til at starte."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Sidste uge",
-                    "this_week": "Denne uge",
-                    "today": "I dag",
-                    "yesterday": "I går"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Sidste uge",
-                    "this_week": "Denne uge",
-                    "today": "I dag",
-                    "yesterday": "I går"
+            "energy": {
+                "charts": {
+                    "by_device": "Forbrug pr. enhed",
+                    "solar": "Solceller",
+                    "stat_house_energy_meter": "Samlet energiforbrug"
+                },
+                "setup": {
+                    "back": "Tilbage",
+                    "done": "Vis overblik over mit energiforbrug",
+                    "next": "Næste"
                 }
             },
             "lovelace": {
@@ -3351,7 +3396,6 @@
                         "entities": {
                             "description": "Entiteter-kortet er det mest almindelige type kort. Det grupperer elementer på lister.",
                             "edit_special_row": "Se detaljerne for denne række ved at klikke på Rediger knappen",
-                            "entity_row_editor": "Rediger entitetsrække",
                             "entity_row": {
                                 "attribute": "Attribut",
                                 "button": "Knap",
@@ -3363,6 +3407,7 @@
                                 "section": "Afsnit",
                                 "weblink": "Weblink"
                             },
+                            "entity_row_editor": "Rediger entitetsrække",
                             "name": "Entiteter",
                             "secondary_info_values": {
                                 "brightness": "Lysstyrke",
@@ -3389,6 +3434,7 @@
                         "gauge": {
                             "description": "Målerkortet er et basalt kort, der gør det muligt visuelt at se sensordata.",
                             "name": "Måler",
+                            "needle_gauge": "Vis som nåleindikator?",
                             "severity": {
                                 "define": "Definer alvorlighed?",
                                 "green": "Grøn",
@@ -3401,6 +3447,7 @@
                             "attribute": "Egenskab",
                             "camera_image": "Kameraentitet",
                             "camera_view": "Kameravisning",
+                            "days_to_show": "Dage, der skal vises",
                             "double_tap_action": "Handling ved dobbelttryk",
                             "entities": "Entiteter",
                             "entity": "Entitet",
@@ -3514,6 +3561,10 @@
                             "integration_not_loaded": "Dette kort kræver, at 'shopping_list'-integrationen er konfigureret.",
                             "name": "Indkøbsliste"
                         },
+                        "statistics-graph": {
+                            "description": "Kortet Statistikgraf giver dig mulighed for at vise en graf over statistikkerne for hver af de anførte enheder.",
+                            "name": "Statistik graf"
+                        },
                         "thermostat": {
                             "description": "Termostatkortet giver kontrol over din klimaentitet. Giver dig mulighed for at ændre entitetens temperatur og tilstand.",
                             "name": "Termostat"
@@ -3583,6 +3634,12 @@
                         "tab_badges": "Badges",
                         "tab_settings": "Indstillinger",
                         "tab_visibility": "Synlighed",
+                        "type": "Vis type",
+                        "types": {
+                            "masonry": "Murværk (standard)",
+                            "panel": "Panel (1 kort)",
+                            "sidebar": "Sidemenu"
+                        },
                         "visibility": {
                             "select_users": "Vælg, hvilke brugere der skal se denne visning i navigationen"
                         }
@@ -3637,7 +3694,6 @@
                         "unsaved_changes": "Ikke-gemte ændringer"
                     },
                     "save_config": {
-                        "cancel": "Fortryd",
                         "close": "Luk",
                         "empty_config": "Start med et tomt betjeningspanel",
                         "header": "Tag kontrol over din 'Lovelace'-brugerflade",
@@ -3666,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Dette gengiver første kort i fuld bredde. Andre kort i denne visning vil ikke blive gengivet.",
-                            "title": "Paneltilstand?",
                             "warning_multiple_cards": "Denne visning indeholder mere end ét kort, men en panelvisning kan kun vise 1 kort."
                         }
                     }
@@ -3870,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Næste",
-                    "intro": "Del analysedata fra din installation. Delte data vil være offentligt tilgængelige på {link}"
+                    "finish": "Næste"
                 },
                 "core-config": {
                     "button_detect": "Detekter",
@@ -3891,19 +3944,17 @@
                 "intro": "Er du klar til at vække dit hjem til live, genvinde dit privatliv og blive medlem af et verdensomspændende fællesskab af tinkerers?",
                 "next": "Næste",
                 "restore": {
-                    "addons": "Tilføjelse",
-                    "confirm_password": "Bekræft Snapshot kodeord",
-                    "description": "Alternativt kan du gendanne fra et tidligere snapshot.",
-                    "folders": "Mappe",
-                    "full_snapshot": "Fuld snapshot",
+                    "addons": "Tilføjelsesprogrammer",
+                    "confirm_password": "Bekræft backup kodeord",
+                    "description": "Alternativt kan du gendanne fra et tidligere backup.",
+                    "folders": "Mapper",
                     "hide_log": "Skjul fuld log",
                     "in_progress": "Gendannelse er i gang",
-                    "partial_snapshot": "Delvis snapshot",
-                    "password": "Snapshot kodeord",
+                    "password": "Kodeord",
                     "password_protection": "Kodeordsbeskyttelse",
-                    "select_type": "Vælg det der skal genetableres",
+                    "select_type": "Vælg, hvad der skal gendannes",
                     "show_log": "Vis den fulde log",
-                    "type": "Snapshot type"
+                    "type": "Type"
                 },
                 "user": {
                     "create_account": "Opret konto",
@@ -3980,6 +4031,12 @@
                     "prompt_copy_token": "Kopier din adgangstoken. Den vil ikke blive vist igen.",
                     "prompt_name": "Giv tokenet et navn"
                 },
+                "mfa": {
+                    "confirm_disable": "Er du sikker på du vil deaktivere {name}?",
+                    "disable": "Deaktiver",
+                    "enable": "Aktiver",
+                    "header": "Multifaktor-godkendelsesmoduler"
+                },
                 "mfa_setup": {
                     "close": "Luk",
                     "step_done": "Opsætning af {step} færdig",
@@ -3987,12 +4044,6 @@
                     "title_aborted": "Afbrudt",
                     "title_success": "Succes!"
                 },
-                "mfa": {
-                    "confirm_disable": "Er du sikker på du vil deaktivere {name}?",
-                    "disable": "Deaktiver",
-                    "enable": "Aktiver",
-                    "header": "Multifaktor-godkendelsesmoduler"
-                },
                 "number_format": {
                     "description": "Vælg, hvordan tal formateres.",
                     "dropdown_label": "Talformat",
diff --git a/translations/frontend/de.json b/translations/frontend/de.json
index 0ce3529459..b3c6d8d81c 100644
--- a/translations/frontend/de.json
+++ b/translations/frontend/de.json
@@ -17,6 +17,7 @@
         "calendar": "Kalender",
         "config": "Einstellungen",
         "developer_tools": "Entwicklerwerkzeuge",
+        "energy": "Energie",
         "history": "Verlauf",
         "logbook": "Logbuch",
         "mailbox": "Posteingang",
@@ -26,6 +27,14 @@
         "shopping_list": "Einkaufsliste",
         "states": "Übersicht"
     },
+    "state": {
+        "default": {
+            "off": "Aus",
+            "on": "An",
+            "unavailable": "Nicht verfügbar",
+            "unknown": "Unbekannt"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Abwesend"
         }
     },
-    "state": {
-        "default": {
-            "off": "Aus",
-            "on": "An",
-            "unavailable": "Nicht verfügbar",
-            "unknown": "Unbekannt"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -168,7 +169,7 @@
                         "title": "Host-Netzwerk"
                     },
                     "host_pid": {
-                        "description": "In der Regel sind die Prozesse, die das Add-on ausführt, von allen anderen Systemprozessen isoliert. Der Add-on-Autor hat das Add-on aufgefordert, einen Zugriff auf die auf der Hostsysteminstanz ausgeführten Systemprozesse zu haben und dem Add-on auch das Erstellen von Prozessen auf dem Hostsystem zu ermöglichen. Dieser Modus gibt dem Add-on vollen Zugriff und Kontrolle auf Ihr gesamtes Home Assistant-System, was Sicherheitsrisiken erhöht und Ihr System beschädigen kann, wenn es missbraucht wird. Daher wirkt sich diese Funktion negativ auf den Add-on-Sicherheitsbewertung aus.\n\nDiese Zugriffsebene wird nicht automatisch gewährt und muss von dir bestätigt werden. Dazu musst du den Schutzmodus für das Add-on manuell deaktivieren. Deaktiviere den Schutzmodus nur, wenn du es wirklich musst UND der Quelle dieses Add-ons vertraust.",
+                        "description": "In der Regel sind die Prozesse, die das Add-on ausführt, von allen anderen Systemprozessen isoliert. Der Add-on-Autor hat das Add-on aufgefordert, einen Zugriff auf die auf der Hostsysteminstanz ausgeführten Systemprozesse zu haben und dem Add-on auch das Erstellen von Prozessen auf dem Hostsystem zu ermöglichen. Dieser Modus gibt dem Add-on vollen Zugriff und Kontrolle auf dein gesamtes Home Assistant-System, was Sicherheitsrisiken erhöht und dein System beschädigen kann, wenn es missbraucht wird. Daher wirkt sich diese Funktion negativ auf den Add-on-Sicherheitsbewertung aus.\n\nDiese Zugriffsebene wird nicht automatisch gewährt und muss von dir bestätigt werden. Dazu musst du den Schutzmodus für das Add-on manuell deaktivieren. Deaktiviere den Schutzmodus nur, wenn du es wirklich musst UND der Quelle dieses Add-ons vertraust.",
                         "title": "Namespace für Host-Prozesse"
                     },
                     "ingress": {
@@ -267,6 +268,26 @@
                 "not_installed": "Add-on ist nicht installiert"
             }
         },
+        "backup": {
+            "addons": "Add-ons",
+            "confirm_password": "Backup-Passwort bestätigen",
+            "could_not_create": "Datensicherung konnte nicht erstellt werden",
+            "create": "Erstellen",
+            "create_blocked_not_running": "Das Erstellen eines Backups ist derzeit nicht möglich, da sich das System im Zustand {state} befindet.",
+            "created": "Erstellt",
+            "delete_backup_confirm": "löschen",
+            "delete_selected": "Ausgewählten Backup löschen",
+            "enter_password": "Bitte Passwort eingeben.",
+            "failed_to_delete": "Löschen fehlgeschlagen",
+            "folders": "Ordner",
+            "name": "Backup-Name",
+            "password": "Backup-Passwort",
+            "password_protection": "Passwortschutz",
+            "passwords_not_matching": "Passwörter stimmen nicht überein",
+            "select_type": "Wähle aus, was wiederhergestellt werden soll",
+            "selected": "{number} ausgewählt",
+            "type": "Backup-Typ"
+        },
         "common": {
             "cancel": "Abbrechen",
             "close": "Schließen",
@@ -288,7 +309,7 @@
             "reset_options": "Einstellungen zurücksetzen",
             "restart": "Neustart",
             "restart_name": "{name} neu starten",
-            "running_version": "Du hast aktuell Version {version}",
+            "running_version": "Du verwendest Version {version}",
             "save": "Speichern",
             "show_more": "Zeige mehr Informationen",
             "update": "Aktualisieren",
@@ -366,9 +387,6 @@
                 "text": "Möchtest du das Add-on mit deinen Änderungen neu starten?"
             },
             "update": {
-                "create_snapshot": "Erstelle eine Datensicherung von {name} vor der Aktualisierung",
-                "snapshot": "Datensicherung",
-                "snapshotting": "Erstelle Datensicherung für {name}",
                 "updating": "Aktualisiere {name} auf Version {version}"
             }
         },
@@ -378,53 +396,14 @@
             "error_addon_not_found": "Add-on nicht gefunden",
             "error_addon_not_installed": "Das angeforderte Add-on ist nicht installiert. Bitte installiere es zuerst",
             "error_addon_not_started": "Das angeforderte Add-on läuft nicht. Bitte starte es zuerst",
-            "faq_link": "Häufig gestellten Fragen zu Home Assistant",
+            "faq_link": "Meine Home Assistant FAQ",
             "not_supported": "Diese Weiterleitung wird von deiner Home Assistant-Instanz nicht unterstützt. Überprüfe den {link} auf die unterstützten Weiterleitungen und die Version, in der sie eingeführt wurden."
         },
         "panel": {
             "dashboard": "Dashboard",
-            "snapshots": "Datensicherungen",
             "store": "Add-on Store",
             "system": "System"
         },
-        "snapshot": {
-            "addons": "Add-ons",
-            "available_snapshots": "Verfügbare Datensicherungen",
-            "confirm_password": "Snapshot-Passwort bestätigen",
-            "could_not_create": "Datensicherung konnte nicht erstellt werden",
-            "create": "Erstellen",
-            "create_blocked_not_running": "Das Erstellen eines Snapshots ist derzeit nicht möglich, da sich das System im Zustand {state} befindet.",
-            "create_snapshot": "Datensicherung erstellen",
-            "created": "Erstellt",
-            "delete_selected": "Ausgewählten Snapshot löschen",
-            "delete_snapshot_confirm": "löschen",
-            "delete_snapshot_text": "Möchtest du {number} {number, plural,\n  one {den Snapshot}\n other {die Snapshots}\n} löschen?",
-            "delete_snapshot_title": "Snapshot löschen",
-            "description": "Datensicherungen ermöglichen dir das leichte Speichern und Wiederherstellen von allen Daten aus Home Assistant.",
-            "enter_password": "Bitte Passwort eingeben.",
-            "failed_to_delete": "Löschen fehlgeschlagen",
-            "folder": {
-                "addons/local": "Lokale Add-ons",
-                "homeassistant": "Home Assistant-Konfiguration",
-                "media": "Medien",
-                "share": "Freigaben",
-                "ssl": "SSL"
-            },
-            "folders": "Ordner",
-            "full_snapshot": "Vollständige Datensicherung",
-            "name": "Snapshot-Name",
-            "no_snapshots": "Du hast bisher keine Datensicherungen erstellt.",
-            "partial_snapshot": "Selektive Datensicherung",
-            "password": "Snapshot-Passwort",
-            "password_protected": "Passwort geschützt",
-            "password_protection": "Passwortschutz",
-            "passwords_not_matching": "Passwörter stimmen nicht überein",
-            "security": "Sicherheit",
-            "select_type": "Wähle aus, was wiederhergestellt werden soll",
-            "selected": "{number} ausgewählt",
-            "type": "Snapshot-Typ",
-            "upload_snapshot": "Datensicherung hochladen"
-        },
         "store": {
             "missing_addons": "Fehlende Add-ons? Aktiviere den erweiterten Modus auf deiner Benutzerprofilseite",
             "no_results_found": "Keine Ergebnisse in {repository} gefunden",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Enddatum",
+                "ranges": {
+                    "last_week": "Letzte Woche",
+                    "this_week": "Diese Woche",
+                    "today": "Heute",
+                    "yesterday": "Gestern"
+                },
                 "select": "Auswählen",
                 "start_date": "Anfangsdatum"
             },
@@ -824,7 +809,7 @@
                 "show_trace": "Trace anzeigen"
             },
             "media-browser": {
-                "audio_not_supported": "Ihr Browser unterstützt das Audioelement nicht.",
+                "audio_not_supported": "Dein Browser unterstützt das Audioelement nicht.",
                 "choose_player": "Wähle ein Abspielgerät",
                 "class": {
                     "album": "Album",
@@ -851,10 +836,10 @@
                 "documentation": "Dokumentation",
                 "learn_adding_local_media": "Erfahre mehr über das Hinzufügen von Medien in der {documentation}.",
                 "local_media_files": "Platziere deine Video-, Audio- und Bilddateien im Medienverzeichnis, um sie im Browser oder auf unterstützten Mediaplayern durchsuchen und abspielen zu können.",
+                "media-player-browser": "Medien-Browser",
                 "media_browsing_error": "Fehler beim Durchsuchen der Medien",
                 "media_not_supported": "Der Browser Media Player unterstützt diese Art von Medien nicht",
                 "media_player": "Media Player",
-                "media-player-browser": "Medien-Browser",
                 "no_items": "Keine Einträge",
                 "no_local_media_found": "Keine lokalen Medien gefunden",
                 "no_media_folder": "Es sieht so aus, als hättest du noch kein Medienverzeichnis erstellt.",
@@ -863,7 +848,7 @@
                 "play": "Abspielen",
                 "play-media": "Medien abspielen",
                 "setup_local_help": "Lese die {documentation} über die Einrichtung lokaler Medien.",
-                "video_not_supported": "Ihr Browser unterstützt das Videoelement nicht.",
+                "video_not_supported": "Dein Browser unterstützt das Videoelement nicht.",
                 "web-browser": "Webbrowser"
             },
             "picture-upload": {
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Dienst"
             },
+            "statistic-picker": {
+                "learn_more": "Erfahre mehr über Statistiken",
+                "missing_entity": "Warum ist meine Entität nicht aufgeführt?",
+                "no_match": "Keine passenden Statistiken gefunden",
+                "no_statistics": "Du hast keine Statistiken",
+                "statistic": "Statistik"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Statistik wird geladen...",
+                "no_statistics_found": "Keine Statistik gefunden.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "mittlere",
+                    "min": "min",
+                    "sum": "Summe"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Bereich auswählen",
                 "add_device_id": "Gerät auswählen",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Optionen"
                 },
+                "loading": {
+                    "loading_flow": "Bitte warte, während die Optionen für {integration} initialisiert werden",
+                    "loading_step": "Nächster Schritt für {integration} wird geladen"
+                },
                 "success": {
                     "description": "Optionen wurden erfolgreich gespeichert."
                 }
@@ -1123,15 +1129,15 @@
                         "automation": "Automatisierungen",
                         "blueprint": "Vorlagen",
                         "core": "Allgemein",
-                        "customize": "Anpassungen",
+                        "customize": "Anpassung",
                         "devices": "Geräte",
+                        "energy": "Energie",
                         "entities": "Entitäten",
                         "helpers": "Helfer",
                         "info": "Info",
                         "integrations": "Integrationen",
                         "logs": "Logs",
                         "lovelace": "Lovelace Dashboards",
-                        "navigate_to": "Navigiere zu {panel}",
                         "person": "Personen",
                         "scene": "Szenen",
                         "script": "Skripte",
@@ -1143,12 +1149,12 @@
                     "reload": {
                         "automation": "Automatisierungen",
                         "command_line": "Kommandozeilen-Entitäten",
-                        "core": "Positionsdaten & Anpassungen",
+                        "core": "Ort & Anpassungen",
                         "filesize": "Dateigröße-Entitäten",
                         "filter": "Filter-Entitäten",
                         "generic": "Allgemeine IP-Kamera Entitäten",
                         "generic_thermostat": "Generische Thermostatentitäten",
-                        "group": "Gruppen, Gruppenentitäten und Benachrichtigungsservices",
+                        "group": "Gruppen, Gruppenentitäten und Benachrichtigungsdienste",
                         "history_stats": "Verlaufsstatistik-Entitäten",
                         "homekit": "HomeKit",
                         "input_boolean": "Eingabe-Booleans",
@@ -1175,7 +1181,7 @@
                     },
                     "server_control": {
                         "perform_action": "Server {action}",
-                        "restart": "Neustarten",
+                        "restart": "Neu starten",
                         "stop": "Stoppen"
                     },
                     "types": {
@@ -1227,7 +1233,7 @@
             },
             "zha_reconfigure_device": {
                 "attribute": "Attribut",
-                "battery_device_warning": "Sie müssen batteriebetriebene Geräte aktivieren, bevor Sie den Neukonfigurationsvorgang starten. Anweisungen zum Aktivieren des Geräts finden Sie im Handbuch Ihres Geräts.",
+                "battery_device_warning": "Du musst batteriebetriebene Geräte aktivieren, bevor du den Neukonfigurationsvorgang startest. Anweisungen zum Aktivieren des Geräts findest du im Handbuch deines Geräts.",
                 "bind_header": "Bindung",
                 "button_hide": "Details ausblenden",
                 "button_show": "Details anzeigen",
@@ -1237,10 +1243,10 @@
                 "configuring_alt": "Konfigurieren",
                 "heading": "Gerät neu konfigurieren",
                 "in_progress": "Das Gerät wird neu konfiguriert. Dies könnte eine Weile dauern.",
-                "introduction": "Konfigurieren Sie ein Gerät in Ihrem Zigbee-Netzwerk neu. Verwenden Sie diese Funktion, wenn Ihr Gerät nicht ordnungsgemäß funktioniert.",
+                "introduction": "Konfiguriere ein Gerät in deinem Zigbee-Netzwerk neu. Verwende diese Funktion, wenn dein Gerät nicht ordnungsgemäß funktioniert.",
                 "min_max_change": "min/max/change",
                 "reporting_header": "Reporting",
-                "run_in_background": "Sie können diesen Dialog schließen und die Neukonfiguration wird im Hintergrund fortgesetzt.",
+                "run_in_background": "Du kannst diesen Dialog schließen und die Neukonfiguration wird im Hintergrund fortgesetzt.",
                 "start_reconfiguration": "Neukonfiguration starten"
             }
         },
@@ -1360,7 +1366,6 @@
                             "introduction": "Aktionen werden von Home Assistant ausgeführt, wenn Automatisierungen ausgelöst werden.",
                             "learn_more": "Erfahre mehr über Aktionen",
                             "name": "Aktion",
-                            "type_select": "Aktionstyp",
                             "type": {
                                 "choose": {
                                     "add_option": "Option hinzufügen",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Wiederholen",
                                     "sequence": "Aktionen",
-                                    "type_select": "Wiederholungstyp",
                                     "type": {
                                         "count": {
                                             "label": "Anzahl"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Während-Bedingungen",
                                             "label": "Während"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Wiederholungstyp"
                                 },
                                 "scene": {
                                     "label": "Szene aktivieren"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Warte-Template"
                                 }
                             },
+                            "type_select": "Aktionstyp",
                             "unsupported_action": "Visueller Editor nicht unterstützt für Aktion: {action}"
                         },
                         "alias": "Name",
@@ -1452,7 +1458,6 @@
                             "introduction": "Die Bedingungen sind optional und verhindern die weitere Ausführung, sofern nicht alle Bedingungen erfüllt sind.",
                             "learn_more": "Erfahre mehr über Bedingungen",
                             "name": "Zustand",
-                            "type_select": "Bedingungstyp",
                             "type": {
                                 "and": {
                                     "label": "Und"
@@ -1501,7 +1506,7 @@
                                     "after": "Nach",
                                     "before": "Vor",
                                     "label": "Zeit",
-                                    "type_input": "Wert eines Datum/Zeit-Helfers",
+                                    "type_input": "Wert eines Datums-/Zeit-Helfers",
                                     "type_value": "Feste Zeit",
                                     "weekdays": {
                                         "fri": "Freitag",
@@ -1524,6 +1529,7 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Bedingungstyp",
                             "unsupported_condition": "Visueller Editor nicht unterstützt für Bedingung: {condition}"
                         },
                         "copy_to_clipboard": "In die Zwischenablage kopieren",
@@ -1565,7 +1571,6 @@
                             "introduction": "Auslöser starten automatisierte Abläufe. Es ist möglich, mehrere Auslöser für dieselbe Abfolge zu definieren. Wenn ein Auslöser aktiviert wird, prüft Home Assistant die Bedingungen, sofern vorhanden, und führt die Aktion aus.",
                             "learn_more": "Erfahre mehr über Auslöser",
                             "name": "Auslöser",
-                            "type_select": "Auslösertyp",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1636,18 @@
                                     "label": "Template",
                                     "value_template": "Wert-Template"
                                 },
-                                "time_pattern": {
-                                    "hours": "Stunden",
-                                    "label": "Zeitraster",
-                                    "minutes": "Minuten",
-                                    "seconds": "Sekunden"
-                                },
                                 "time": {
                                     "at": "Um",
                                     "label": "Zeit",
                                     "type_input": "Wert eines Datums-/Zeit-Helfers",
                                     "type_value": "Feste Zeit"
                                 },
+                                "time_pattern": {
+                                    "hours": "Stunden",
+                                    "label": "Zeitraster",
+                                    "minutes": "Minuten",
+                                    "seconds": "Sekunden"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1656,9 +1661,10 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Auslösertyp",
                             "unsupported_platform": "Visueller Editor nicht unterstützt für Plattform: {platform}"
                         },
-                        "unsaved_confirm": "Sie haben ungespeicherte Änderungen. Sind Sie sicher, dass Sie den Editor verlassen möchten?"
+                        "unsaved_confirm": "Du hast ungespeicherte Änderungen. Bist du dir sicher, dass du den Editor verlassen möchtest?"
                     },
                     "picker": {
                         "add_automation": "Automatisierung hinzufügen",
@@ -1673,7 +1679,7 @@
                         "headers": {
                             "name": "Name"
                         },
-                        "introduction": "Mit dem Automations-Editor können Automatisierungen erstellt und bearbeitet werden. Bitte folgen Sie dem nachfolgenden Link, um die Anleitung zu lesen und um sicherzustellen, dass Sie Home Assistant richtig konfiguriert haben.",
+                        "introduction": "Mit dem Automations-Editor können Automatisierungen erstellt und bearbeitet werden. Bitte folge dem nachfolgenden Link, um die Anleitung zu lesen und um sicherzustellen, dass du Home Assistant richtig konfiguriert hast.",
                         "learn_more": "Erfahre mehr über Automatisierungen",
                         "no_automations": "Wir konnten keine Automatisierungen finden",
                         "only_editable": "Nur Automatisierungen in automations.yaml sind editierbar.",
@@ -1705,7 +1711,7 @@
                         "header": "Vorlage importieren",
                         "import_btn": "Vorschau Vorlage",
                         "import_header": "Vorlage \"{name}\"",
-                        "import_introduction_link": "Du kannst Blaupausen anderer Benutzer aus GitHub und den {community_link} importieren. Gib unten die URL der Blaupause ein.",
+                        "import_introduction_link": "Du kannst Vorlagen anderer Benutzer aus GitHub und den {community_link} importieren. Gib unten die URL der Vorlage ein.",
                         "importing": "Vorlage wird geladen...",
                         "raw_blueprint": "Inhalt der Vorlage",
                         "save_btn": "Vorlage importieren",
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "Deine Instanz wird verfügbar sein unter",
                             "link_learn_how_it_works": "Lerne, wie es funktioniert",
                             "not_connected": "Nicht verbunden",
+                            "reconnecting": "Verbindung wird wiederhergestellt...",
                             "remote_enabled": {
                                 "caption": "Automatisch verbinden",
                                 "description": "Aktiviere diese Option um sicherzustellen dass deine Home Assistant Instanz immer aus der Ferne erreichbar ist."
@@ -1818,9 +1825,9 @@
                             "loading": "Wird geladen ...",
                             "manage": "Verwalten",
                             "no_hooks_yet": "Sieht so aus, als gäbe es noch keine Webhooks. Beginne mit der Konfiguration eines ",
+                            "no_hooks_yet2": "oder durch Erstellen eines",
                             "no_hooks_yet_link_automation": "Webhook-Automatisierung",
                             "no_hooks_yet_link_integration": "Webhook-basierte Integration",
-                            "no_hooks_yet2": "oder durch Erstellen eines",
                             "title": "Webhooks"
                         }
                     },
@@ -1862,7 +1869,7 @@
                         "check_your_email": "In deinen E-Mails findest du die Anweisungen zum Zurücksetzen deines Passworts.",
                         "email": "E-Mail",
                         "email_error_msg": "Ungültige E-Mail",
-                        "instructions": "Gib deine E-Mail-Adresse ein und wir senden dir einen Link zum Zurücksetzen Ihres Passworts.",
+                        "instructions": "Gib deine E-Mail-Adresse ein und wir senden dir einen Link zum Zurücksetzen deines Passworts.",
                         "send_reset_email": "Reset-E-Mail senden",
                         "subtitle": "Passwort vergessen",
                         "title": "Passwort vergessen"
@@ -1935,41 +1942,13 @@
                     "description": "Mengeneinheiten, Standort, Zeitzone & andere allgemeine Parameter",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Bevor du dies aktivierst, stelle sicher, dass du die Statistik Dokumentationsseite {link} besuchst, um zu verstehen, was gesendet und gespeichert wird.",
-                                "header": "Statistiken",
-                                "instance_id": "Instanz-ID: {huuid}",
-                                "introduction": "Teile deine Installationsinformationen, um Home Assistant zu verbessern und Hersteller davon zu überzeugen, lokale Steuerungs- und Datenschutzfunktionen hinzuzufügen.",
-                                "learn_more": "Wie werden deine Daten verarbeitet",
-                                "needs_base": "Du musst die Basisstatistiken aktivieren, damit diese Option verfügbar ist",
-                                "preference": {
-                                    "base": {
-                                        "description": "Instanz-ID, Version und Installationstyp.",
-                                        "title": "Grundlegende Statistiken"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Teile Absturzberichte, wenn unerwartete Fehler auftreten.",
-                                        "title": "Diagnoseinformationen"
-                                    },
-                                    "statistics": {
-                                        "description": "Anzahl verwendeter Entitäten, Benutzer und anderer Elemente.",
-                                        "title": "Nutzungsstatistiken"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Namen, Versionen und Funktionen.",
-                                        "title": "Verwendete Integrationen und Add-ons"
-                                    },
-                                    "usage": {
-                                        "description": "Namen und Versionsinformationen.",
-                                        "title": "Verwendete Integrationen"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Währung",
                                 "edit_requires_storage": "Editor deaktiviert, da die Konfiguration in configuration.yaml gespeichert ist.",
                                 "elevation": "Höhe",
                                 "elevation_meters": "Meter",
                                 "external_url": "Externe URL",
+                                "find_currency_value": "Finde deinen Wert",
                                 "imperial_example": "Fahrenheit, Pfund",
                                 "internal_url": "Interne URL",
                                 "latitude": "Breitengrad",
@@ -2098,6 +2077,63 @@
                     "update": "Aktualisieren",
                     "update_device_error": "Aktualisieren des Geräts fehlgeschlagen"
                 },
+                "energy": {
+                    "caption": "Energie",
+                    "description": "Überwache deine Energieproduktion und deinen Verbrauch",
+                    "device_consumption": {
+                        "add_stat": "Wähle eine Entität aus, um deren Energie zu tracken",
+                        "dialog": {
+                            "selected_stat_intro": "Wähle die Entität, die den Energieverbrauch des Geräts darstellt."
+                        },
+                        "learn_more": "Weitere Informationen zum Einstieg.",
+                        "selected_stat": "Energie tracken für",
+                        "sub": "Durch die Nachverfolgung des Energieverbrauchs einzelner Geräte kann Home Assistant deinen Energieverbrauch nach Geräten aufteilen.",
+                        "title": "Einzelne Geräte"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Verwende eine Entität mit aktuellem Preis",
+                                "cost_entity_input": "Entität mit dem aktuellen Preis",
+                                "cost_number": "Verwende einen statischen Preis",
+                                "cost_number_input": "Preis pro kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Wähle aus, wie Home Assistant die Kosten der verbrauchten Energie verfolgen soll.",
+                                "cost_stat": "Verwende eine Entität, die die Gesamtkosten verfolgt",
+                                "cost_stat_input": "Gesamtkosten-Entität",
+                                "energy_stat": "Verbrauchte Energie (kWh)",
+                                "header": "Netzverbrauch konfigurieren",
+                                "no_cost": "Kosten nicht verfolgen",
+                                "paragraph": "Der Netzverbrauch ist die Energie, die aus dem Energienetz zu deinem Haus fließt."
+                            },
+                            "to": {
+                                "cost_entity": "Verwende eine Entität mit aktuellem Preis",
+                                "cost_entity_input": "Entität mit dem aktuellen Preis",
+                                "cost_number": "Verwende einen statischen Preis",
+                                "cost_number_input": "Preis pro kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Bekommst du Geld zurück, wenn du Energie ins Netz zurückspeist?",
+                                "cost_stat": "Verwende eine Entität, die das gesamte erhaltene Geld verfolgt",
+                                "cost_stat_input": "Gesamtvergütungs-Entität",
+                                "energy_stat": "In das Netz zurückgespeiste Energie (kWh)",
+                                "header": "Netzeinspeisung konfigurieren",
+                                "no_cost": "Ich bekomme kein Geld zurück",
+                                "paragraph": "Die Netzeinspeisung ist die Energie, die von deinen Solarmodulen ins Netz eingespeist wird."
+                            }
+                        },
+                        "learn_more": "Weitere Informationen zum Einstieg.",
+                        "sub": "Konfiguriere die Energiemenge, die du aus dem Netz verbrauchst, und wenn du Energie erzeugst, an das Netz zurückgibst. Auf diese Weise kann Home Assistant den Energieverbrauch deines gesamten Hauses verfolgen.",
+                        "title": "Stromnetz"
+                    },
+                    "solar": {
+                        "learn_more": "Weitere Informationen zum Einstieg.",
+                        "stat_predicted_production": "Vorhersage deiner Solarstromproduktion",
+                        "stat_production": "Deine Solarstromproduktion",
+                        "stat_return_to_grid": "Solarenergie ins Netz zurückgespeist",
+                        "sub": "Lass Home Assistant deine Solarmodule überwachen und dir Einblick in deren Leistung geben.",
+                        "title": "Sonnenkollektoren"
+                    }
+                },
                 "entities": {
                     "caption": "Entitäten",
                     "description": "Bekannte Entitäten verwalten",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Löschen",
-                    "filtering_by": "Filtern nach",
-                    "show": "Anzeigen"
-                },
-                "hassio": {
-                    "button": "Konfigurieren"
-                },
                 "header": "Home Assistant konfigurieren",
                 "helpers": {
                     "caption": "Helfer",
@@ -2205,16 +2233,11 @@
                     "server": "Server",
                     "setup_time": "Setup-Dauer",
                     "source": "Quelle:",
-                    "system_health_error": "System Health-Komponente wird nicht geladen. Füge 'system_health:' zu configuration.yaml hinzu",
                     "system_health": {
                         "manage": "Verwalten",
                         "more_info": "Mehr Info"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Integrationsseite",
-                    "missing_zha": "Vermisst du das ZHA-Konfigurationspanel? Es wurde in den ZHA-Eintrag auf der {integrations_page} verschoben.",
-                    "missing_zwave": "Vermisst du das Z-Wave-Konfigurationspanel? Es wurde in den Z-Wave-Eintrag auf der {integrations_page} verschoben."
+                    },
+                    "system_health_error": "System Health-Komponente wird nicht geladen. Füge 'system_health:' zu configuration.yaml hinzu"
                 },
                 "integrations": {
                     "add_integration": "Integration hinzufügen",
@@ -2222,15 +2245,13 @@
                     "caption": "Integrationen",
                     "config_entry": {
                         "area": "In {area}",
-                        "check_the_logs": "Prüfen Sie die Protokolle",
+                        "check_the_logs": "Prüfe die Protokolle",
                         "configure": "Konfigurieren",
                         "delete": "Löschen",
                         "delete_confirm": "Möchtest du diese Integration wirklich löschen?",
                         "depends_on_cloud": "Abhängig von der Cloud",
                         "device_unavailable": "Gerät nicht verfügbar",
                         "devices": "{count} {count, plural,\n one {Gerät}\n other {Geräte}\n}",
-                        "disable_error": "Aktivieren oder Deaktivieren der Integration fehlgeschlagen",
-                        "disable_restart_confirm": "Home Assistant neu starten, um das Deaktivieren dieser Integration abzuschließen",
                         "disable": {
                             "disable_confirm": "Möchtest du diesen Konfigurationseintrag wirklich deaktivieren? Die Geräte und Entitäten werden deaktiviert.",
                             "disabled": "Deaktiviert",
@@ -2241,18 +2262,18 @@
                             },
                             "disabled_cause": "Deaktiviert durch {cause}."
                         },
-                        "disabled_polling": "Automatisches Abfragen nach aktualisierten Daten deaktiviert",
+                        "disable_error": "Aktivieren oder Deaktivieren der Integration fehlgeschlagen",
+                        "disable_restart_confirm": "Home Assistant neu starten, um das Deaktivieren dieser Integration abzuschließen",
+                        "disabled_polling": "Automatisches Abfragen von aktualisierten Daten deaktiviert",
                         "documentation": "Dokumentation",
                         "enable_restart_confirm": "Home Assistant neu starten, um das Aktivieren dieser Integration abzuschließen",
                         "entities": "{count} {count, plural,\none {Entität}\nother {Entitäten}\n}",
                         "entity_unavailable": "Entität nicht verfügbar",
                         "firmware": "Firmware: {version}",
                         "hub": "Verbunden über",
-                        "logs": "Logs",
                         "manuf": "von {manufacturer}",
                         "no_area": "Kein Bereich",
                         "not_loaded": "Nicht geladen",
-                        "options": "Optionen",
                         "provided_by_custom_integration": "Bereitgestellt durch eine benutzerdefinierte Integration",
                         "reload": "Neu laden",
                         "reload_confirm": "Die Integration wurde neu geladen",
@@ -2280,11 +2301,15 @@
                         "error": "Fehler",
                         "error_saving_area": "Fehler beim Speichern des Bereichs: {error}",
                         "external_step": {
-                            "description": "Für diesen Schritt müssen Sie eine externe Website besuchen, um den Vorgang abzuschließen.",
+                            "description": "Für diesen Schritt musst du eine externe Website besuchen, um den Vorgang abzuschließen.",
                             "open_site": "Website öffnen"
                         },
                         "finish": "Fertig",
-                        "loading_first_time": "Bitte warten, während die Integration installiert wird",
+                        "loading": {
+                            "fallback_title": "die Integration",
+                            "loading_flow": "Bitte warte, während die {integration} eingerichtet wird",
+                            "loading_step": "Nächster Schritt für {integration} wird geladen"
+                        },
                         "next": "Weiter",
                         "not_all_required_fields": "Nicht alle Pflichtfelder sind ausgefüllt.",
                         "not_loaded": "Die Integration konnte nicht geladen werden. Versuche Home Assistant neu zu starten.",
@@ -2301,7 +2326,6 @@
                     "details": "Details zur Integration",
                     "disable": {
                         "disabled_integrations": "{number} deaktiviert",
-                        "hide_disabled": "Deaktivierte Integrationen ausblenden",
                         "show": "Anzeigen",
                         "show_disabled": "Deaktivierte Integrationen anzeigen"
                     },
@@ -2312,7 +2336,6 @@
                         "confirm_delete_ignore_title": "{name} nicht mehr ignorieren?",
                         "confirm_ignore": "Bist du sicher, dass du diese Integration nicht einrichten willst? Du kannst dies rückgängig machen, indem du im Kontextmenü oben rechts auf 'Ignorierte Integrationen anzeigen' klickst.",
                         "confirm_ignore_title": "Ignoriere die Entdeckung von {name}?",
-                        "hide_ignored": "Ignorierte Integrationen ausblenden",
                         "ignore": "Ignorieren",
                         "ignored": "Ignoriert",
                         "show_ignored": "Ignorierte Integrationen anzeigen",
@@ -2339,7 +2362,7 @@
                     "custom_integration": "benutzerdefinierte Integration",
                     "description": "Home Assistant Logs einsehen",
                     "details": "Protokolldetails ({level})",
-                    "error_from_custom_integration": "benutzerdefinierte",
+                    "error_from_custom_integration": "Dieser Fehler wurde von einer benutzerdefinierten Integration verursacht",
                     "level": {
                         "critical": "KRITISCH",
                         "debug": "DEBUG",
@@ -2432,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfigurieren",
                     "description_listen": "Auf einen Topic hören",
                     "description_publish": "Ein Paket veröffentlichen",
                     "listening_to": "Anhören von",
@@ -2446,7 +2468,6 @@
                     "topic": "Topic"
                 },
                 "ozw": {
-                    "button": "Konfigurieren",
                     "common": {
                         "controller": "Controller",
                         "instance": "Instanz",
@@ -2471,6 +2492,11 @@
                         "nodes": "Knoten",
                         "select_instance": "Instanz auswählen"
                     },
+                    "network": {
+                        "header": "Netzwerkverwaltung",
+                        "introduction": "Verwalten der Netzwerk-Funktionen.",
+                        "node_count": "{count} Knoten"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Alle Knoten wurden abgefragt",
@@ -2491,16 +2517,15 @@
                         "starting": "Startet",
                         "unknown": "Unbekannt"
                     },
-                    "network": {
-                        "header": "Netzwerkverwaltung",
-                        "introduction": "Verwalten der Netzwerk-Funktionen.",
-                        "node_count": "{count} Knoten"
+                    "node": {
+                        "button": "Gerätedetails",
+                        "not_found": "Gerät nicht gefunden."
                     },
                     "node_config": {
                         "header": "Knotenkonfiguration",
                         "help_source": "Hilfetexte und Beschreibungen der Konfigurationsparameter stellt das OpenZWave-Projekt zur Verfügung.",
-                        "introduction": "Verwalten Sie die verschiedenen Konfigurationsparameter für einen Z-Wave Knoten.",
-                        "wakeup_help": "Batteriebetriebene Knoten müssen wach sein, um ihre Konfiguration zu ändern. Wenn der Knoten nicht aktiv ist, versucht OpenZWave beim nächsten Aufwachen, die Konfiguration des Knotens zu aktualisieren. Dies kann mehrere Stunden (oder Tage) später sein. Führen Sie die folgenden Schritte aus, um Ihr Gerät zu aktivieren:"
+                        "introduction": "Verwalte die verschiedenen Konfigurationsparameter für einen Z-Wave Knoten.",
+                        "wakeup_help": "Batteriebetriebene Knoten müssen wach sein, um ihre Konfiguration zu ändern. Wenn der Knoten nicht aktiv ist, versucht OpenZWave beim nächsten Aufwachen, die Konfiguration des Knotens zu aktualisieren. Dies kann mehrere Stunden (oder Tage) später sein. Führe die folgenden Schritte aus, um dein Gerät zu aktivieren:"
                     },
                     "node_metadata": {
                         "product_manual": "Produkthandbuch"
@@ -2524,10 +2549,6 @@
                         "versions": "Abrufen von Informationen zu Firmware- und Befehlsklassenversionen",
                         "wakeup": "Unterstützung für Weckwarteschlangen und Nachrichten einrichten"
                     },
-                    "node": {
-                        "button": "Gerätedetails",
-                        "not_found": "Gerät nicht gefunden."
-                    },
                     "nodes_table": {
                         "failed": "Fehlgeschlagen",
                         "id": "ID",
@@ -2832,7 +2853,6 @@
                         "search_again": "Erneut suchen",
                         "spinner": "Suche nach ZHA Zigbee Geräten..."
                     },
-                    "button": "Konfigurieren",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attribute des ausgewählten Clusters",
                         "get_zigbee_attribute": "Zigbee-Attribut abrufen",
@@ -2862,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Verknüpfungen",
-                        "update_button": "Konfiguration aktualisieren",
-                        "zha_options": {
-                            "default_light_transition": "Standard-Lichtübergangszeit (Sekunden)",
-                            "enable_identify_on_join": "Aktivieren Sie den Identifikationseffekt, wenn Geräte dem Netzwerk beitreten",
-                            "title": "Globale Optionen"
-                        }
+                        "update_button": "Konfiguration aktualisieren"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Konfiguration abgeschlossen",
@@ -2949,123 +2964,7 @@
                     "introduction": "Mit Zonen kannst du bestimmte Regionen auf der Erde angeben. Befindet sich eine Person in einer Zone, übernimmt der Zustand den Namen aus der Zone. Zonen können auch als Auslöser oder Bedingung in Automatisierungs-Setups verwendet werden.",
                     "no_zones_created_yet": "Es sieht so aus, als hättest du noch keine Zonen erstellt."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Erfassung abbrechen",
-                        "controller_in_inclusion_mode": "Ihr Z-Wave-Controller befindet sich jetzt im Inklusionsmodus.",
-                        "follow_device_instructions": "Befolge die mit dem Gerät gelieferten Anweisungen, um die Kopplung am Gerät auszulösen.",
-                        "inclusion_failed": "Der Knoten konnte nicht hinzugefügt werden. Bitte überprüfe die Protokolle für weitere Informationen.",
-                        "inclusion_finished": "Der Knoten wurde hinzugefügt.",
-                        "interview_failed": "Das Geräteinterview ist fehlgeschlagen. Zusätzliche Informationen sind möglicherweise in den Logs verfügbar.",
-                        "interview_started": "Das Gerät wird gerade eingerichtet. Dies könnte eine Weile dauern.",
-                        "introduction": "Dieser Assistent führt dich durch das Hinzufügen eines Knotens zu deinem Z-Wave-Netzwerk.",
-                        "secure_inclusion_warning": "Sichere Geräte benötigen zusätzliche Bandbreite; zu viele sichere Geräte können Ihr Z-Wave-Netzwerk ausbremsen. Wir empfehlen, die sichere Einbindung nur für Geräte zu verwenden, die sie benötigen, wie Schlösser oder Garagentoröffner.",
-                        "start_inclusion": "Starten der Erfassung",
-                        "start_secure_inclusion": "Starten der sicheren Erfassung",
-                        "title": "Z-Wave-Knoten hinzufügen",
-                        "use_secure_inclusion": "Sichere Einbindung verwenden",
-                        "view_device": "Gerät anzeigen"
-                    },
-                    "button": "Konfigurieren",
-                    "common": {
-                        "add_node": "Knoten hinzufügen",
-                        "close": "Schließen",
-                        "heal_network": "Netzwerk heilen",
-                        "home_id": "Heim-ID",
-                        "network": "Netzwerk",
-                        "node_id": "Knoten-ID",
-                        "reconfigure_server": "Server neu konfigurieren",
-                        "remove_node": "Knoten entfernen"
-                    },
-                    "dashboard": {
-                        "driver_version": "Treiberversion",
-                        "dump_dead_nodes_text": "Einige deiner Knoten haben nicht geantwortet und gelten als tot. Diese werden nicht vollständig exportiert.",
-                        "dump_dead_nodes_title": "Einige deiner Knoten sind tot",
-                        "dump_debug": "Lade einen Dump deines Netzwerks herunter, um Probleme zu diagnostizieren",
-                        "dump_not_ready_confirm": "Herunterladen",
-                        "dump_not_ready_text": "Wenn du einen Export erstellst, während nicht alle Knoten bereit sind, können benötigte Daten fehlen. Gib deinem Netzwerk etwas Zeit, um alle Knoten abzufragen. Möchtest du mit dem Dump fortfahren?",
-                        "dump_not_ready_title": "Es sind noch nicht alle Knoten bereit",
-                        "header": "Verwalte dein Z-Wave-Netzwerk",
-                        "home_id": "Heim-ID",
-                        "introduction": "Verwalte dein Z-Wave-Netzwerk und Z-Wave-Knoten",
-                        "nodes_ready": "Knoten bereit",
-                        "server_version": "Serverversion"
-                    },
-                    "device_info": {
-                        "device_config": "Gerät konfigurieren",
-                        "node_ready": "Node Bereit",
-                        "node_status": "Node Status",
-                        "zwave_info": "Z-Wave Info"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Die Netzwerkheilung wurde abgebrochen.",
-                        "healing_complete": "Die Netzwerkheilung ist abgeschlossen.",
-                        "healing_failed": "Heilung fehlgeschlagen. Zusätzliche Informationen könnten in den Protokollen verfügbar sein.",
-                        "in_progress": "Die Netzwerkheilung ist im Gange. Dies wird einige Zeit in Anspruch nehmen.",
-                        "introduction": "Startet einen Netzwerk-Heal im Z-Wave-Netzwerk. Ein Netzwerk-Heal veranlasst alle Geräte, ihre Routen zurück zum Controller neu zu berechnen und wird empfohlen, wenn kürzlich Geräte oder Controller verschoben wurden.",
-                        "run_in_background": "Dieser Dialog kann geschlossen werden und die Netzwerkheilung wird im Hintergrund fortgesetzt.",
-                        "start_heal": "Starten der Heilung",
-                        "stop_heal": "Stoppen der Heilung",
-                        "title": "Heile dein Z-Wave-Netzwerk",
-                        "traffic_warning": "Der Heilungsprozess erzeugt eine große Menge an Datenverkehr im Z-Wave-Netzwerk. Dies kann dazu führen, dass Geräte langsam (oder gar nicht) reagieren, während der Heilungsprozess läuft."
-                    },
-                    "logs": {
-                        "log_level": "Protokollstufe",
-                        "log_level_changed": "Log Level geändert auf: {level}",
-                        "subscribed_to_logs": "Abonniert Z-Wave JS-Protokollnachrichten ...",
-                        "title": "Z-Wave JS Protokolle"
-                    },
-                    "navigation": {
-                        "logs": "Protokolle",
-                        "network": "Netzwerk"
-                    },
-                    "network_status": {
-                        "connected": "Verbunden",
-                        "connecting": "Verbinden",
-                        "unknown": "Unbekannt"
-                    },
-                    "node_config": {
-                        "attribution": "Gerätekonfigurationsparameter und -beschreibungen werden von der {device_database} bereitgestellt",
-                        "battery_device_notice": "Batteriebetriebene Geräte müssen wach sein, um ihre Konfiguration zu aktualisieren. Anweisungen zum Aufwecken des Geräts findest du im Handbuch deines Geräts.",
-                        "error_device_not_found": "Gerät nicht gefunden",
-                        "header": "Z-Wave Gerätekonfiguration",
-                        "introduction": "Verwalten und Anpassen von gerätespezifischen Konfigurationsparametern (Knoten) für das ausgewählte Gerät",
-                        "parameter_is_read_only": "Dieser Parameter ist schreibgeschützt.",
-                        "set_param_accepted": "Der Parameter wurde aktualisiert.",
-                        "set_param_error": "Ein Fehler ist aufgetreten.",
-                        "set_param_queued": "Die Parameteränderung wurde in die Warteschlange gestellt und wird beim Aufwachen des Geräts aktualisiert.",
-                        "zwave_js_device_database": "Z-Wave JS Gerätedatenbank"
-                    },
-                    "node_status": {
-                        "alive": "Lebendig",
-                        "asleep": "Schläft",
-                        "awake": "Wach",
-                        "dead": "Tot",
-                        "unknown": "Unbekannt"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Sie müssen batteriebetriebene Geräte aktivieren, bevor Sie den Neukonfigurationsvorgang starten. Anweisungen zum Aktivieren des Geräts finden Sie im Handbuch Ihres Geräts.",
-                        "in_progress": "Das Gerät wird interviewt. Dies könnte eine Weile dauern.",
-                        "interview_complete": "Geräteinterview abgeschlossen.",
-                        "interview_failed": "Das Geräteinterview ist fehlgeschlagen. Zusätzliche Informationen sind möglicherweise in den Logs verfügbar.",
-                        "introduction": "Starten Sie ein erneutes Geräteinterview auf Ihrem Z-Wave-Netzwerk. Verwenden Sie diese Funktion, wenn Ihr Gerät fehlende oder falsche Funktionen anzeigt.",
-                        "run_in_background": "Sie können diesen Dialog schließen und das Interview wird im Hintergrund fortgesetzt.",
-                        "start_reinterview": "Neues Interview starten",
-                        "title": "Ein Z-Wave-Gerät erneut interviewen"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Entfernung von Geräten abbrechen",
-                        "controller_in_exclusion_mode": "Dein Z-Wave Controller befindet sich jetzt im Ausschluss-Modus",
-                        "exclusion_failed": "Der Knoten konnte nicht entfernt werden. Bitte in den Logs nach mehr Informationen suchen.",
-                        "exclusion_finished": "Der Knoten {id} wurde aus deinem Z-Wave-Netzwerk entfernt.",
-                        "follow_device_instructions": "Befolge die mit dem Gerät gelieferten Anweisungen, um die Kopplung am Gerät auszulösen.",
-                        "introduction": "Entferne einen Knoten aus deinem Z-Wave-Netzwerk und entferne die zugehörigen Geräte und Entitäten aus Home Assistant.",
-                        "start_exclusion": "Entfernung von Geräten starten",
-                        "title": "Z-Wave-Knoten entfernen"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfigurieren",
                     "common": {
                         "index": "Index",
                         "instance": "Instanz",
@@ -3154,6 +3053,144 @@
                     "values": {
                         "header": "Knotenwerte"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Erfassung abbrechen",
+                        "controller_in_inclusion_mode": "Dein Z-Wave-Controller befindet sich jetzt im Inklusionsmodus.",
+                        "follow_device_instructions": "Befolge die mit dem Gerät gelieferten Anweisungen, um die Kopplung am Gerät auszulösen.",
+                        "inclusion_failed": "Der Knoten konnte nicht hinzugefügt werden. Bitte überprüfe die Protokolle für weitere Informationen.",
+                        "inclusion_finished": "Der Knoten wurde hinzugefügt.",
+                        "interview_failed": "Das Geräteinterview ist fehlgeschlagen. Zusätzliche Informationen sind möglicherweise in den Logs verfügbar.",
+                        "interview_started": "Das Gerät wird gerade eingerichtet. Dies könnte eine Weile dauern.",
+                        "introduction": "Dieser Assistent führt dich durch das Hinzufügen eines Knotens zu deinem Z-Wave-Netzwerk.",
+                        "secure_inclusion_warning": "Sichere Geräte benötigen zusätzliche Bandbreite; zu viele sichere Geräte können dein Z-Wave-Netzwerk ausbremsen. Wir empfehlen, die sichere Einbindung nur für Geräte zu verwenden, die sie benötigen, wie Schlösser oder Garagentoröffner.",
+                        "start_inclusion": "Starten der Erfassung",
+                        "start_secure_inclusion": "Starten der sicheren Erfassung",
+                        "title": "Z-Wave-Knoten hinzufügen",
+                        "use_secure_inclusion": "Sichere Einbindung verwenden",
+                        "view_device": "Gerät anzeigen"
+                    },
+                    "common": {
+                        "add_node": "Knoten hinzufügen",
+                        "close": "Schließen",
+                        "heal_network": "Netzwerk heilen",
+                        "home_id": "Heim-ID",
+                        "network": "Netzwerk",
+                        "node_id": "Knoten-ID",
+                        "reconfigure_server": "Server neu konfigurieren",
+                        "remove_node": "Knoten entfernen",
+                        "source": "Quelle"
+                    },
+                    "dashboard": {
+                        "driver_version": "Treiberversion",
+                        "dump_dead_nodes_text": "Einige deiner Knoten haben nicht geantwortet und gelten als tot. Diese werden nicht vollständig exportiert.",
+                        "dump_dead_nodes_title": "Einige deiner Knoten sind tot",
+                        "dump_debug": "Lade einen Dump deines Netzwerks herunter, um Probleme zu diagnostizieren",
+                        "dump_not_ready_confirm": "Herunterladen",
+                        "dump_not_ready_text": "Wenn du einen Export erstellst, während nicht alle Knoten bereit sind, können benötigte Daten fehlen. Gib deinem Netzwerk etwas Zeit, um alle Knoten abzufragen. Möchtest du mit dem Dump fortfahren?",
+                        "dump_not_ready_title": "Es sind noch nicht alle Knoten bereit",
+                        "header": "Verwalte dein Z-Wave-Netzwerk",
+                        "home_id": "Heim-ID",
+                        "introduction": "Verwalte dein Z-Wave-Netzwerk und Z-Wave-Knoten",
+                        "nodes_ready": "Knoten bereit",
+                        "server_version": "Serverversion"
+                    },
+                    "device_info": {
+                        "device_config": "Gerät konfigurieren",
+                        "heal_node": "Knoten heilen",
+                        "node_ready": "Node Bereit",
+                        "node_status": "Node Status",
+                        "reinterview_device": "Gerät erneut interviewen",
+                        "remove_failed": "Ausgefallenes Gerät entfernen",
+                        "zwave_info": "Z-Wave Info"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Die Netzwerkheilung wurde abgebrochen.",
+                        "healing_complete": "Die Netzwerkheilung ist abgeschlossen.",
+                        "healing_failed": "Heilung fehlgeschlagen. Zusätzliche Informationen könnten in den Protokollen verfügbar sein.",
+                        "in_progress": "Die Netzwerkheilung ist im Gange. Dies wird einige Zeit in Anspruch nehmen.",
+                        "introduction": "Startet einen Netzwerk-Heal im Z-Wave-Netzwerk. Ein Netzwerk-Heal veranlasst alle Geräte, ihre Routen zurück zum Controller neu zu berechnen und wird empfohlen, wenn kürzlich Geräte oder Controller verschoben wurden.",
+                        "run_in_background": "Dieser Dialog kann geschlossen werden und die Netzwerkheilung wird im Hintergrund fortgesetzt.",
+                        "start_heal": "Starten der Heilung",
+                        "stop_heal": "Stoppen der Heilung",
+                        "title": "Heile dein Z-Wave-Netzwerk",
+                        "traffic_warning": "Der Heilungsprozess erzeugt eine große Menge an Datenverkehr im Z-Wave-Netzwerk. Dies kann dazu führen, dass Geräte langsam (oder gar nicht) reagieren, während der Heilungsprozess läuft."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} wurde geheilt.",
+                        "healing_failed": "{device} konnte nicht geheilt werden.",
+                        "healing_failed_check_logs": "Zusätzliche Informationen können in den Protokollen verfügbar sein.",
+                        "in_progress": "Die Heilung von {device} ist im Gange.",
+                        "introduction": "Sage {device}, dass es seine Routen zurück zum Controller aktualisieren soll. Dies kann bei Kommunikationsproblemen helfen, wenn du das Gerät oder deinen Controller kürzlich verschoben hast.",
+                        "network_heal_in_progress": "Eine Z-Wave-Netzwerkheilung ist bereits im Gange. Bitte warte, bis der Vorgang abgeschlossen ist, bevor du ein einzelnes Gerät heilst.",
+                        "start_heal": "Gerät heilen",
+                        "title": "Ein Z-Wave-Gerät heilen",
+                        "traffic_warning": "Der Heilungsprozess erzeugt eine große Menge an Datenverkehr im Z-Wave-Netzwerk. Dies kann dazu führen, dass Geräte langsam (oder gar nicht) reagieren, während der Heilungsprozess läuft."
+                    },
+                    "logs": {
+                        "log_level": "Protokollstufe",
+                        "log_level_changed": "Log Level geändert auf: {level}",
+                        "subscribed_to_logs": "Abonniert Z-Wave JS-Protokollnachrichten ...",
+                        "title": "Z-Wave JS Protokolle"
+                    },
+                    "navigation": {
+                        "logs": "Protokolle",
+                        "network": "Netzwerk"
+                    },
+                    "network_status": {
+                        "connected": "Verbunden",
+                        "connecting": "Verbinden",
+                        "unknown": "Unbekannt"
+                    },
+                    "node_config": {
+                        "attribution": "Gerätekonfigurationsparameter und -beschreibungen werden von der {device_database} bereitgestellt",
+                        "battery_device_notice": "Batteriebetriebene Geräte müssen wach sein, um ihre Konfiguration zu aktualisieren. Anweisungen zum Aufwecken des Geräts findest du im Handbuch deines Geräts.",
+                        "error_device_not_found": "Gerät nicht gefunden",
+                        "header": "Z-Wave Gerätekonfiguration",
+                        "introduction": "Verwalten und Anpassen von gerätespezifischen Konfigurationsparametern (Knoten) für das ausgewählte Gerät",
+                        "parameter": "Parameter",
+                        "parameter_is_read_only": "Dieser Parameter ist schreibgeschützt.",
+                        "set_param_accepted": "Der Parameter wurde aktualisiert.",
+                        "set_param_error": "Ein Fehler ist aufgetreten.",
+                        "set_param_queued": "Die Parameteränderung wurde in die Warteschlange gestellt und wird beim Aufwachen des Geräts aktualisiert.",
+                        "zwave_js_device_database": "Z-Wave JS Gerätedatenbank"
+                    },
+                    "node_status": {
+                        "alive": "Lebendig",
+                        "asleep": "Schläft",
+                        "awake": "Wach",
+                        "dead": "Tot",
+                        "unknown": "Unbekannt"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Du musst batteriebetriebene Geräte aktivieren, bevor du den Neukonfigurationsvorgang startest. Anweisungen zum Aktivieren des Geräts findest du im Handbuch deines Geräts.",
+                        "in_progress": "Das Gerät wird interviewt. Dies könnte eine Weile dauern.",
+                        "interview_complete": "Geräteinterview abgeschlossen.",
+                        "interview_failed": "Das Geräteinterview ist fehlgeschlagen. Zusätzliche Informationen sind möglicherweise in den Logs verfügbar.",
+                        "introduction": "Starte ein erneutes Geräteinterview auf deinem Z-Wave-Netzwerk. Verwende diese Funktion, wenn dein Gerät fehlende oder falsche Funktionen anzeigt.",
+                        "run_in_background": "Du kannst diesen Dialog schließen und das Interview wird im Hintergrund fortgesetzt.",
+                        "start_reinterview": "Neues Interview starten",
+                        "title": "Ein Z-Wave-Gerät erneut interviewen"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Das Entfernen des Geräts wird ausgeführt.",
+                        "introduction": "Entfernt ein ausgefallenes Gerät aus deinem Z-Wave-Netzwerk. Verwende diese Option, wenn du ein Gerät nicht normal ausschließen kannst, weil es defekt ist.",
+                        "removal_failed": "Das Gerät konnte nicht aus deinem Z-Wave-Netzwerk entfernt werden.",
+                        "removal_finished": "Knoten {id} wurde aus deinem Z-Wave-Netzwerk entfernt.",
+                        "remove_device": "Gerät entfernen",
+                        "title": "Ein ausgefallenes Z-Wave-Gerät entfernen"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Entfernung von Geräten abbrechen",
+                        "controller_in_exclusion_mode": "Dein Z-Wave Controller befindet sich jetzt im Ausschluss-Modus",
+                        "exclusion_failed": "Der Knoten konnte nicht entfernt werden. Bitte in den Logs nach mehr Informationen suchen.",
+                        "exclusion_finished": "Der Knoten {id} wurde aus deinem Z-Wave-Netzwerk entfernt.",
+                        "follow_device_instructions": "Befolge die mit dem Gerät gelieferten Anweisungen, um die Kopplung am Gerät auszulösen.",
+                        "introduction": "Entferne einen Knoten aus deinem Z-Wave-Netzwerk und entferne die zugehörigen Geräte und Entitäten aus Home Assistant.",
+                        "start_exclusion": "Entfernung von Geräten starten",
+                        "title": "Z-Wave-Knoten entfernen"
+                    }
                 }
             },
             "custom": {
@@ -3236,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Zurück",
-                "supervisor": {
-                    "ask": "Um Hilfe bitten",
-                    "observer": "Überprüfe den Observer",
-                    "reboot": "Versuche den Host neu zu starten",
-                    "system_health": "Überprüfe Systemzustand",
-                    "title": "Supervisor-Bedienfeld konnte nicht geladen werden!",
-                    "wait": "Wenn du gerade erst hochgefahren hast, dann stelle sicher dass du den Supervisor genug Zeit zum Starten gegeben hast."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Letzte Woche",
-                    "this_week": "Diese Woche",
-                    "today": "Heute",
-                    "yesterday": "Gestern"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Letzte Woche",
-                    "this_week": "Diese Woche",
-                    "today": "Heute",
-                    "yesterday": "Gestern"
+            "energy": {
+                "charts": {
+                    "by_device": "Verbrauch nach Gerät",
+                    "solar": "Solar",
+                    "stat_house_energy_meter": "Gesamt-Energieverbrauch"
+                },
+                "setup": {
+                    "back": "Zurück",
+                    "done": "Zeig mir mein Energie-Dashboard!",
+                    "next": "Weiter"
                 }
             },
             "lovelace": {
@@ -3281,7 +3303,7 @@
                     "confirm_delete": "Möchten Sie diese Karte wirklich löschen?",
                     "empty_state": {
                         "go_to_integrations_page": "Gehe zur Integrationsseite.",
-                        "no_devices": "Auf dieser Seite können Sie Ihre Geräte steuern, es sieht jedoch so aus, als hätten Sie noch keine eingerichtet. Gehen Sie zur Integrationsseite, um damit zu beginnen.",
+                        "no_devices": "Auf dieser Seite kannst du deine Geräte steuern, es sieht jedoch so aus, als hättest du noch keine eingerichtet. Gehe zur Integrationsseite, um damit zu beginnen.",
                         "title": "Willkommen Zuhause"
                     },
                     "entities": {
@@ -3297,7 +3319,7 @@
                         "url": "Fenster zu {url_path} öffnen"
                     },
                     "safe-mode": {
-                        "description": "Home Assistant hatte beim Laden Ihrer Konfiguration Probleme und wird jetzt im abgesicherten Modus ausgeführt. Sieh Dir das Fehlerprotokoll an, um zu erkennen, was schiefgelaufen ist.",
+                        "description": "Home Assistant hatte beim Laden deiner Konfiguration Probleme und wird jetzt im abgesicherten Modus ausgeführt. Sieh Dir das Fehlerprotokoll an, um zu erkennen, was schiefgelaufen ist.",
                         "header": "Abgesicherter Modus aktiviert"
                     },
                     "shopping-list": {
@@ -3374,7 +3396,6 @@
                         "entities": {
                             "description": "Die Entitäts-Karte ist der am häufigsten verwendete Kartentyp. Sie gruppiert Elemente in Listen.",
                             "edit_special_row": "Zeige die Details dieser Zeile an, indem du auf die Schaltfläche Bearbeiten klickst",
-                            "entity_row_editor": "Editor für Entitätszeilen",
                             "entity_row": {
                                 "attribute": "Attribut",
                                 "button": "Schalter",
@@ -3386,6 +3407,7 @@
                                 "section": "Abschnitt",
                                 "weblink": "Webseiten Link"
                             },
+                            "entity_row_editor": "Editor für Entitätszeilen",
                             "name": "Elemente",
                             "secondary_info_values": {
                                 "brightness": "Helligkeit",
@@ -3412,6 +3434,7 @@
                         "gauge": {
                             "description": "Die Messkarte ist eine Basiskarte, mit der Sensordaten visuell angezeigt werden können.",
                             "name": "Gauge",
+                            "needle_gauge": "Zeiger darstellen?",
                             "severity": {
                                 "define": "Schwellenwerte definieren?",
                                 "green": "Grün",
@@ -3424,6 +3447,7 @@
                             "attribute": "Attribut",
                             "camera_image": "Kamera-Entität",
                             "camera_view": "Kameraansicht",
+                            "days_to_show": "Zu zeigende Tage",
                             "double_tap_action": "Doppeltipp-Aktion",
                             "entities": "Entitäten",
                             "entity": "Entität",
@@ -3459,7 +3483,7 @@
                         },
                         "grid": {
                             "columns": "Spalten",
-                            "description": "Mit der Grid-Karte können Sie mehrere Karten in einem Raster anzeigen.",
+                            "description": "Mit der Grid-Karte kannst du mehrere Karten in einem Raster anzeigen.",
                             "name": "Raster",
                             "square": "Karten als Quadrate rendern"
                         },
@@ -3527,7 +3551,7 @@
                             "name": "Pflanzen Status"
                         },
                         "sensor": {
-                            "description": "Die Sensorkarte gibt dir einen schnellen Überblick über Ihren Sensorstatus mit einem optionalen Diagramm, um Änderungen im Zeitverlauf zu visualisieren.",
+                            "description": "Die Sensorkarte gibt dir einen schnellen Überblick über deinen Sensorstatus mit einem optionalen Diagramm, um Änderungen im Zeitverlauf zu visualisieren.",
                             "graph_type": "Typ",
                             "name": "Sensor",
                             "show_more_detail": "Weitere Details anzeigen"
@@ -3537,6 +3561,10 @@
                             "integration_not_loaded": "Für diese Karte muss die `shopping_list`-Integration eingerichtet werden.",
                             "name": "Einkaufsliste"
                         },
+                        "statistics-graph": {
+                            "description": "Mit der Karte Statistikdiagramm kannst du ein Diagramm der Statistiken für jede der aufgelisteten Entitäten anzeigen.",
+                            "name": "Statistikdiagramm"
+                        },
                         "thermostat": {
                             "description": "Die Thermostatkarte gibt dir die Kontrolle über deine Klimaeinheit. Sie ermöglicht es, die Temperatur und den Modus der Einheit zu ändern.",
                             "name": "Thermostat"
@@ -3606,6 +3634,12 @@
                         "tab_badges": "Plaketten",
                         "tab_settings": "Einstellungen",
                         "tab_visibility": "Sichtbarkeit",
+                        "type": "Ansichtsart",
+                        "types": {
+                            "masonry": "Rasteransicht (Standard)",
+                            "panel": "Panel (1 Karte)",
+                            "sidebar": "Seitenleiste"
+                        },
                         "visibility": {
                             "select_users": "Wähle aus, welche Benutzer diese Ansicht in der Navigation sehen sollen"
                         }
@@ -3660,7 +3694,6 @@
                         "unsaved_changes": "Nicht gespeicherte Änderungen"
                     },
                     "save_config": {
-                        "cancel": "Abbrechen",
                         "close": "Schließen",
                         "empty_config": "Beginne mit einem leeren Dashboard",
                         "header": "Lovelace Userinterface selbst verwalten",
@@ -3689,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Hiermit wird die erste Karte in voller Breite angezeigt. Andere Karten und Marker in dieser Ansicht werden nicht angezeigt.",
-                            "title": "Panel-Modus?",
                             "warning_multiple_cards": "Diese Ansicht enthält mehr als eine Karte, in einer Bedienfeldansicht kann jedoch nur eine Karte angezeigt werden."
                         }
                     }
@@ -3744,12 +3775,12 @@
                 "documentation": "Dokumentation",
                 "error": "Ein unbekannter Fehler ist aufgetreten.",
                 "faq_link": "Meine Home Assistant FAQ",
-                "no_supervisor": "Diese Weiterleitung wird von deiner Home Assistant-Installation nicht unterstützt. Benötigt entweder das Home Assistant-Betriebssystem oder die Home Assistant Supervised-Installationsmethode. Weitere Informationen finden Sie unter {docs_link}.",
+                "no_supervisor": "Diese Weiterleitung wird von deiner Home Assistant-Installation nicht unterstützt. Benötigt entweder das Home Assistant-Betriebssystem oder die Home Assistant Supervised-Installationsmethode. Weitere Informationen findest du unter {docs_link}.",
                 "not_supported": "Diese Weiterleitung wird von deiner Home Assistant-Instanz nicht unterstützt. Überprüfe den {link} auf die unterstützten Weiterleitungen und die Version, in der sie eingeführt wurden."
             },
             "page-authorize": {
                 "abort_intro": "Anmeldung abgebrochen",
-                "authorizing_client": "Sie sind dabei, {clientId} Zugriff auf Ihre Home Assistant-Instanz zu gewähren.",
+                "authorizing_client": "Du bist dabei, {clientId} Zugriff auf deine Home Assistant Instanz zu gewähren.",
                 "form": {
                     "error": "Fehler: {error}",
                     "next": "Weiter",
@@ -3773,7 +3804,7 @@
                                     "data": {
                                         "code": "Zwei-Faktor Authentifizierungscode"
                                     },
-                                    "description": "Öffnen Sie das **{mfa_module_name}** auf Ihrem Gerät, um den 2-Faktor Authentifizierungscode zu sehen und Ihre Identität zu bestätigen:"
+                                    "description": "Öffne das **{mfa_module_name}** auf deinem Gerät um den 2-Faktor Authentifizierungscode zu sehen und deine Identität zu bestätigen:"
                                 }
                             }
                         },
@@ -3796,7 +3827,7 @@
                                     "data": {
                                         "code": "Zwei-Faktor Authentifizierungscode"
                                     },
-                                    "description": "Öffnen Sie das **{mfa_module_name}** auf Ihrem Gerät, um den 2-Faktor Authentifizierungscode zu sehen und Ihre Identität zu bestätigen:"
+                                    "description": "Öffne das **{mfa_module_name}** auf deinem Gerät um den 2-Faktor Authentifizierungscode zu sehen und deine Identität zu bestätigen:"
                                 }
                             }
                         },
@@ -3820,7 +3851,7 @@
                                     "data": {
                                         "code": "Zwei-Faktor Authentifizierungscode"
                                     },
-                                    "description": "Öffnen Sie das **{mfa_module_name}** auf Ihrem Gerät, um den 2-Faktor Authentifizierungscode zu sehen und Ihre Identität zu bestätigen:"
+                                    "description": "Öffne das **{mfa_module_name}** auf deinem Gerät um den 2-Faktor Authentifizierungscode zu sehen und deine Identität zu bestätigen:"
                                 }
                             }
                         },
@@ -3893,14 +3924,13 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Weiter",
-                    "intro": "Teile Statistiken aus deiner Instanz. Diese Daten werden unter {link} verfügbar sein."
+                    "finish": "Weiter"
                 },
                 "core-config": {
                     "button_detect": "Erkennen",
                     "finish": "Weiter",
-                    "intro": "Hallo {name}, willkommen bei Home Assistant. Wie möchten Sie Ihre Haus benennen?",
-                    "intro_location": "Wir würden gerne wissen, wo Sie wohnen. Diese Daten helfen bei der Anzeige von Informationen und der Einrichtung von Sonnenstands-basierten Automatisierungen. Diese Daten werden niemals außerhalb Ihres Netzwerks weitergegeben.",
+                    "intro": "Hallo {name}, willkommen bei der Home Assistant. Wie möchtest du dein Haus benennen?",
+                    "intro_location": "Wir würden gerne wissen, wo du wohnst. Diese Information hilft bei der Anzeige von Informationen und der Einrichtung von Sonnenstands-basierten Automatisierungen. Diese Daten werden niemals außerhalb deines Netzwerks weitergegeben.",
                     "intro_location_detect": "Wir können helfen, diese Informationen auszufüllen, indem wir eine einmalige Anfrage an einen externen Dienstleister richten.",
                     "location_name": "Name deiner Home Assistant Installation",
                     "location_name_default": "Home"
@@ -3915,18 +3945,16 @@
                 "next": "Weiter",
                 "restore": {
                     "addons": "Add-ons",
-                    "confirm_password": "Snapshot-Passwort bestätigen",
-                    "description": "Alternativ kannst du von einem vorherigen Snapshot wiederherstellen.",
+                    "confirm_password": "Backup-Passwort bestätigen",
+                    "description": "Alternativ kannst du von einem vorherigen Backup wiederherstellen.",
                     "folders": "Ordner",
-                    "full_snapshot": "Vollständige Datensicherung",
                     "hide_log": "Vollständiges Protokoll ausblenden",
                     "in_progress": "Wiederherstellung im Gange",
-                    "partial_snapshot": "Selektive Datensicherung",
-                    "password": "Snapshot-Passwort",
+                    "password": "Backup-Passwort",
                     "password_protection": "Passwortschutz",
                     "select_type": "Wähle aus, was wiederhergestellt werden soll",
                     "show_log": "Vollständiges Protokoll anzeigen",
-                    "type": "Snapshot-Typ"
+                    "type": "Backup-Typ"
                 },
                 "user": {
                     "create_account": "Benutzerkonto anlegen",
@@ -3990,19 +4018,25 @@
                 "logout_text": "Möchtest du dich wirklich abmelden?",
                 "logout_title": "Abmelden?",
                 "long_lived_access_tokens": {
-                    "confirm_delete": "Möchten Sie den Zugriffs-Token für {name} wirklich löschen?",
+                    "confirm_delete": "Möchtest du den Zugriffs-Token für {name} wirklich löschen?",
                     "create": "Token erstellen",
                     "create_failed": "Das Zugriffs-Token konnte nicht erstellt werden.",
                     "created": "Erstellt am {date}",
                     "delete_failed": "Fehler beim Löschen des Zugriffs-Tokens.",
                     "description": "Erstelle langlebige Zugriffstoken, damit deine Skripte mit deiner Home Assistant-Instanz interagieren können. Jedes Token ist ab der Erstellung für 10 Jahre gültig. Die folgenden langlebigen Zugriffstoken sind derzeit aktiv.",
-                    "empty_state": "Sie haben noch keine langlebigen Zugangs-Token.",
+                    "empty_state": "Du hast noch keine langlebigen Zugangs-Token.",
                     "header": "Langlebige Zugangs-Token",
                     "learn_auth_requests": "Erfahre, wie du authentifizierte Anfragen stellen kannst.",
                     "name": "Name",
                     "prompt_copy_token": "Kopiere deinen Zugangs-Token. Er wird nicht wieder angezeigt werden.",
                     "prompt_name": "Gib den Token einen Namen"
                 },
+                "mfa": {
+                    "confirm_disable": "Möchtest du {name} wirklich deaktivieren?",
+                    "disable": "Deaktivieren",
+                    "enable": "Aktivieren",
+                    "header": "Multi-Faktor-Authentifizierungsmodul"
+                },
                 "mfa_setup": {
                     "close": "Schließen",
                     "step_done": "Setup für {step} abgeschlossen",
@@ -4010,12 +4044,6 @@
                     "title_aborted": "Abgebrochen",
                     "title_success": "Erfolgreich!"
                 },
-                "mfa": {
-                    "confirm_disable": "Möchtest du {name} wirklich deaktivieren?",
-                    "disable": "Deaktivieren",
-                    "enable": "Aktivieren",
-                    "header": "Multi-Faktor-Authentifizierungsmodul"
-                },
                 "number_format": {
                     "description": "Wähle aus, wie Zahlen formatiert werden sollen.",
                     "dropdown_label": "Zahlenformat",
@@ -4046,7 +4074,7 @@
                     "created_at": "Erstellt am {date}",
                     "current_token_tooltip": "Aktueller Refresh-Token konnte nicht gelöscht werden",
                     "delete_failed": "Fehler beim Löschen das Aktualisierungs-Token.",
-                    "description": "Jedes Aktualisierungs-Token stellt eine Anmeldesitzung dar. Aktualisierungs-Token werden automatisch entfernt, wenn Sie Abmelden klicken. Die folgenden Aktualisierungs-Token sind derzeit für Ihr Konto aktiv.",
+                    "description": "Jedes Aktualisierungstoken stellt eine Anmeldesitzung dar. Aktualisierungstoken werden automatisch entfernt, wenn du auf Abmelden klickst. Die folgenden Aktualisierungstoken sind derzeit für dein Konto aktiv.",
                     "header": "Aktualisierungs-Tokens",
                     "last_used": "Zuletzt verwendet {date} von {location}",
                     "not_used": "Wurde noch nie benutzt",
diff --git a/translations/frontend/el.json b/translations/frontend/el.json
index 82efeb2b5a..d9acc7f2ca 100644
--- a/translations/frontend/el.json
+++ b/translations/frontend/el.json
@@ -17,6 +17,7 @@
         "calendar": "Ημερολόγιο",
         "config": "Ρυθμίσεις",
         "developer_tools": "Εργαλεία προγραμματιστή",
+        "energy": "Ενέργεια",
         "history": "Ιστορικό",
         "logbook": "Αρχείο Συμβάντων",
         "mailbox": "Γραμματοκιβώτιο",
@@ -26,6 +27,14 @@
         "shopping_list": "Λίστα αγορών",
         "states": "Επισκόπηση"
     },
+    "state": {
+        "default": {
+            "off": "Μη Ενεργό",
+            "on": "Ενεργό",
+            "unavailable": "Μη Διαθέσιμο",
+            "unknown": "Άγνωστη"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Εκτός"
         }
     },
-    "state": {
-        "default": {
-            "off": "Μη Ενεργό",
-            "on": "Ενεργό",
-            "unavailable": "Μη Διαθέσιμο",
-            "unknown": "Άγνωστη"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Το πρόσθετο δεν είναι εγκατεστημένο"
             }
         },
+        "backup": {
+            "addons": "Πρόσθετα",
+            "confirm_password": "Επιβεβαίωση κωδικού πρόσβασης στιγμιότυπου",
+            "could_not_create": "Δεν ήταν δυνατή η δημιουργία στιγμιότυπου",
+            "create": "Δημιουργία",
+            "create_blocked_not_running": "Η δημιουργία ενός στιγμιότυπου δεν είναι δυνατή αυτήν τη στιγμή, επειδή το σύστημα βρίσκεται σε κατάσταση {state}.",
+            "created": "Δημιουργήθηκε",
+            "delete_backup_confirm": "διαγραφή",
+            "delete_selected": "Διαγραφή επιλεγμένων στιγμιότυπων",
+            "enter_password": "Εισαγάγετε έναν κωδικό πρόσβασης.",
+            "failed_to_delete": "Αποτυχία διαγραφής",
+            "folders": "Φάκελοι",
+            "name": "Όνομα",
+            "password": "Κωδικός",
+            "password_protection": "Προστασία με κωδικό πρόσβασης",
+            "passwords_not_matching": "Οι κωδικοί πρόσβασης δεν ταιριάζουν",
+            "select_type": "Επιλέξτε τι θα επαναφέρετε",
+            "selected": "επιλέχθηκαν {number}",
+            "type": "Τύπος"
+        },
         "common": {
             "cancel": "Ακύρωση",
             "close": "Κλείσιμο",
@@ -318,6 +339,14 @@
             "no_addons": "Δεν έχετε εγκαταστήσει πρόσθετα ακόμα. Επισκεφθείτε το κατάστημα πρόσθετων για να ξεκινήσετε!"
         },
         "dialog": {
+            "hardware": {
+                "attributes": "Χαρακτηριστικά",
+                "device_path": "Διαδρομή συσκευής",
+                "id": "Αναγνωριστικό",
+                "search": "Αναζήτηση υλικού",
+                "subsystem": "Υποσύστημα",
+                "title": "Υλικό"
+            },
             "network": {
                 "connected_to": "Συνδέθηκε στο {ssid}",
                 "dhcp": "DHCP",
@@ -358,52 +387,23 @@
                 "text": "Θέλετε να επανεκκινήσετε το πρόσθετο με τις αλλαγές σας;"
             },
             "update": {
-                "create_snapshot": "Δημιουργία στιγμιότυπου του {name} πριν από την ενημέρωση",
-                "snapshot": "Στιγμιότυπο",
-                "snapshotting": "Δημιουργία στιγμιότυπου του {name}",
                 "updating": "Ενημέρωση του {name} στην έκδοση {version}"
             }
         },
         "my": {
             "error": "Προέκυψε ένα άγνωστο σφάλμα",
+            "error_addon_no_ingress": "Το ζητούμενο πρόσθετο δεν υποστηρίζει το ingress",
             "error_addon_not_found": "Το πρόσθετο δεν βρέθηκε",
+            "error_addon_not_installed": "Το ζητούμενο πρόσθετο δεν είναι εγκατεστημένο. Παρακαλώ εγκαταστήστε το πρώτα",
+            "error_addon_not_started": "Το ζητούμενο πρόσθετο δεν εκτελείται. Παρακαλώ ξεκινήστε το πρώτα",
             "faq_link": "Συχνές ερωτήσεις Home Assistant",
             "not_supported": "Αυτή η ανακατεύθυνση δεν υποστηρίζεται από την παρουσία του Home Assistant σας. Ελέγξτε το {link} για τις υποστηριζόμενες ανακατευθύνσεις και την έκδοση που εισήχθησαν."
         },
         "panel": {
             "dashboard": "Πίνακας Επισκόπησης",
-            "snapshots": "Στιγμιότυπα",
             "store": "Κατάστημα πρόσθετων",
             "system": "Σύστημα"
         },
-        "snapshot": {
-            "addons": "Πρόσθετα",
-            "available_snapshots": "Διαθέσιμα στιγμιότυπα",
-            "could_not_create": "Δεν ήταν δυνατή η δημιουργία στιγμιότυπου",
-            "create": "Δημιουργία",
-            "create_blocked_not_running": "Η δημιουργία ενός στιγμιότυπου δεν είναι δυνατή αυτήν τη στιγμή, επειδή το σύστημα βρίσκεται σε κατάσταση {state}.",
-            "create_snapshot": "Δημιουργία στιγμιότυπου",
-            "description": "Τα στιγμιότυπα σας επιτρέπουν να δημιουργείτε εύκολα αντίγραφα ασφαλείας και να επαναφέρετε όλα τα δεδομένα του Home Assistant σας.",
-            "enter_password": "Εισαγάγετε έναν κωδικό πρόσβασης.",
-            "folder": {
-                "addons/local": "Τοπικά πρόσθετα",
-                "homeassistant": "Διαμόρφωση Home Assistant",
-                "media": "Πολυμέσα",
-                "share": "Κοινή χρήση",
-                "ssl": "SSL"
-            },
-            "folders": "Φάκελοι",
-            "full_snapshot": "Πλήρες στιγμιότυπο",
-            "name": "Όνομα",
-            "no_snapshots": "Δεν έχετε στιγμιότυπα ακόμα.",
-            "partial_snapshot": "Μερικό στιγμιότυπο",
-            "password": "Κωδικός",
-            "password_protected": "προστατεύεται με κωδικό πρόσβασης",
-            "password_protection": "Προστασία με κωδικό πρόσβασης",
-            "security": "Ασφάλεια",
-            "type": "Τύπος",
-            "upload_snapshot": "Μεταφόρτωση στιγμιότυπου"
-        },
         "store": {
             "missing_addons": "Λείπουν πρόσθετα; Ενεργοποίηση λειτουργίας για προχωρημένους στη σελίδα προφίλ χρήστη",
             "no_results_found": "Δεν βρέθηκαν αποτελέσματα στο {repository}.",
@@ -458,6 +458,7 @@
                 "leave_beta_description": "Λάβετε σταθερές ενημερώσεις για το Home Assistant, τον Επόπτη και τον κεντρικό υπολογιστή",
                 "ram_usage": "Χρήση μνήμης RAM του Supervisor",
                 "reload_supervisor": "Επαναφόρτωση Supervisor",
+                "search": "Αναζήτηση",
                 "share_diagnostics": "Κοινή χρήση διαγνωστικών",
                 "share_diagnostics_description": "Μοιραστείτε αναφορές σφαλμάτων και διαγνωστικές πληροφορίες.",
                 "share_diagonstics_description": "Θα θέλατε να κοινοποιείτε αυτόματα αναφορές σφαλμάτων και διαγνωστικές πληροφορίες όταν ο Supervisor αντιμετωπίζει απρόσμενα σφάλματα; {line_break} Αυτό θα μας επιτρέψει να διορθώσουμε τα προβλήματα, οι πληροφορίες είναι προσβάσιμες μόνο από την ομάδα του Home Assistant Core και δεν θα κοινοποιηθούν σε άλλους. {line_break} Τα δεδομένα δεν περιλαμβάνουν ιδιωτικές / ευαίσθητες πληροφορίες και μπορείτε να το απενεργοποιήσετε στις ρυθμίσεις όποτε θέλετε.",
@@ -473,6 +474,7 @@
                 "unhealthy_title": "Η εγκατάστασή σας είναι ανθυγιεινή",
                 "unsupported_description": "Ακολουθεί μια λίστα με ζητήματα που εντοπίστηκαν με την εγκατάστασή σας, κάντε κλικ στους συνδέσμους για να μάθετε πώς μπορείτε να επιλύσετε τα προβλήματα.",
                 "unsupported_reason": {
+                    "apparmor": "Το AppArmor δεν είναι ενεργοποιημένο στον κεντρικό υπολογιστή",
                     "container": "Κοντέινερ που είναι γνωστά ότι προκαλούν προβλήματα",
                     "content-trust": "Η επικύρωση αξιόπιστου περιεχόμενου είναι απενεργοποιημένη",
                     "dbus": "DBUS",
@@ -560,8 +562,11 @@
             },
             "light": {
                 "brightness": "Φωτεινότητα",
+                "cold_white_value": "Ψυχρή λευκή φωτεινότητα",
+                "color_brightness": "Φωτεινότητα χρώματος",
                 "color_temperature": "Θερμοκρασία χρώματος",
                 "effect": "Εφέ",
+                "warm_white_value": "Θερμή λευκή φωτεινότητα",
                 "white_value": "Τιμή λευκού"
             },
             "lock": {
@@ -713,6 +718,9 @@
                 "no_match": "Δεν βρέθηκαν περιοχές που να ταιριάζουν",
                 "show_areas": "Εμφάνιση περιοχών"
             },
+            "attributes": {
+                "expansion_header": "Χαρακτηριστικά"
+            },
             "blueprint-picker": {
                 "add_user": "Προσθήκη χρήστη",
                 "remove_user": "Κατάργηση χρήστη",
@@ -723,11 +731,20 @@
                 "today": "Σήμερα"
             },
             "data-table": {
+                "clear": "Καθαρισμός",
+                "filtering_by": "Φιλτράρισμα κατά",
+                "hidden": "{number} κρυμμένο",
                 "no-data": "Δεν υπάρχουν δεδομένα",
                 "search": "Αναζήτηση"
             },
             "date-range-picker": {
                 "end_date": "Ημερομηνία λήξης",
+                "ranges": {
+                    "last_week": "Προηγούμενη εβδομάδα",
+                    "this_week": "Αυτή την εβδομάδα",
+                    "today": "Σήμερα",
+                    "yesterday": "Εχθές"
+                },
                 "select": "Επιλογή",
                 "start_date": "Ημερομηνία έναρξης"
             },
@@ -788,6 +805,7 @@
                     "was_unplugged": "ήταν αποσυνδεδεμένο",
                     "was_unsafe": "δεν ήταν ασφαλές"
                 },
+                "retrieval_error": "Σφάλμα κατά την ανάκτηση καταχώρησης στο ημερολόγιο",
                 "show_trace": "Εμφάνιση ίχνους"
             },
             "media-browser": {
@@ -818,10 +836,10 @@
                 "documentation": "τεκμηρίωση",
                 "learn_adding_local_media": "Μάθετε περισσότερα σχετικά με την προσθήκη πολυμέσων στην {documentation} .",
                 "local_media_files": "Τοποθετήστε τα αρχεία βίντεο, ήχου και εικόνας στον κατάλογο πολυμέσων για να μπορείτε να περιηγηθείτε και να τα αναπαραγάγετε στο πρόγραμμα περιήγησης ή σε υποστηριζόμενες συσκευές αναπαραγωγής πολυμέσων.",
+                "media-player-browser": "Πρόγραμμα περιήγησης πολυμέσων",
                 "media_browsing_error": "Σφάλμα περιήγησης πολυμέσων",
                 "media_not_supported": "Το Πρόγραμμα αναπαραγωγής πολυμέσων του προγράμματος περιήγησης δεν υποστηρίζει αυτόν τον τύπο πολυμέσων",
                 "media_player": "Πρόγραμμα αναπαραγωγής πολυμέσων",
-                "media-player-browser": "Πρόγραμμα περιήγησης πολυμέσων",
                 "no_items": "Χωρίς στοιχεία",
                 "no_local_media_found": "Δεν βρέθηκαν τοπικά μέσα",
                 "no_media_folder": "Φαίνεται ότι δεν έχετε δημιουργήσει ακόμη έναν κατάλογο πολυμέσων.",
@@ -837,6 +855,14 @@
                 "label": "Εικόνα",
                 "unsupported_format": "Μη υποστηριζόμενη μορφή, επιλέξτε μια εικόνα JPEG, PNG ή GIF."
             },
+            "related-filter-menu": {
+                "filter_by_area": "Φιλτράρισμα ανά περιοχή",
+                "filter_by_device": "Φιλτράρισμα ανά συσκευή",
+                "filter_by_entity": "Φιλτράρισμα ανά οντότητα",
+                "filtered_by_area": "περιοχή: {area_name}",
+                "filtered_by_device": "συσκευή: {device_name}",
+                "filtered_by_entity": "οντότητα: {entity_name}"
+            },
             "related-items": {
                 "area": "Περιοχή",
                 "automation": "Μέρος των ακόλουθων αυτοματισμών",
@@ -874,6 +900,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Τεκμηρίωση ενσωμάτωσης",
                 "required": "Αυτό το πεδίο είναι υποχρεωτικό",
                 "service_data": "Δεδομένα υπηρεσίας",
                 "target": "Στόχοι",
@@ -882,6 +909,23 @@
             "service-picker": {
                 "service": "Υπηρεσία"
             },
+            "statistic-picker": {
+                "learn_more": "Μάθετε περισσότερα σχετικά με τα στατιστικά στοιχεία",
+                "missing_entity": "Γιατί η οντότητά μου δεν περιλαμβάνεται στη λίστα;",
+                "no_match": "Δεν βρέθηκαν αντίστοιχα στατιστικά στοιχεία",
+                "no_statistics": "Δεν έχετε στατιστικά στοιχεία",
+                "statistic": "Στατιστικά στοιχεία"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Φόρτωση στατιστικών ...",
+                "no_statistics_found": "Δεν βρέθηκαν στατιστικά στοιχεία.",
+                "statistic_types": {
+                    "max": "μέγιστο",
+                    "mean": "μέσος όρος",
+                    "min": "ελάχιστο",
+                    "sum": "άθροισμα"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Επιλέξτε περιοχή",
                 "add_device_id": "Επιλέξτε συσκευή",
@@ -902,6 +946,9 @@
             "config_entry_system_options": {
                 "enable_new_entities_description": "Αν απενεργοποιηθεί, οι πρόσφατα ανακαλυφθείσες οντότητες για το {integration} δε θα προστεθούν αυτόματα στον Home Assistant.",
                 "enable_new_entities_label": "Ενεργοποίηση οντοτήτων που προστέθηκαν πρόσφατα.",
+                "enable_polling_description": "Εάν το Home Assistant θα πρέπει να πραγματοποιεί αυτόματα δημοσκόπηση των οντοτήτων {integration} για ενημερώσεις.",
+                "enable_polling_label": "Ενεργοποιήστε τη λήψη για ενημερώσεις.",
+                "restart_home_assistant": "Πρέπει να επανεκκινήσετε το Home Assistant για να τεθούν σε ισχύ οι αλλαγές σας.",
                 "title": "Επιλογές συστήματος για το {integration}",
                 "update": "Ενημέρωση"
             },
@@ -1067,6 +1114,10 @@
                 "form": {
                     "header": "Επιλογές"
                 },
+                "loading": {
+                    "loading_flow": "Περιμένετε έως ότου προετοιμαστούν οι επιλογές για {integration}",
+                    "loading_step": "Φόρτωση επόμενου βήματος για {integration}"
+                },
                 "success": {
                     "description": "Οι επιλογές αποθηκεύτηκαν με επιτυχία."
                 }
@@ -1080,13 +1131,13 @@
                         "core": "Γενικά",
                         "customize": "Μορφοποιήσεις",
                         "devices": "Συσκευές",
+                        "energy": "Ενέργεια",
                         "entities": "Στοιχεία",
                         "helpers": "Βοηθήματα",
                         "info": "Πληροφορίες",
                         "integrations": "Ενσωματώσεις",
                         "logs": "Συμβάντα",
                         "lovelace": "Διαχειριστικά Lovelace",
-                        "navigate_to": "Μεταβείτε στο {panel}",
                         "person": "Άνθρωποι",
                         "scene": "Σκηνές",
                         "script": "Scripts",
@@ -1179,6 +1230,24 @@
                 "zha_device_card": {
                     "device_name_placeholder": "Αλλαγή ονόματος συσκευής"
                 }
+            },
+            "zha_reconfigure_device": {
+                "attribute": "Χαρακτηριστικό",
+                "battery_device_warning": "Θα χρειαστεί να αφυπνίσετε τις συσκευές που τροφοδοτούνται από μπαταρία πριν ξεκινήσετε τη διαδικασία επαναδιαμόρφωσης. Ανατρέξτε στο εγχειρίδιο της συσκευής σας για οδηγίες σχετικά με την αφύπνιση της συσκευής.",
+                "bind_header": "Σύζευξη",
+                "button_hide": "Απόκρυψη λεπτομερειών",
+                "button_show": "Εμφάνιση λεπτομερειών",
+                "cluster_header": "Σύμπλεγμα",
+                "configuration_complete": "Η αναδιαμόρφωση της συσκευής ολοκληρώθηκε.",
+                "configuration_failed": "Η αναδιαμόρφωση της συσκευής απέτυχε. Πρόσθετες πληροφορίες ενδέχεται να είναι διαθέσιμες στα αρχεία καταγραφής.",
+                "configuring_alt": "Διαμόρφωση",
+                "heading": "Επαναδιαμόρφωση της συσκευής",
+                "in_progress": "Η συσκευή επαναδιαμορφώνεται. Αυτό μπορεί να πάρει λίγο χρόνο.",
+                "introduction": "Αναδιαμορφώστε μια συσκευή στο δίκτυό σας Zigbee. Χρησιμοποιήστε αυτήν τη δυνατότητα εάν η συσκευή σας δεν λειτουργεί σωστά.",
+                "min_max_change": "ελάχιστο/μέγιστο/αλλαγή",
+                "reporting_header": "Αναφορά",
+                "run_in_background": "Μπορείτε να κλείσετε αυτό το παράθυρο διαλόγου και η αναδιαμόρφωση θα συνεχιστεί στο παρασκήνιο.",
+                "start_reconfiguration": "Έναρξη επαναδιαμόρφωσης"
             }
         },
         "duration": {
@@ -1201,8 +1270,12 @@
                 "no_type_provided": "Δεν παρέχεται τύπος."
             },
             "supervisor": {
+                "ask": "Ζητήσετε βοήθεια",
+                "observer": "Ελέγξτε τον Παρατηρητή",
                 "reboot": "Δοκιμάστε μια επανεκκίνηση του διακομιστή",
-                "title": "Δεν ήταν δυνατή η φόρτωση του πίνακα Supervisor!"
+                "system_health": "Ελέγξτε την υγεία του συστήματος",
+                "title": "Δεν ήταν δυνατή η φόρτωση του πίνακα Supervisor!",
+                "wait": "Αν μόλις ξεκινήσατε, βεβαιωθείτε ότι έχετε δώσει στον Επόπτη αρκετό χρόνο για να ξεκινήσει."
             }
         },
         "login-form": {
@@ -1220,6 +1293,7 @@
         "notification_toast": {
             "connection_lost": "Η σύνδεση χάθηκε. Επανασύνδεση…",
             "dismiss": "Απόρριψη",
+            "integration_starting": "Ξεκινώντας το {integration}, δεν θα είναι όλα διαθέσιμα μέχρι να ολοκληρωθεί.",
             "service_call_failed": "Απέτυχε η κλήση στην υπηρεσία {service}.",
             "started": "Το Home Assistant έχει ξεκινήσει!",
             "starting": "Το Home Assistant ξεκινά, ενδέχεται να μην είναι ακόμη διαθέσιμα όλα.",
@@ -1236,7 +1310,8 @@
                     "caption": "Περιοχή Μητρώου",
                     "data_table": {
                         "area": "Περιοχή",
-                        "devices": "Συσκευές"
+                        "devices": "Συσκευές",
+                        "entities": "Οντότητες"
                     },
                     "delete": {
                         "confirmation_text": "Όλες οι συσκευές αυτής της περιοχής θα καταστούν μη εκχωρημένες",
@@ -1248,8 +1323,10 @@
                         "create": "Δημιουργία",
                         "default_name": "Νέα περιοχή",
                         "delete": "Διαγραφή",
+                        "linked_entities_caption": "Οντότητες",
                         "name": "Ονομασία",
                         "name_required": "Απαιτείται όνομα",
+                        "no_linked_entities": "Δεν υπάρχουν οντότητες που να συνδέονται με αυτήν την περιοχή.",
                         "unknown_error": "Άγνωστο σφάλμα",
                         "update": "Ενημέρωση"
                     },
@@ -1289,7 +1366,6 @@
                             "introduction": "Οι ενέργειες είναι ό,τι θα κάνει το Home Assistant όταν ενεργοποιηθεί ο αυτοματισμός. \n\n [Μάθετε περισσότερα για τις ενέργειες.] (https://home-assistant.io/docs/automation/action/)",
                             "learn_more": "Μάθετε περισσότερα σχετικά με τις ενέργειες",
                             "name": "Ενέργεια",
-                            "type_select": "Τύπος ενέργειας",
                             "type": {
                                 "choose": {
                                     "add_option": "Προσθήκη επιλογής",
@@ -1330,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Επανάληψη",
                                     "sequence": "Ενέργειες",
-                                    "type_select": "Επανάληψη τύπου",
                                     "type": {
                                         "count": {
                                             "label": "Αρίθμηση"
@@ -1340,10 +1415,11 @@
                                             "label": "Μέχρι"
                                         },
                                         "while": {
-                                            "conditions": "\"Μέχρι\" συνθήκες",
+                                            "conditions": "\"Όσο\" συνθήκες",
                                             "label": "Όσο"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Επανάληψη τύπου"
                                 },
                                 "scene": {
                                     "label": "Ενεργοποίηση σκηνής"
@@ -1363,6 +1439,7 @@
                                     "wait_template": "Πρότυπο Αναμονής"
                                 }
                             },
+                            "type_select": "Τύπος ενέργειας",
                             "unsupported_action": "Χωρίς υποστήριξη οπτικού επεξεργαστή για ενέργεια: {action}"
                         },
                         "alias": "Όνομα",
@@ -1381,7 +1458,6 @@
                             "introduction": "Οι συνθήκες είναι προαιρετικές και θα αποτρέψουν την περαιτέρω εκτέλεση εκτός εάν πληρούνται όλες οι προϋποθέσεις.",
                             "learn_more": "Μάθετε περισσότερα σχετικά με τις συνθήκες",
                             "name": "Προϋπόθεση",
-                            "type_select": "Τύπος συνθήκης",
                             "type": {
                                 "and": {
                                     "label": "Και"
@@ -1442,12 +1518,18 @@
                                         "wed": "Τετάρτη"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Αναγνωριστικό εναύσματος",
+                                    "label": "Έναυσμα",
+                                    "no_triggers": "Δεν υπάρχουν διαθέσιμα εναύσματα"
+                                },
                                 "zone": {
                                     "entity": "Οντότητα με τοποθεσία",
                                     "label": "Ζώνη",
                                     "zone": "Ζώνη"
                                 }
                             },
+                            "type_select": "Τύπος συνθήκης",
                             "unsupported_condition": "Χωρίς υποστήριξη οπτικού επεξεργαστή για συνθήκη: {condition}"
                         },
                         "copy_to_clipboard": "Αντιγραφή στο Πρόχειρο",
@@ -1478,16 +1560,17 @@
                         "move_down": "Μετακίνηση προς τα κάτω",
                         "move_up": "Μετακίνηση προς τα επάνω",
                         "save": "Αποθήκευση",
+                        "show_trace": "Εμφάνιση ίχνους",
                         "triggers": {
                             "add": "Προσθήκη εναύσματος",
                             "delete": "Διαγραφή",
                             "delete_confirm": "Σίγουρα επιθυμείτε την διαγραφή;",
                             "duplicate": "Διπλότυπο",
                             "header": "Εναύσματα",
+                            "id": "Αναγνωριστικό εναύσματος (χρησιμοποιείται από τη συνθήκη εναύσματος)",
                             "introduction": "Τα εναύσματα ενεργοποιούν τους κανόνες αυτοματισμού. Είναι δυνατός ο καθορισμός πολλαπλών εναυσμάτων για τον ίδιο κανόνα. Με την ενεργοποίηση ενός εναύσματος το Home Assistant θα εκτελέσει τους κανόνες, εάν υπάρχουν, και θα καλέσει την ενέργεια.\n\n[Μάθετε περισσότερα για τις ενέργειες.] (https://home-assistant.io/docs/automation/action/)",
                             "learn_more": "Μάθετε περισσότερα σχετικά με τα εναύσματα",
                             "name": "Έναυσμα",
-                            "type_select": "Τύπος εναύσματος",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1553,18 +1636,18 @@
                                     "label": "Πρότυπο",
                                     "value_template": "Τιμή πρότυπου"
                                 },
-                                "time_pattern": {
-                                    "hours": "Ώρες",
-                                    "label": "Χρονικό μοτίβο",
-                                    "minutes": "Λεπτά",
-                                    "seconds": "Δευτερόλεπτα"
-                                },
                                 "time": {
                                     "at": "Στις",
                                     "label": "Ώρα",
                                     "type_input": "Τιμή ενός βοηθού ημερομηνίας/ώρας",
                                     "type_value": "Σταθερός χρόνος"
                                 },
+                                "time_pattern": {
+                                    "hours": "Ώρες",
+                                    "label": "Χρονικό μοτίβο",
+                                    "minutes": "Λεπτά",
+                                    "seconds": "Δευτερόλεπτα"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Αναγνωριστικό Webhook"
@@ -1578,6 +1661,7 @@
                                     "zone": "Ζώνη"
                                 }
                             },
+                            "type_select": "Τύπος εναύσματος",
                             "unsupported_platform": "Χωρίς υποστήριξη οπτικού επεξεργαστή για πλατφόρμα: {platform}"
                         },
                         "unsaved_confirm": "Δεν αποθηκεύσατε τις αλλαγές. Είστε βέβαιοι ότι θέλετε να φύγετε;"
@@ -1673,6 +1757,7 @@
                             "title": "Alexa"
                         },
                         "connected": "Συνδεδεμένος",
+                        "connecting": "Σύνδεση...",
                         "connection_status": "Κατάσταση σύνδεσης Cloud",
                         "fetching_subscription": "Λήψη συνδρομής…",
                         "google": {
@@ -1686,6 +1771,8 @@
                             "info": "Με την ενοποίηση του Google Assistant για το Home Assistant Cloud θα έχετε τη δυνατότητα να ελέγχετε όλες τις συσκευές του Home Assistant μέσω οποιασδήποτε συσκευής με ενεργοποιημένο το Google Assistant.",
                             "info_state_reporting": "Αν ενεργοποιήσετε την αναφορά κατάστασης, το Home Assistant θα στείλει όλες τις αλλαγές κατάστασης των εκτεθειμένων οντοτήτων στην Google. Αυτό σας επιτρέπει να βλέπετε πάντα τις τελευταίες καταστάσεις στην εφαρμογή Google.",
                             "manage_entities": "Διαχείριση Οντοτήτων",
+                            "not_configured_text": "Προτού μπορέσετε να χρησιμοποιήσετε το Google Assistant, πρέπει να ενεργοποιήσετε τη δεξιότητα Home Assistant Cloud για το Google Assistant στην εφαρμογή Google Home.",
+                            "not_configured_title": "Το Google Assistant δεν είναι ενεργοποιημένο",
                             "security_devices": "Συσκευές ασφαλείας",
                             "sync_entities": "Συγχρονισμός οντοτήτων στο Google",
                             "sync_entities_404_message": "Αποτυχία συγχρονισμού των οντοτήτων σας με το Google, ζητήστε από το Google \"Hey Google, sync my devices\" για να συγχρονίσετε τις οντότητες σας.",
@@ -1707,6 +1794,7 @@
                             "instance_will_be_available": "Η παρουσία σας θα είναι διαθέσιμη στο",
                             "link_learn_how_it_works": "Μάθετε πώς λειτουργεί",
                             "not_connected": "Μη συνδεδεμένο",
+                            "reconnecting": "Επανασύνδεση",
                             "remote_enabled": {
                                 "caption": "Αυτόματη σύνδεση",
                                 "description": "Ενεργοποιήστε αυτήν την επιλογή για να βεβαιωθείτε ότι το Home Assistant είναι πάντα προσβάσιμο από το διαδίκτυο."
@@ -1737,9 +1825,9 @@
                             "loading": "Φόρτωση …",
                             "manage": "Διαχείριση",
                             "no_hooks_yet": "Φαίνεται ότι δεν έχετε ακόμα διαδικτυακά άγκιστρα. Ξεκινήστε με τη διαμόρφωση ενός ",
+                            "no_hooks_yet2": "ή δημιουργώντας ένα",
                             "no_hooks_yet_link_automation": "Αυτοματισμός διαδικτυακού αγκίστρου",
                             "no_hooks_yet_link_integration": "ενσωμάτωση βάσει διαδικτυακού αγκίστρου",
-                            "no_hooks_yet2": "ή δημιουργώντας ένα",
                             "title": "Webhooks"
                         }
                     },
@@ -1855,10 +1943,12 @@
                     "section": {
                         "core": {
                             "core_config": {
+                                "currency": "Νόμισμα",
                                 "edit_requires_storage": "Ο επεξεργαστής απενεργοποιήθηκε επειδή οι ρυθμίσεις παραμέτρων αποθηκεύτηκαν στο αρχείο configuration.yaml.",
                                 "elevation": "Ανύψωση",
                                 "elevation_meters": "μέτρα",
                                 "external_url": "Εξωτερική διεύθυνση URL",
+                                "find_currency_value": "Βρείτε την αξία σας",
                                 "imperial_example": "Φαρενάιτ, λίρες",
                                 "internal_url": "Εσωτερική διεύθυνση URL",
                                 "latitude": "Γεωγραφικό πλάτος",
@@ -1984,7 +2074,65 @@
                     "scripts": "Δέσμες ενεργειών",
                     "unknown_error": "Άγνωστο σφάλμα",
                     "unnamed_device": "Συσκευή χωρίς όνομα",
-                    "update": "Ενημέρωση"
+                    "update": "Ενημέρωση",
+                    "update_device_error": "Η ενημέρωση της συσκευής απέτυχε"
+                },
+                "energy": {
+                    "caption": "Ενέργεια",
+                    "description": "Παρακολουθήστε την παραγωγή και κατανάλωση ενέργειας",
+                    "device_consumption": {
+                        "add_stat": "Επιλέξτε οντότητα για να παρακολουθείτε την ενέργεια",
+                        "dialog": {
+                            "selected_stat_intro": "Επιλέξτε την οντότητα που αντιπροσωπεύει τη χρήση ενέργειας της συσκευής."
+                        },
+                        "learn_more": "Περισσότερες πληροφορίες για το πώς να ξεκινήσετε.",
+                        "selected_stat": "Παρακολούθηση ενέργειας για",
+                        "sub": "Η παρακολούθηση της κατανάλωσης ενέργειας μεμονωμένων συσκευών επιτρέπει στο Home Assistant να αναλύσει τη χρήση ενέργειας ανά συσκευή.",
+                        "title": "Μεμονωμένες συσκευές"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Χρησιμοποιήστε μια οντότητα με την τρέχουσα τιμή",
+                                "cost_entity_input": "Οντότητα με την τρέχουσα τιμή",
+                                "cost_number": "Χρήση στατικής τιμής",
+                                "cost_number_input": "Τιμή ανά kWh",
+                                "cost_number_suffix": "{νόμισμα}/kWh",
+                                "cost_para": "Επιλέξτε τον τρόπο με τον οποίο το Home Assistant θα παρακολουθεί το κόστος της καταναλισκόμενης ενέργειας.",
+                                "cost_stat": "Χρησιμοποιήστε μια οντότητα που παρακολουθεί το συνολικό κόστος",
+                                "cost_stat_input": "Οντότητα συνολικού κόστους",
+                                "energy_stat": "Κατανάλωση ενέργειας (kWh)",
+                                "header": "Διαμόρφωση της κατανάλωσης δικτύου",
+                                "no_cost": "Μην παρακολουθείτε το κόστος",
+                                "paragraph": "Η κατανάλωση πλέγματος είναι η ενέργεια που ρέει από το δίκτυο ενέργειας προς το σπίτι σας."
+                            },
+                            "to": {
+                                "cost_entity": "Χρησιμοποιήστε μια οντότητα με τρέχον επιτόκιο",
+                                "cost_entity_input": "Οντότητα με το τρέχον επιτόκιο",
+                                "cost_number": "Χρήση στατικού επιτοκίου",
+                                "cost_number_input": "Τιμή ανά kWh",
+                                "cost_number_suffix": "{νόμισμα}/kWh",
+                                "cost_para": "Παίρνετε χρήματα πίσω όταν επιστρέφετε ενέργεια στο δίκτυο;",
+                                "cost_stat": "Χρησιμοποιήστε μια οντότητα που παρακολουθεί το σύνολο των εισπραχθέντων χρημάτων",
+                                "cost_stat_input": "Οντότητα συνολικής αποζημίωσης",
+                                "energy_stat": "Ενέργεια που επιστρέφεται στο δίκτυο (kWh)",
+                                "header": "Διαμόρφωση παραγωγής πλέγματος",
+                                "no_cost": "Δεν παίρνω πίσω χρήματα",
+                                "paragraph": "Η παραγωγή πλέγματος είναι η ενέργεια που ρέει από τους ηλιακούς συλλέκτες σας στο δίκτυο."
+                            }
+                        },
+                        "learn_more": "Περισσότερες πληροφορίες για το πώς να ξεκινήσετε.",
+                        "sub": "Διαμορφώστε την ποσότητα ενέργειας που καταναλώνετε από το δίκτυο και, εάν παράγετε ενέργεια, επιστρέψτε στο δίκτυο. Αυτό επιτρέπει στο Home Assistant να παρακολουθεί ολόκληρη την κατανάλωση ενέργειας στο σπίτι.",
+                        "title": "Δίκτυο ηλεκτρικής ενέργειας"
+                    },
+                    "solar": {
+                        "learn_more": "Περισσότερες πληροφορίες για το πώς να ξεκινήσετε.",
+                        "stat_predicted_production": "Πρόβλεψη της παραγωγής ηλιακής ενέργειας",
+                        "stat_production": "Η παραγωγή ηλιακής ενέργειας",
+                        "stat_return_to_grid": "Η ηλιακή ενέργεια επέστρεψε στο δίκτυο",
+                        "sub": "Αφήστε το Home Assistant να παρακολουθεί τους ηλιακούς συλλέκτες σας και να σας παρέχει πληροφορίες σχετικά με την απόδοσή τους.",
+                        "title": "Ηλιακοί συλλέκτες"
+                    }
                 },
                 "entities": {
                     "caption": "Μητρώο οντοτήτων",
@@ -2036,11 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Εκκαθάριση",
-                    "filtering_by": "Φιλτράρισμα κατά",
-                    "show": "Εμφάνισε"
-                },
                 "header": "Διαμόρφωση του Home Assistant",
                 "helpers": {
                     "caption": "Βοηθοί",
@@ -2088,17 +2231,13 @@
                     "license": "Δημοσιεύτηκε κάτω από την άδεια χρήσης Apache 2.0",
                     "path_configuration": "Διαδρομή στo configuration.yaml: {path}",
                     "server": "Διακομιστής",
+                    "setup_time": "Χρόνος εγκατάστασης",
                     "source": "Πηγή",
-                    "system_health_error": "Το στοιχείο Υγεία Συστήματος δεν έχει φορτωθεί. Προσθέστε 'system_health:' στη ρύθμιση παραμέτρων configuration.yaml",
                     "system_health": {
                         "manage": "Διαχείριση",
                         "more_info": "Περισσότερες πληροφορίες"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Σελίδα ενσωματώσεων",
-                    "missing_zha": "Λείπει ο πίνακας διαμόρφωσης ZHA; Μετακινήθηκε στην καταχώριση ZHA στο {integrations_page} .",
-                    "missing_zwave": "Λείπει ο πίνακας διαμόρφωσης Z-Wave; Μετακινήθηκε στην καταχώριση Z-Wave στο {integrations_page} ."
+                    },
+                    "system_health_error": "Το στοιχείο Υγεία Συστήματος δεν έχει φορτωθεί. Προσθέστε 'system_health:' στη ρύθμιση παραμέτρων configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Προσθήκη ενσωμάτωσης",
@@ -2106,11 +2245,13 @@
                     "caption": "Ενσωματώσεις",
                     "config_entry": {
                         "area": "Στο {area}",
+                        "check_the_logs": "Ελέγξτε τα αρχεία καταγραφής",
+                        "configure": "Διαμόρφωση",
                         "delete": "Διαγραφή",
                         "delete_confirm": "Είστε σίγουρος ότι θέλετε να διαγραφεί αυτή η ενοποίηση;",
+                        "depends_on_cloud": "Εξαρτάται από το cloud",
                         "device_unavailable": "Η συσκευή δεν είναι διαθέσιμη",
                         "devices": "{count} {count, plural,\n  one {συσκευή}\n  other {συσκευές}\n}",
-                        "disable_restart_confirm": "Επανεκκινήστε το Home Assistant για να ολοκληρώσετε την απενεργοποίηση αυτής της ενσωμάτωσης",
                         "disable": {
                             "disable_confirm": "Είστε βέβαιοι ότι θέλετε να απενεργοποιήσετε αυτήν την καταχώριση διαμόρφωσης; Οι συσκευές και οι οντότητές του θα απενεργοποιηθούν.",
                             "disabled": "Απενεργοποιημένο",
@@ -2121,6 +2262,9 @@
                             },
                             "disabled_cause": "Απενεργοποιήθηκε από  {cause}."
                         },
+                        "disable_error": "Η ενεργοποίηση ή απενεργοποίηση της ενσωμάτωσης απέτυχε",
+                        "disable_restart_confirm": "Επανεκκινήστε το Home Assistant για να ολοκληρώσετε την απενεργοποίηση αυτής της ενσωμάτωσης",
+                        "disabled_polling": "Απενεργοποίηση της αυτόματης αναζήτησης ενημερωμένων δεδομένων",
                         "documentation": "Τεκμηρίωση",
                         "enable_restart_confirm": "Επανεκκινήστε το Home Assistant για να ολοκληρώσετε την ενεργοποίηση αυτής της ενσωμάτωσης",
                         "entities": "{count} {count, plural,\n  one {οντότητα}\n  other {οντότητες}\n}",
@@ -2129,13 +2273,22 @@
                         "hub": "Συνδεδεμένο μέσω",
                         "manuf": "από {manufacturer}",
                         "no_area": "Καμία περιοχή",
-                        "options": "Επιλογές",
+                        "not_loaded": "Δεν έχει φορτωθεί",
+                        "provided_by_custom_integration": "Παρέχεται από μια προσαρμοσμένη ενσωμάτωση",
                         "reload": "Επαναφόρτωση",
                         "reload_confirm": "Η ενσωμάτωση επαναφορτώθηκε",
                         "reload_restart_confirm": "Κάντε επανεκκίνηση του Home Assistant για να ολοκληρώσετε τη φόρτωση αυτής της ενσωμάτωσης",
                         "rename": "Μετονομασία",
                         "restart_confirm": "Επανεκκινήστε το Home Assistant για να ολοκληρώσετε την κατάργηση αυτής της ενοποίησης",
                         "services": "{count} {count, plural,\n  one {υπηρεσία}\n  other {υπηρεσίες}\n}",
+                        "state": {
+                            "failed_unload": "Αποτυχία φόρτωσης",
+                            "loaded": "Φορτώθηκε",
+                            "migration_error": "Σφάλμα μετεγκατάστασης",
+                            "not_loaded": "Δεν έχει φορτωθεί",
+                            "setup_error": "Αποτυχία ρύθμισης",
+                            "setup_retry": "Επανάληψη της ρύθμισης"
+                        },
                         "system_options": "Επιλογές συστήματος",
                         "unnamed_entry": "Ανώνυμη καταχώριση"
                     },
@@ -2152,9 +2305,14 @@
                             "open_site": "Άνοιγμα ιστότοπου"
                         },
                         "finish": "Τέλος",
-                        "loading_first_time": "Παρακαλώ περιμένετε καθώς εγκαθίσταται η ενσωμάτωση",
+                        "loading": {
+                            "fallback_title": "η ενσωμάτωση",
+                            "loading_flow": "Περιμένετε μέχρι να ρυθμιστεί η {integration}",
+                            "loading_step": "Φόρτωση επόμενου βήματος για {integration}"
+                        },
                         "next": "Επόμενο",
                         "not_all_required_fields": "Δε συμπληρώνονται όλα τα υποχρεωτικά πεδία.",
+                        "not_loaded": "Η ενσωμάτωση δεν μπόρεσε να φορτωθεί, προσπαθήστε να επανεκκινήσετε το Home Assistant.",
                         "pick_flow_step": {
                             "new_flow": "Όχι, ρυθμίστε μια άλλη παρουσία του {integration}",
                             "title": "Ανακαλύψαμε αυτά, θέλετε να τα στήσουμε;"
@@ -2168,7 +2326,7 @@
                     "details": "Λεπτομέρειες ενσωμάτωσης",
                     "disable": {
                         "disabled_integrations": "{number} απενεργοποιημένο",
-                        "hide_disabled": "Απόκρυψη απενεργοποιημένων ενσωματώσεων",
+                        "show": "Εμφάνιση",
                         "show_disabled": "Εμφάνιση απενεργοποιημένων ενσωματώσεων"
                     },
                     "discovered": "Ανακαλύφθηκε",
@@ -2178,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Διακόψτε την παράβλεψη του {name};",
                         "confirm_ignore": "Είστε βέβαιοι ότι δεν θέλετε να ρυθμίσετε αυτήν την ενσωμάτωση; Μπορείτε να αναιρέσετε αυτό κάνοντας κλικ στην επιλογή \"Εμφάνιση αγνοημένων ενσωματώσεων\" στο μενού υπερχείλισης επάνω δεξιά.",
                         "confirm_ignore_title": "Παράβλεψη της ανακάλυψη του {name} ;",
-                        "hide_ignored": "Απόκρυψη των ενσωματώσεων που παραβλέφθηκαν",
                         "ignore": "Παράβλεψη",
                         "ignored": "Παραβλέφθηκε",
                         "show_ignored": "Απόκρυψη των ενσωματώσεων που παραβλέφθηκαν",
@@ -2202,8 +2359,17 @@
                 "logs": {
                     "caption": "Αρχεία καταγραφής",
                     "clear": "Καθαρισμός",
+                    "custom_integration": "προσαρμοσμένη ενσωμάτωση",
                     "description": "Δείτε τα αρχεία καταγραφής του Home Assistant",
                     "details": "Λεπτομέρειες καταγραφής ({level})",
+                    "error_from_custom_integration": "Αυτό το σφάλμα προήλθε από μια προσαρμοσμένη ενσωμάτωση.",
+                    "level": {
+                        "critical": "CRITICAL",
+                        "debug": "DEBUG",
+                        "error": "ERROR",
+                        "info": "INFO",
+                        "warning": "WARNING"
+                    },
                     "load_full_log": "Φόρτωση ολόκληρου του αρχείου καταγραφής του Home Assistant.",
                     "loading_log": "Φόρτωση αρχείου καταγραφής σφαλμάτων…",
                     "multiple_messages": "μήνυμα παρουσιάστηκε για πρώτη φορά στο {time} και εμφανίζεται {counter} φορές",
@@ -2289,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Διαμόρφωση",
                     "description_listen": "Ακούστε ένα θέμα",
                     "description_publish": "Δημοσίευση πακέτου",
                     "listening_to": "Ακούγοντας το",
@@ -2303,7 +2468,6 @@
                     "topic": "θέμα"
                 },
                 "ozw": {
-                    "button": "Διαμόρφωση",
                     "common": {
                         "controller": "Ελεγκτής",
                         "instance": "Οντότητα",
@@ -2328,6 +2492,11 @@
                         "nodes": "Κόμβοι",
                         "select_instance": "Επιλέξτε στιγμιότυπο "
                     },
+                    "network": {
+                        "header": "Διαχείριση δικτύου",
+                        "introduction": "Διαχείριση λειτουργιών δικτύου.",
+                        "node_count": "{count} κόμβοι"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Όλοι οι κόμβοι έχουν ερωτηθεί.",
@@ -2348,10 +2517,9 @@
                         "starting": "Εκκίνηση",
                         "unknown": "Άγνωστο"
                     },
-                    "network": {
-                        "header": "Διαχείριση δικτύου",
-                        "introduction": "Διαχείριση λειτουργιών δικτύου.",
-                        "node_count": "{count} κόμβοι"
+                    "node": {
+                        "button": "Λεπτομέρειες κόμβου",
+                        "not_found": "Ο κόμβος δεν βρέθηκε"
                     },
                     "node_config": {
                         "header": "Ρύθμιση παραμέτρων κόμβου",
@@ -2381,10 +2549,6 @@
                         "versions": "Λήψη πληροφοριών σχετικά με εκδόσεις υλικολογισμικού και κλάσης εντολών",
                         "wakeup": "Ρύθμιση υποστήριξης για ουρές αφύπνισης και μηνύματα"
                     },
-                    "node": {
-                        "button": "Λεπτομέρειες κόμβου",
-                        "not_found": "Ο κόμβος δεν βρέθηκε"
-                    },
                     "nodes_table": {
                         "failed": "Απέτυχε",
                         "id": "Αναγνωριστικό",
@@ -2481,6 +2645,8 @@
                         "add_scene": "Προσθήκη σκηνής",
                         "delete_confirm": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή τη σκηνή;",
                         "delete_scene": "Διαγραφή σκηνής",
+                        "duplicate": "Διπλότυπο",
+                        "duplicate_scene": "Διπλότυπη σκηνή",
                         "edit_scene": "Επεξεργασία σκηνής",
                         "header": "Επεξεργαστής σκηνής",
                         "headers": {
@@ -2525,10 +2691,12 @@
                         },
                         "save_script": "Αποθήκευση σεναρίου",
                         "sequence": "Ακολουθία",
-                        "sequence_sentence": "Η ακολουθία των ενεργειών αυτού του σεναρίου."
+                        "sequence_sentence": "Η ακολουθία των ενεργειών αυτού του σεναρίου.",
+                        "show_trace": "Εμφάνιση ίχνους"
                     },
                     "picker": {
                         "add_script": "Δημιουργήστε νέο script",
+                        "dev_script": "Σενάριο εντοπισμού σφαλμάτων",
                         "duplicate": "Κλονοποίηση",
                         "duplicate_script": "Κλονοποίηση Script",
                         "edit_script": "Επεξεργασία σεναρίου",
@@ -2685,7 +2853,6 @@
                         "search_again": "Αναζήτηση ξανά",
                         "spinner": "Αναζήτηση συσκευών ZHA Zigbee…"
                     },
-                    "button": "Διαμόρφωση",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Χαρακτηριστικά της επιλεγμένης συστοιχίας",
                         "get_zigbee_attribute": "Λήψη χαρακτηριστικού Zigbee",
@@ -2713,6 +2880,10 @@
                         "manufacturer_code_override": "Παράκαμψη κωδικού κατασκευαστή",
                         "value": "Τιμή"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Συντομεύσεις",
+                        "update_button": "Ενημέρωση διαμόρφωσης"
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Η διαμόρφωση ολοκληρώθηκε",
                         "CONFIGURED_status_text": "Αρχικοποίηση",
@@ -2793,87 +2964,7 @@
                     "introduction": "Οι ζώνες σας επιτρέπουν να καθορίσετε ορισμένες περιοχές στη γη. Όταν ένα άτομο βρίσκεται μέσα σε μια ζώνη, η κατάσταση θα οριστεί από τη ζώνη. Οι ζώνες μπορούν επίσης να χρησιμοποιηθούν ως έναυσμα ή συνθήκη μέσα στις ρυθμίσεις αυτοματισμού.",
                     "no_zones_created_yet": "Φαίνεται ότι δεν έχετε δημιουργήσει ζώνες ακόμα."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Ακύρωση συμπερίληψης",
-                        "controller_in_inclusion_mode": "Ο ελεγκτής Z-Wave βρίσκεται τώρα σε κατάσταση συμπερίληψης.",
-                        "follow_device_instructions": "Ακολουθήστε τις οδηγίες που συνοδεύουν τη συσκευή σας για να ενεργοποιήσετε τη σύζευξη στη συσκευή.",
-                        "inclusion_failed": "Δεν ήταν δυνατή η προσθήκη του κόμβου. Ελέγξτε τα αρχεία καταγραφής για περισσότερες πληροφορίες.",
-                        "inclusion_finished": "Ο κόμβος έχει προστεθεί. Ενδέχεται να χρειαστούν μερικά λεπτά για να εμφανιστούν όλες οι οντότητες καθώς ολοκληρώνουμε τη ρύθμιση του κόμβου στο παρασκήνιο.",
-                        "introduction": "Αυτός ο οδηγός θα σας καθοδηγήσει στην προσθήκη ενός κόμβου στο δίκτυο Z-Wave.",
-                        "secure_inclusion_warning": "Οι ασφαλείς συσκευές απαιτούν πρόσθετο εύρος ζώνης. Πάρα πολλές ασφαλείς συσκευές μπορούν να επιβραδύνουν το δίκτυο Z-Wave. Συνιστούμε να χρησιμοποιείτε μόνο ασφαλή συμπερίληψη για συσκευές που την απαιτούν, όπως κλειδαριές ή ανοιχτήρια πορτών γκαράζ.",
-                        "start_inclusion": "Έναρξη συμπερίληψης",
-                        "start_secure_inclusion": "Έναρξη ασφαλούς συμπερίληψης",
-                        "title": "Προσθήκη κόμβου Z-Wave",
-                        "use_secure_inclusion": "Χρήση ασφαλούς συμπερίληψης",
-                        "view_device": "Προβολή συσκευής"
-                    },
-                    "button": "Διαμόρφωση",
-                    "common": {
-                        "add_node": "Προσθήκη κόμβου",
-                        "close": "Κλείσιμο",
-                        "home_id": "Αναγνωριστικό οικίας",
-                        "network": "Δίκτυο",
-                        "node_id": "Αναγνωριστικό κόμβου",
-                        "remove_node": "Κατάργηση κόμβου"
-                    },
-                    "dashboard": {
-                        "driver_version": "Έκδοση προγράμματος οδήγησης",
-                        "dump_dead_nodes_text": "Μερικοί από τους κόμβους σας δεν ανταποκρίθηκαν και θεωρούνται νεκροί. Αυτά δεν θα εξαχθούν πλήρως.",
-                        "dump_dead_nodes_title": "Μερικοί από τους κόμβους σου είναι νεκροί.",
-                        "dump_debug": "Λήψη μιας ένδειξης δίσκου του δικτύου σας για τη διάγνωση προβλημάτων",
-                        "dump_not_ready_confirm": "Λήψη",
-                        "dump_not_ready_text": "Εάν δημιουργήσετε μια εξαγωγή ενώ δεν είναι έτοιμοι όλοι οι κόμβοι, ενδέχεται να χάσετε τα απαιτούμενα δεδομένα. Δώστε στο δίκτυό σας κάποιο χρόνο για να υποβάλει ερώτημα σε όλους τους κόμβους. Θέλετε να συνεχίσετε με το αχούρι;",
-                        "dump_not_ready_title": "Δεν είναι όλοι οι κόμβοι έτοιμοι ακόμα",
-                        "header": "Διαχειριστείτε το δίκτυο Z-Wave",
-                        "home_id": "Αναγνωριστικό οικίας",
-                        "introduction": "Διαχειριστείτε το δίκτυο Z-Wave και τους κόμβους Z-Wave",
-                        "nodes_ready": "Κόμβοι έτοιμοι",
-                        "server_version": "Έκδοση διακομιστή"
-                    },
-                    "device_info": {
-                        "device_config": "Ρύθμιση παραμέτρων συσκευής",
-                        "node_ready": "Κόμβος έτοιμος",
-                        "node_status": "Κατάσταση Κόμβου",
-                        "zwave_info": "Πληροφορίες Z-Wave"
-                    },
-                    "navigation": {
-                        "network": "Δίκτυο"
-                    },
-                    "network_status": {
-                        "connected": "Συνδεδεμένο",
-                        "connecting": "Σύνδεση",
-                        "unknown": "Άγνωστο"
-                    },
-                    "node_config": {
-                        "attribution": "Οι παράμετροι και οι περιγραφές διαμόρφωσης συσκευής παρέχονται από το {device_database}",
-                        "battery_device_notice": "Οι συσκευές μπαταρίας πρέπει να είναι ξύπνιες για να ενημερώσουν τη διαμόρφωσή τους. Ανατρέξτε στο εγχειρίδιο της συσκευής σας για οδηγίες σχετικά με τον τρόπο αφύπνισης της συσκευής.",
-                        "error_device_not_found": "Η συσκευή δε βρέθηκε.",
-                        "header": "Ρύθμιση παραμέτρων συσκευής Z-Wave",
-                        "introduction": "Διαχείριση και ρύθμιση παραμέτρων συσκευής (κόμβου) για την επιλεγμένη συσκευή",
-                        "parameter_is_read_only": "Αυτή η παράμετρος είναι μόνο για ανάγνωση.",
-                        "zwave_js_device_database": "Βάση δεδομένων συσκευής Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Ζωντανό",
-                        "asleep": "Κοιμισμένο",
-                        "awake": "Ξύπνιο",
-                        "dead": "Νεκρό",
-                        "unknown": "Άγνωστο"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Ακύρωση εξαίρεσης",
-                        "controller_in_exclusion_mode": "Ο ελεγκτής Z-Wave βρίσκεται τώρα σε λειτουργία αποκλεισμού.",
-                        "exclusion_failed": "Δεν ήταν δυνατή η κατάργηση του κόμβου. Ελέγξτε τα αρχεία καταγραφής για περισσότερες πληροφορίες.",
-                        "exclusion_finished": "Ο κόμβος {id} έχει καταργηθεί από το δίκτυο Z-Wave.",
-                        "follow_device_instructions": "Ακολουθήστε τις οδηγίες που συνοδεύουν τη συσκευή σας για να ενεργοποιήσετε την εξαίρεση στη συσκευή.",
-                        "introduction": "Καταργήστε έναν κόμβο από το δίκτυο Z-Wave και καταργήστε τη συσχετισμένη συσκευή και οντότητες από το Home Assistant.",
-                        "start_exclusion": "Έναρξη εξαίρεσης",
-                        "title": "Κατάργηση κόμβου Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Διαμόρφωση",
                     "common": {
                         "index": "Δείκτης",
                         "instance": "Περίπτωση",
@@ -2962,6 +3053,144 @@
                     "values": {
                         "header": "Τιμές κόμβου"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Ακύρωση συμπερίληψης",
+                        "controller_in_inclusion_mode": "Ο ελεγκτής Z-Wave βρίσκεται τώρα σε κατάσταση συμπερίληψης.",
+                        "follow_device_instructions": "Ακολουθήστε τις οδηγίες που συνοδεύουν τη συσκευή σας για να ενεργοποιήσετε τη σύζευξη στη συσκευή.",
+                        "inclusion_failed": "Δεν ήταν δυνατή η προσθήκη του κόμβου. Ελέγξτε τα αρχεία καταγραφής για περισσότερες πληροφορίες.",
+                        "inclusion_finished": "Ο κόμβος έχει προστεθεί. Ενδέχεται να χρειαστούν μερικά λεπτά για να εμφανιστούν όλες οι οντότητες καθώς ολοκληρώνουμε τη ρύθμιση του κόμβου στο παρασκήνιο.",
+                        "interview_failed": "Η συνέντευξη της συσκευής απέτυχε. Πρόσθετες πληροφορίες μπορεί να υπάρχουν στα αρχεία καταγραφής.",
+                        "interview_started": "Η συσκευή ανακρίνεται. Αυτό μπορεί να πάρει λίγο χρόνο.",
+                        "introduction": "Αυτός ο οδηγός θα σας καθοδηγήσει στην προσθήκη ενός κόμβου στο δίκτυο Z-Wave.",
+                        "secure_inclusion_warning": "Οι ασφαλείς συσκευές απαιτούν πρόσθετο εύρος ζώνης. Πάρα πολλές ασφαλείς συσκευές μπορούν να επιβραδύνουν το δίκτυο Z-Wave. Συνιστούμε να χρησιμοποιείτε μόνο ασφαλή συμπερίληψη για συσκευές που την απαιτούν, όπως κλειδαριές ή ανοιχτήρια πορτών γκαράζ.",
+                        "start_inclusion": "Έναρξη συμπερίληψης",
+                        "start_secure_inclusion": "Έναρξη ασφαλούς συμπερίληψης",
+                        "title": "Προσθήκη κόμβου Z-Wave",
+                        "use_secure_inclusion": "Χρήση ασφαλούς συμπερίληψης",
+                        "view_device": "Προβολή συσκευής"
+                    },
+                    "common": {
+                        "add_node": "Προσθήκη κόμβου",
+                        "close": "Κλείσιμο",
+                        "heal_network": "Θεραπεία δικτύου",
+                        "home_id": "Αναγνωριστικό οικίας",
+                        "network": "Δίκτυο",
+                        "node_id": "Αναγνωριστικό κόμβου",
+                        "reconfigure_server": "Επαναδιαμόρφωση διακομιστή",
+                        "remove_node": "Κατάργηση κόμβου",
+                        "source": "Πηγή"
+                    },
+                    "dashboard": {
+                        "driver_version": "Έκδοση προγράμματος οδήγησης",
+                        "dump_dead_nodes_text": "Μερικοί από τους κόμβους σας δεν ανταποκρίθηκαν και θεωρούνται νεκροί. Αυτά δεν θα εξαχθούν πλήρως.",
+                        "dump_dead_nodes_title": "Μερικοί από τους κόμβους σου είναι νεκροί.",
+                        "dump_debug": "Λήψη μιας ένδειξης δίσκου του δικτύου σας για τη διάγνωση προβλημάτων",
+                        "dump_not_ready_confirm": "Λήψη",
+                        "dump_not_ready_text": "Εάν δημιουργήσετε μια εξαγωγή ενώ δεν είναι έτοιμοι όλοι οι κόμβοι, ενδέχεται να χάσετε τα απαιτούμενα δεδομένα. Δώστε στο δίκτυό σας κάποιο χρόνο για να υποβάλει ερώτημα σε όλους τους κόμβους. Θέλετε να συνεχίσετε με το αχούρι;",
+                        "dump_not_ready_title": "Δεν είναι όλοι οι κόμβοι έτοιμοι ακόμα",
+                        "header": "Διαχειριστείτε το δίκτυο Z-Wave",
+                        "home_id": "Αναγνωριστικό οικίας",
+                        "introduction": "Διαχειριστείτε το δίκτυο Z-Wave και τους κόμβους Z-Wave",
+                        "nodes_ready": "Κόμβοι έτοιμοι",
+                        "server_version": "Έκδοση διακομιστή"
+                    },
+                    "device_info": {
+                        "device_config": "Ρύθμιση παραμέτρων συσκευής",
+                        "heal_node": "Θεραπεία κόμβου",
+                        "node_ready": "Κόμβος έτοιμος",
+                        "node_status": "Κατάσταση Κόμβου",
+                        "reinterview_device": "Εκ νέου συνέντευξη συσκευής",
+                        "remove_failed": "Αφαίρεση αποτυχημένης συσκευής",
+                        "zwave_info": "Πληροφορίες Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Η θεραπεία του δικτύου ακυρώθηκε.",
+                        "healing_complete": "Η θεραπεία του δικτύου έχει ολοκληρωθεί.",
+                        "healing_failed": "Η θεραπεία απέτυχε. Πρόσθετες πληροφορίες ενδέχεται να είναι διαθέσιμες στα αρχεία καταγραφής.",
+                        "in_progress": "Η θεραπεία του δικτύου βρίσκεται σε εξέλιξη. Αυτό θα πάρει λίγο χρόνο.",
+                        "introduction": "Ξεκινήστε μια θεραπεία δικτύου στο δίκτυό σας Z-Wave. Μια θεραπεία δικτύου θα αναγκάσει όλες τις συσκευές να υπολογίσουν εκ νέου τις διαδρομές τους πίσω στον ελεγκτή και συνιστάται εάν έχετε μετακινήσει πρόσφατα συσκευές ή τον ελεγκτή σας.",
+                        "run_in_background": "Μπορείτε να κλείσετε αυτό το παράθυρο διαλόγου και η θεραπεία του δικτύου θα συνεχιστεί στο παρασκήνιο.",
+                        "start_heal": "Έναρξη επούλωσης",
+                        "stop_heal": "Σταμάτημα επούλωσης",
+                        "title": "Θεραπεύστε το δίκτυό σας Z-Wave",
+                        "traffic_warning": "Η διαδικασία επούλωσης δημιουργεί μεγάλο όγκο κίνησης στο δίκτυο Z-Wave. Αυτό μπορεί να προκαλέσει αργή απόκριση των συσκευών (ή καθόλου) ενώ η θεραπεία βρίσκεται σε εξέλιξη."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} έχει θεραπευτεί.",
+                        "healing_failed": "Δεν ήταν δυνατή η θεραπεία του {device}",
+                        "healing_failed_check_logs": "Πρόσθετες πληροφορίες ενδέχεται να είναι διαθέσιμες στα αρχεία καταγραφής.",
+                        "in_progress": "Η θεραπεία {device} βρίσκεται σε εξέλιξη.",
+                        "introduction": "Πείτε στο {device} να ενημερώσει τις διαδρομές του πίσω στον ελεγκτή. Αυτό μπορεί να βοηθήσει με προβλήματα επικοινωνίας εάν έχετε μετακινήσει πρόσφατα τη συσκευή ή τον ελεγκτή σας.",
+                        "network_heal_in_progress": "Μια θεραπεία δικτύου Z-Wave βρίσκεται ήδη σε εξέλιξη. Περιμένετε να ολοκληρωθεί πριν θεραπεύσετε μια μεμονωμένη συσκευή.",
+                        "start_heal": "Θεραπεία συσκευής",
+                        "title": "Θεραπεύστε μια συσκευή Z-Wave",
+                        "traffic_warning": "Η διαδικασία επούλωσης δημιουργεί μεγάλο όγκο κίνησης στο δίκτυο Z-Wave. Αυτό μπορεί να προκαλέσει αργή απόκριση των συσκευών (ή καθόλου) ενώ η θεραπεία βρίσκεται σε εξέλιξη."
+                    },
+                    "logs": {
+                        "log_level": "Επίπεδο καταγραφής",
+                        "log_level_changed": "Το επίπεδο καταγραφής άλλαξε σε: {level}",
+                        "subscribed_to_logs": "Εγγράφηκε στα μηνύματα καταγραφής JS Z-Wave...",
+                        "title": "Αρχεία καταγραφής Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Αρχεία καταγραφής",
+                        "network": "Δίκτυο"
+                    },
+                    "network_status": {
+                        "connected": "Συνδεδεμένο",
+                        "connecting": "Σύνδεση",
+                        "unknown": "Άγνωστο"
+                    },
+                    "node_config": {
+                        "attribution": "Οι παράμετροι και οι περιγραφές διαμόρφωσης συσκευής παρέχονται από το {device_database}",
+                        "battery_device_notice": "Οι συσκευές μπαταρίας πρέπει να είναι ξύπνιες για να ενημερώσουν τη διαμόρφωσή τους. Ανατρέξτε στο εγχειρίδιο της συσκευής σας για οδηγίες σχετικά με τον τρόπο αφύπνισης της συσκευής.",
+                        "error_device_not_found": "Η συσκευή δε βρέθηκε.",
+                        "header": "Ρύθμιση παραμέτρων συσκευής Z-Wave",
+                        "introduction": "Διαχείριση και ρύθμιση παραμέτρων συσκευής (κόμβου) για την επιλεγμένη συσκευή",
+                        "parameter": "Παράμετρος",
+                        "parameter_is_read_only": "Αυτή η παράμετρος είναι μόνο για ανάγνωση.",
+                        "set_param_accepted": "Η παράμετρος ενημερώθηκε.",
+                        "set_param_error": "Παρουσιάστηκε σφάλμα.",
+                        "set_param_queued": "Η αλλαγή παραμέτρων έχει τοποθετηθεί σε ουρά και θα ενημερωθεί όταν αφυπνιστεί η συσκευή.",
+                        "zwave_js_device_database": "Βάση δεδομένων συσκευής Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Ζωντανό",
+                        "asleep": "Κοιμισμένο",
+                        "awake": "Ξύπνιο",
+                        "dead": "Νεκρό",
+                        "unknown": "Άγνωστο"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Θα πρέπει να αφυπνίσετε τις συσκευές που λειτουργούν με μπαταρία πριν ξεκινήσετε την επαναληπτική συνέντευξη. Ανατρέξτε στο εγχειρίδιο της συσκευής σας για οδηγίες σχετικά με τον τρόπο αφύπνισης της συσκευής.",
+                        "in_progress": "Η συσκευή ανακρίνεται. Αυτό μπορεί να πάρει λίγο χρόνο.",
+                        "interview_complete": "Η συνέντευξη της συσκευής ολοκληρώθηκε.",
+                        "interview_failed": "Η συνέντευξη της συσκευής απέτυχε. Πρόσθετες πληροφορίες μπορεί να υπάρχουν στα αρχεία καταγραφής.",
+                        "introduction": "Επανεξετάστε μια συσκευή στο δίκτυο Z-Wave. Χρησιμοποιήστε αυτή τη λειτουργία εάν η συσκευή σας έχει ελλιπή ή λανθασμένη λειτουργία.",
+                        "run_in_background": "Μπορείτε να κλείσετε αυτό το παράθυρο διαλόγου και η συνέντευξη θα συνεχιστεί στο παρασκήνιο.",
+                        "start_reinterview": "Έναρξη επαναληπτικής συνέντευξης",
+                        "title": "Επανεξέταση μιας συσκευής Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Η αφαίρεση της συσκευής βρίσκεται σε εξέλιξη.",
+                        "introduction": "Καταργήστε μια αποτυχημένη συσκευή από το δίκτυο Z-Wave. Χρησιμοποιήστε αυτό εάν δεν μπορείτε να εξαιρέσετε μια συσκευή κανονικά, επειδή είναι κατεστραμμένη.",
+                        "removal_failed": "Δεν ήταν δυνατή η κατάργηση της συσκευής από το δίκτυο Z-Wave.",
+                        "removal_finished": "Ο κόμβος {id} έχει καταργηθεί από το δίκτυο Z-Wave.",
+                        "remove_device": "Κατάργηση συσκευής",
+                        "title": "Αφαίρεση μιας αποτυχημένης συσκευής Z-Wave"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Ακύρωση εξαίρεσης",
+                        "controller_in_exclusion_mode": "Ο ελεγκτής Z-Wave βρίσκεται τώρα σε λειτουργία αποκλεισμού.",
+                        "exclusion_failed": "Δεν ήταν δυνατή η κατάργηση του κόμβου. Ελέγξτε τα αρχεία καταγραφής για περισσότερες πληροφορίες.",
+                        "exclusion_finished": "Ο κόμβος {id} έχει καταργηθεί από το δίκτυο Z-Wave.",
+                        "follow_device_instructions": "Ακολουθήστε τις οδηγίες που συνοδεύουν τη συσκευή σας για να ενεργοποιήσετε την εξαίρεση στη συσκευή.",
+                        "introduction": "Καταργήστε έναν κόμβο από το δίκτυο Z-Wave και καταργήστε τη συσχετισμένη συσκευή και οντότητες από το Home Assistant.",
+                        "start_exclusion": "Έναρξη εξαίρεσης",
+                        "title": "Κατάργηση κόμβου Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3044,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Πίσω",
-                "supervisor": {
-                    "ask": "Ζητήσετε βοήθεια",
-                    "observer": "Έλεγχος του Παρατηρητή",
-                    "reboot": "Δοκιμάστε μια επανεκκίνηση του διακομιστή",
-                    "system_health": "Έλεγχος υγείας συστήματος",
-                    "title": "Δεν ήταν δυνατή η φόρτωση του πίνακα Supervisor!",
-                    "wait": "Εάν μόλις ξεκινήσατε, βεβαιωθείτε ότι έχετε δώσει στον Supervisor αρκετό χρόνο για να ξεκινήσει."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Προηγούμενη εβδομάδα",
-                    "this_week": "Αυτή την εβδομάδα",
-                    "today": "Σήμερα",
-                    "yesterday": "Εχθές"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Προηγούμενη εβδομάδα",
-                    "this_week": "Αυτή την εβδομάδα",
-                    "today": "Σήμερα",
-                    "yesterday": "Εχθές"
+            "energy": {
+                "charts": {
+                    "by_device": "Κατανάλωση ανά συσκευή",
+                    "solar": "Ηλιακός",
+                    "stat_house_energy_meter": "Συνολική κατανάλωση ενέργειας"
+                },
+                "setup": {
+                    "back": "Πίσω",
+                    "done": "Δείξτε μου τον ενεργειακό μου πίνακα!",
+                    "next": "Επόμενο"
                 }
             },
             "lovelace": {
@@ -3182,7 +3396,6 @@
                         "entities": {
                             "description": "Η καρτέλα Οντότητες είναι ο πιο συνηθισμένος τύπος κάρτας. Ομαδοποιεί τα στοιχεία σε λίστες.",
                             "edit_special_row": "Προβολή των λεπτομερειών αυτής της γραμμής κάνοντας κλικ στο κουμπί επεξεργασίας",
-                            "entity_row_editor": "Πρόγραμμα επεξεργασίας γραμμής οντότητας",
                             "entity_row": {
                                 "attribute": "Χαρακτηριστικό",
                                 "button": "Κουμπί",
@@ -3194,6 +3407,7 @@
                                 "section": "Ενότητα",
                                 "weblink": "Σύνδεσμος Ιστού"
                             },
+                            "entity_row_editor": "Πρόγραμμα επεξεργασίας γραμμής οντότητας",
                             "name": "Οντότητες",
                             "secondary_info_values": {
                                 "brightness": "Φωτεινότητα",
@@ -3220,6 +3434,7 @@
                         "gauge": {
                             "description": "Η κάρτα Gauge είναι μια βασική κάρτα που επιτρέπει την οπτική προβολή δεδομένων αισθητήρα.",
                             "name": "Μετρητής",
+                            "needle_gauge": "Εμφάνιση ως μετρητή βελόνας;",
                             "severity": {
                                 "define": "Ορισμός σοβαρότητας;",
                                 "green": "Πράσινος",
@@ -3232,6 +3447,7 @@
                             "attribute": "Χαρακτηριστικό",
                             "camera_image": "Οντότητα κάμερας",
                             "camera_view": "Προβολή κάμερας",
+                            "days_to_show": "Ημέρες για εμφάνιση",
                             "double_tap_action": "Ενέργεια διπλού πατήματος",
                             "entities": "Οντότητες",
                             "entity": "Οντότητα",
@@ -3345,6 +3561,10 @@
                             "integration_not_loaded": "Αυτή η κάρτα απαιτεί τη ρύθμιση της ενσωμάτσωσης \"shopping_list\".",
                             "name": "Λίστα αγορών"
                         },
+                        "statistics-graph": {
+                            "description": "Η κάρτα Γράφημα στατιστικών σας επιτρέπει να εμφανίσετε μια γραφική παράσταση των στατιστικών στοιχείων για κάθε μία από τις οντότητες που παρατίθενται.",
+                            "name": "Γράφημα στατιστικών"
+                        },
                         "thermostat": {
                             "description": "Η κάρτα Θερμοστάτη δίνει τον έλεγχο της κλιματικής οντότητας. Επιτρέποντάς σας να αλλάξετε τη θερμοκρασία και τον τρόπο της οντότητας.",
                             "name": "Θερμοστάτης"
@@ -3414,6 +3634,12 @@
                         "tab_badges": "Εμβλήματα",
                         "tab_settings": "Ρυθμίσεις",
                         "tab_visibility": "Ορατότητα",
+                        "type": "Τύπος προβολής",
+                        "types": {
+                            "masonry": "Τοιχοποιία (προεπιλογή)",
+                            "panel": "Πίνακας (1 κάρτα)",
+                            "sidebar": "Πλαϊνή μπάρα"
+                        },
                         "visibility": {
                             "select_users": "Επιλέξτε ποιοι χρήστες θα βλέπουν αυτήν την προβολή στην πλοήγηση"
                         }
@@ -3468,7 +3694,6 @@
                         "unsaved_changes": "Μη αποθηκευμένες αλλαγές"
                     },
                     "save_config": {
-                        "cancel": "Δεν πειράζει",
                         "close": "Κλείσιμο",
                         "empty_config": "Ξεκινήστε με μια κενή επισκόπηση",
                         "header": "Πάρτε τον έλεγχο του περιβάλλοντος χρήστη στο Lovelace",
@@ -3497,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Αυτό καθιστά την πρώτη κάρτα σε πλήρες πλάτος. Άλλες κάρτες σε αυτήν την προβολή, καθώς και σήματα δεν θα αποδοθούν.",
-                            "title": "Λειτουργία πίνακα;",
                             "warning_multiple_cards": "Αυτή η προβολή περιέχει περισσότερες από μία κάρτες, αλλά μια προβολή πίνακα μπορεί να εμφανίσει μόνο 1 κάρτα."
                         }
                     }
@@ -3700,6 +3923,9 @@
                 }
             },
             "page-onboarding": {
+                "analytics": {
+                    "finish": "Επόμενο"
+                },
                 "core-config": {
                     "button_detect": "Ανίχνευση",
                     "finish": "Επόμενο",
@@ -3709,17 +3935,26 @@
                     "location_name": "Όνομα της εγκατάστασης σας του Home Assistant",
                     "location_name_default": "Σπίτι"
                 },
+                "finish": "Τέλος",
                 "integration": {
                     "finish": "Τέλος",
                     "intro": "Οι συσκευές και οι υπηρεσίες εκπροσωπούνται στο Home Assistant ως ενσωματώσεις. Μπορείτε να τα ρυθμίσετε τώρα ή αργότερα από την οθόνη διαμόρφωσης.",
                     "more_integrations": "Περισσότερα"
                 },
                 "intro": "Είστε έτοιμοι να ξυπνήσετε το σπίτι σας, να διεκδικήσετε την ιδιωτικότητά σας και να συμμετάσχετε σε μια παγκόσμια κοινότητα μαστροχαλαστών;",
+                "next": "Επόμενο",
                 "restore": {
+                    "addons": "Πρόσθετα",
+                    "confirm_password": "Επιβεβαίωση κωδικού πρόσβασης στιγμιότυπου",
                     "description": "Εναλλακτικά, μπορείτε να κάνετε επαναφορά από ένα προηγούμενο στιγμιότυπο.",
+                    "folders": "Φάκελοι",
                     "hide_log": "Απόκρυψη πλήρους αρχείου καταγραφής",
                     "in_progress": "Επαναφορά σε εξέλιξη",
-                    "show_log": "Εμφάνιση πλήρους αρχείου καταγραφής"
+                    "password": "Κωδικός",
+                    "password_protection": "Προστασία με κωδικό πρόσβασης",
+                    "select_type": "Επιλέξτε τι θα επαναφέρετε",
+                    "show_log": "Εμφάνιση πλήρους αρχείου καταγραφής",
+                    "type": "Τύπος"
                 },
                 "user": {
                     "create_account": "Δημιουργία Λογαριασμού",
@@ -3796,6 +4031,12 @@
                     "prompt_copy_token": "Αντιγράψτε το διακριτικό πρόσβασης. Δεν θα εμφανιστεί ξανά.",
                     "prompt_name": "Δώστε ένα όνομα στο διακριτικό"
                 },
+                "mfa": {
+                    "confirm_disable": "Είστε βέβαιος ότι θέλετε να απενεργοποιήσετε το {name} ;",
+                    "disable": "Απενεργοποίηση",
+                    "enable": "Ενεργοποίηση",
+                    "header": "Πολυπαραγοντικά Αρθρώματα Ταυτοποίησης"
+                },
                 "mfa_setup": {
                     "close": "Κλείστε",
                     "step_done": "Η εγκατάσταση έγινε για {step}",
@@ -3803,11 +4044,18 @@
                     "title_aborted": "Ματαιώθηκε",
                     "title_success": "Επιτυχία!"
                 },
-                "mfa": {
-                    "confirm_disable": "Είστε βέβαιος ότι θέλετε να απενεργοποιήσετε το {name} ;",
-                    "disable": "Απενεργοποίηση",
-                    "enable": "Ενεργοποίηση",
-                    "header": "Πολυπαραγοντικά Αρθρώματα Ταυτοποίησης"
+                "number_format": {
+                    "description": "Επιλέξτε τον τρόπο μορφοποίησης των αριθμών.",
+                    "dropdown_label": "Μορφή αριθμού",
+                    "formats": {
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
+                        "language": "Αυτόματο (χρήση ρύθμισης γλώσσας)",
+                        "none": "Κανένα",
+                        "space_comma": "1 234 567,89",
+                        "system": "Χρήση της τοπικής γλώσσας του συστήματος"
+                    },
+                    "header": "Μορφή αριθμού"
                 },
                 "push_notifications": {
                     "add_device_prompt": {
@@ -3850,6 +4098,17 @@
                     "primary_color": "Πρωτεύον χρώμα",
                     "reset": "Επαναφορά"
                 },
+                "time_format": {
+                    "description": "Επιλέξτε τον τρόπο μορφοποίησης των ωρών.",
+                    "dropdown_label": "Μορφή ώρας",
+                    "formats": {
+                        "12": "12 ώρες (π.μ./μ.μ.)",
+                        "24": "24 ώρες",
+                        "language": "Αυτόματο (χρήση ρύθμισης γλώσσας)",
+                        "system": "Χρήση της τοπικής γλώσσας του συστήματος"
+                    },
+                    "header": "Μορφή ώρας"
+                },
                 "vibrate": {
                     "description": "Ενεργοποιήστε ή απενεργοποιήστε τις δονήσεις σε αυτήν τη συσκευή κατά τον έλεγχο συσκευών.",
                     "header": "Δόνηση"
diff --git a/translations/frontend/en.json b/translations/frontend/en.json
index aeaaf7b347..8d1c6f4d63 100644
--- a/translations/frontend/en.json
+++ b/translations/frontend/en.json
@@ -17,6 +17,7 @@
         "calendar": "Calendar",
         "config": "Configuration",
         "developer_tools": "Developer Tools",
+        "energy": "Energy",
         "history": "History",
         "logbook": "Logbook",
         "mailbox": "Mailbox",
@@ -26,6 +27,14 @@
         "shopping_list": "Shopping List",
         "states": "Overview"
     },
+    "state": {
+        "default": {
+            "off": "Off",
+            "on": "On",
+            "unavailable": "Unavailable",
+            "unknown": "Unknown"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Away"
         }
     },
-    "state": {
-        "default": {
-            "off": "Off",
-            "on": "On",
-            "unavailable": "Unavailable",
-            "unknown": "Unknown"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,33 @@
                 "not_installed": "Add-on is not installed"
             }
         },
+        "backup": {
+            "addons": "Add-ons",
+            "confirm_password": "Confirm backup password",
+            "could_not_create": "Could not create backup",
+            "create": "Create",
+            "create_backup": "Create backup",
+            "create_blocked_not_running": "Creating a backup is not possible right now because the system is in {state} state.",
+            "created": "Created",
+            "delete_backup_confirm": "delete",
+            "delete_backup_text": "Do you want to delete {number} {number, plural,\n  one {backup}\n  other {backups}\n}?",
+            "delete_backup_title": "Delete backup",
+            "delete_selected": "Delete selected backups",
+            "enter_password": "Please enter a password.",
+            "failed_to_delete": "Failed to delete",
+            "folders": "Folders",
+            "full_backup": "Full backup",
+            "name": "Backup name",
+            "no_backups": "You don't have any backups yet.",
+            "partial_backup": "Partial backup",
+            "password": "Backup password",
+            "password_protection": "Password protection",
+            "passwords_not_matching": "The passwords does not match",
+            "select_type": "Select what to restore",
+            "selected": "{number} selected",
+            "type": "Backup type",
+            "upload_backup": "Upload backup"
+        },
         "common": {
             "cancel": "Cancel",
             "close": "Close",
@@ -366,9 +394,9 @@
                 "text": "Do you want to restart the add-on with your changes?"
             },
             "update": {
-                "create_snapshot": "Create a snapshot of {name} before updating",
-                "snapshot": "Snapshot",
-                "snapshotting": "Creating snapshot of {name}",
+                "backup": "Backup",
+                "create_backup": "Create a backup of {name} before updating",
+                "creating_backup": "Creating backup of {name}",
                 "updating": "Updating {name} to version {version}"
             }
         },
@@ -382,49 +410,11 @@
             "not_supported": "This redirect is not supported by your Home Assistant instance. Check the {link} for the supported redirects and the version they where introduced."
         },
         "panel": {
+            "backups": "Backups",
             "dashboard": "Dashboard",
-            "snapshots": "Snapshots",
             "store": "Add-on Store",
             "system": "System"
         },
-        "snapshot": {
-            "addons": "Add-ons",
-            "available_snapshots": "Available Snapshots",
-            "confirm_password": "Confirm Snapshot password",
-            "could_not_create": "Could not create snapshot",
-            "create": "Create",
-            "create_blocked_not_running": "Creating a snapshot is not possible right now because the system is in {state} state.",
-            "create_snapshot": "Create snapshot",
-            "created": "Created",
-            "delete_selected": "Delete selected snapshots",
-            "delete_snapshot_confirm": "delete",
-            "delete_snapshot_text": "Do you want to delete {number} {number, plural,\n  one {snapshot}\n  other {snapshots}\n}?",
-            "delete_snapshot_title": "Delete snapshot",
-            "description": "Snapshots allow you to easily backup and restore all data of your Home Assistant instance.",
-            "enter_password": "Please enter a password.",
-            "failed_to_delete": "Failed to delete",
-            "folder": {
-                "addons/local": "Local add-ons",
-                "homeassistant": "Home Assistant configuration",
-                "media": "Media",
-                "share": "Share",
-                "ssl": "SSL"
-            },
-            "folders": "Folders",
-            "full_snapshot": "Full snapshot",
-            "name": "Snapshot name",
-            "no_snapshots": "You don't have any snapshots yet.",
-            "partial_snapshot": "Partial snapshot",
-            "password": "Snapshot password",
-            "password_protected": "password protected",
-            "password_protection": "Password protection",
-            "passwords_not_matching": "The passwords does not match",
-            "security": "Security",
-            "select_type": "Select what to restore",
-            "selected": "{number} selected",
-            "type": "Snapshot type",
-            "upload_snapshot": "Upload snapshot"
-        },
         "store": {
             "missing_addons": "Missing add-ons? Enable advanced mode in your user profile page",
             "no_results_found": "No results found in {repository}.",
@@ -760,6 +750,12 @@
             },
             "date-range-picker": {
                 "end_date": "End date",
+                "ranges": {
+                    "last_week": "Last week",
+                    "this_week": "This week",
+                    "today": "Today",
+                    "yesterday": "Yesterday"
+                },
                 "select": "Select",
                 "start_date": "Start date"
             },
@@ -851,10 +847,10 @@
                 "documentation": "documentation",
                 "learn_adding_local_media": "Learn more about adding media in the {documentation}.",
                 "local_media_files": "Place your video, audio and image files in the media directory to be able to browse and play them in the browser or on supported media players.",
+                "media-player-browser": "Media Player Browser",
                 "media_browsing_error": "Media Browsing Error",
                 "media_not_supported": "The Browser Media Player does not support this type of media",
                 "media_player": "Media Player",
-                "media-player-browser": "Media Player Browser",
                 "no_items": "No items",
                 "no_local_media_found": "No local media found",
                 "no_media_folder": "It looks like you have not yet created a media directory.",
@@ -924,6 +920,23 @@
             "service-picker": {
                 "service": "Service"
             },
+            "statistic-picker": {
+                "learn_more": "Learn more about statistics",
+                "missing_entity": "Why is my entity not listed?",
+                "no_match": "No matching statistics found",
+                "no_statistics": "You don't have any statistics",
+                "statistic": "Statistic"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Loading statistics...",
+                "no_statistics_found": "No statistics found.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "mean",
+                    "min": "min",
+                    "sum": "sum"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Pick area",
                 "add_device_id": "Pick device",
@@ -1112,6 +1125,10 @@
                 "form": {
                     "header": "Options"
                 },
+                "loading": {
+                    "loading_flow": "Please wait while the options for {integration} are being initialized",
+                    "loading_step": "Loading next step for {integration}"
+                },
                 "success": {
                     "description": "Options successfully saved."
                 }
@@ -1125,13 +1142,13 @@
                         "core": "General",
                         "customize": "Customizations",
                         "devices": "Devices",
+                        "energy": "Energy",
                         "entities": "Entities",
                         "helpers": "Helpers",
                         "info": "Info",
                         "integrations": "Integrations",
                         "logs": "Logs",
                         "lovelace": "Lovelace Dashboards",
-                        "navigate_to": "Navigate to {panel}",
                         "person": "People",
                         "scene": "Scenes",
                         "script": "Scripts",
@@ -1360,7 +1377,6 @@
                             "introduction": "The actions are what Home Assistant will do when the automation is triggered.",
                             "learn_more": "Learn more about actions",
                             "name": "Action",
-                            "type_select": "Action type",
                             "type": {
                                 "choose": {
                                     "add_option": "Add option",
@@ -1401,7 +1417,6 @@
                                 "repeat": {
                                     "label": "Repeat",
                                     "sequence": "Actions",
-                                    "type_select": "Repeat type",
                                     "type": {
                                         "count": {
                                             "label": "Count"
@@ -1414,7 +1429,8 @@
                                             "conditions": "While conditions",
                                             "label": "While"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Repeat type"
                                 },
                                 "scene": {
                                     "label": "Activate scene"
@@ -1434,6 +1450,7 @@
                                     "wait_template": "Wait Template"
                                 }
                             },
+                            "type_select": "Action type",
                             "unsupported_action": "No visual editor support for action: {action}"
                         },
                         "alias": "Name",
@@ -1452,7 +1469,6 @@
                             "introduction": "Conditions are optional and will prevent the automation from running unless all conditions are satisfied.",
                             "learn_more": "Learn more about conditions",
                             "name": "Condition",
-                            "type_select": "Condition type",
                             "type": {
                                 "and": {
                                     "label": "And"
@@ -1514,7 +1530,7 @@
                                     }
                                 },
                                 "trigger": {
-                                    "id": "Trigger Id",
+                                    "id": "Trigger ID",
                                     "label": "Trigger",
                                     "no_triggers": "No triggers available"
                                 },
@@ -1524,6 +1540,7 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Condition type",
                             "unsupported_condition": "No visual editor support for condition: {condition}"
                         },
                         "copy_to_clipboard": "Copy to Clipboard",
@@ -1565,7 +1582,6 @@
                             "introduction": "Triggers are what starts the processing of an automation rule. It is possible to specify multiple triggers for the same rule. Once a trigger starts, Home Assistant will validate the conditions, if any, and call the action.",
                             "learn_more": "Learn more about triggers",
                             "name": "Trigger",
-                            "type_select": "Trigger type",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1647,18 @@
                                     "label": "Template",
                                     "value_template": "Value template"
                                 },
-                                "time_pattern": {
-                                    "hours": "Hours",
-                                    "label": "Time Pattern",
-                                    "minutes": "Minutes",
-                                    "seconds": "Seconds"
-                                },
                                 "time": {
                                     "at": "At time",
                                     "label": "Time",
                                     "type_input": "Value of a date/time helper",
                                     "type_value": "Fixed time"
                                 },
+                                "time_pattern": {
+                                    "hours": "Hours",
+                                    "label": "Time Pattern",
+                                    "minutes": "Minutes",
+                                    "seconds": "Seconds"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1656,6 +1672,7 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Trigger type",
                             "unsupported_platform": "No visual editor support for platform: {platform}"
                         },
                         "unsaved_confirm": "You have unsaved changes. Are you sure you want to leave?"
@@ -1788,6 +1805,7 @@
                             "instance_will_be_available": "Your instance will be available at",
                             "link_learn_how_it_works": "Learn how it works",
                             "not_connected": "Not Connected",
+                            "reconnecting": "Reconnecting",
                             "remote_enabled": {
                                 "caption": "Automatically connect",
                                 "description": "Enable this option to make sure that your Home Assistant instance is always remotely accessible."
@@ -1818,9 +1836,9 @@
                             "loading": "Loading...",
                             "manage": "Manage",
                             "no_hooks_yet": "Looks like you have no webhooks yet. Get started by configuring a ",
+                            "no_hooks_yet2": " or by creating a ",
                             "no_hooks_yet_link_automation": "webhook automation",
                             "no_hooks_yet_link_integration": "webhook-based integration",
-                            "no_hooks_yet2": " or by creating a ",
                             "title": "Webhooks"
                         }
                     },
@@ -1935,41 +1953,13 @@
                     "description": "Unit system, location, time zone & other general parameters",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Before you enable this make sure you visit the analytics documentation page {link} to understand what you are sending and how it's stored.",
-                                "header": "Analytics",
-                                "instance_id": "Instance ID: {huuid}",
-                                "introduction": "Share your installation information to help make Home Assistant better and help us convince manufacturers to add local control and privacy-focused features.",
-                                "learn_more": "How we process your data",
-                                "needs_base": "You need to enable base analytics for this option to be available",
-                                "preference": {
-                                    "base": {
-                                        "description": "Instance ID, version and installation type.",
-                                        "title": "Basic analytics"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Share crash reports when unexpected errors occur.",
-                                        "title": "Diagnostics"
-                                    },
-                                    "statistics": {
-                                        "description": "Total used entities, users and other elements.",
-                                        "title": "Usage statistics"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Names, versions and capabilities.",
-                                        "title": "Used integrations and add-ons"
-                                    },
-                                    "usage": {
-                                        "description": "Names and version information.",
-                                        "title": "Used Integrations"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Currency",
                                 "edit_requires_storage": "Editor disabled because config stored in configuration.yaml.",
                                 "elevation": "Elevation",
                                 "elevation_meters": "meters",
                                 "external_url": "External URL",
+                                "find_currency_value": "Find your value",
                                 "imperial_example": "Fahrenheit, pounds",
                                 "internal_url": "Internal URL",
                                 "latitude": "Latitude",
@@ -2098,6 +2088,63 @@
                     "update": "Update",
                     "update_device_error": "Updating the device failed"
                 },
+                "energy": {
+                    "caption": "Energy",
+                    "description": "Monitor your energy production and consumption",
+                    "device_consumption": {
+                        "add_stat": "Pick entity to track energy of",
+                        "dialog": {
+                            "selected_stat_intro": "Select the entity that represents the device energy usage."
+                        },
+                        "learn_more": "More information on how to get started.",
+                        "selected_stat": "Tracking energy for",
+                        "sub": "Tracking the energy usage of individual devices allows Home Assistant to break down your energy usage by device.",
+                        "title": "Individual devices"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Use an entity with current price",
+                                "cost_entity_input": "Entity with the current price",
+                                "cost_number": "Use a static price",
+                                "cost_number_input": "Price per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Select how Home Assistant should keep track of the costs of the consumed energy.",
+                                "cost_stat": "Use an entity tracking the total costs",
+                                "cost_stat_input": "Total Costs Entity",
+                                "energy_stat": "Consumed Energy (kWh)",
+                                "header": "Configure grid consumption",
+                                "no_cost": "Do not track costs",
+                                "paragraph": "Grid consumption is the energy that flows from the energy grid to your home."
+                            },
+                            "to": {
+                                "cost_entity": "Use an entity with current rate",
+                                "cost_entity_input": "Entity with the current rate",
+                                "cost_number": "Use a static rate",
+                                "cost_number_input": "Rate per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Do you get money back when you return energy to the grid?",
+                                "cost_stat": "Use an entity tracking the total recieved money",
+                                "cost_stat_input": "Total Compensation Entity",
+                                "energy_stat": "Energy returned to the grid (kWh)",
+                                "header": "Configure grid production",
+                                "no_cost": "I do not get money back",
+                                "paragraph": "Grid production is the energy that flows from your solar panels to the grid."
+                            }
+                        },
+                        "learn_more": "More information on how to get started.",
+                        "sub": "Configure the amount of energy that you consume from the grid and, if you produce energy, give back to the grid. This allows Home Assistant to track your whole home energy usage.",
+                        "title": "Electricity grid"
+                    },
+                    "solar": {
+                        "learn_more": "More information on how to get started.",
+                        "stat_predicted_production": "Prediction of your solar energy production",
+                        "stat_production": "Your solar energy production",
+                        "stat_return_to_grid": "Solar energy returned to the grid",
+                        "sub": "Let Home Assistant monitor your solar panels and give you insight on their performance.",
+                        "title": "Solar Panels"
+                    }
+                },
                 "entities": {
                     "caption": "Entities",
                     "description": "Manage known entities",
@@ -2148,14 +2195,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Clear",
-                    "filtering_by": "Filtering by",
-                    "show": "Show"
-                },
-                "hassio": {
-                    "button": "Configure"
-                },
                 "header": "Configure Home Assistant",
                 "helpers": {
                     "caption": "Helpers",
@@ -2205,16 +2244,11 @@
                     "server": "server",
                     "setup_time": "Setup time",
                     "source": "Source:",
-                    "system_health_error": "System Health component is not loaded. Add 'system_health:' to configuration.yaml",
                     "system_health": {
                         "manage": "Manage",
                         "more_info": "more info"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "integrations page",
-                    "missing_zha": "Missing the ZHA config panel? It was moved to the ZHA entry on the {integrations_page}.",
-                    "missing_zwave": "Missing the Z-Wave config panel? It was moved to the Z-Wave entry on the {integrations_page}."
+                    },
+                    "system_health_error": "System Health component is not loaded. Add 'system_health:' to configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Add integration",
@@ -2229,8 +2263,6 @@
                         "depends_on_cloud": "Depends on the cloud",
                         "device_unavailable": "Device unavailable",
                         "devices": "{count} {count, plural,\n  one {device}\n  other {devices}\n}",
-                        "disable_error": "Enabling or disabling of the integration failed",
-                        "disable_restart_confirm": "Restart Home Assistant to finish disabling this integration",
                         "disable": {
                             "disable_confirm": "Are you sure you want to disable this config entry? Its devices and entities will be disabled.",
                             "disabled": "Disabled",
@@ -2241,6 +2273,8 @@
                             },
                             "disabled_cause": "Disabled by {cause}"
                         },
+                        "disable_error": "Enabling or disabling of the integration failed",
+                        "disable_restart_confirm": "Restart Home Assistant to finish disabling this integration",
                         "disabled_polling": "Automatic polling for updated data disabled",
                         "documentation": "Documentation",
                         "enable_restart_confirm": "Restart Home Assistant to finish enabling this integration",
@@ -2248,11 +2282,9 @@
                         "entity_unavailable": "Entity unavailable",
                         "firmware": "Firmware: {version}",
                         "hub": "Connected via",
-                        "logs": "logs",
                         "manuf": "by {manufacturer}",
                         "no_area": "No Area",
                         "not_loaded": "Not loaded",
-                        "options": "Options",
                         "provided_by_custom_integration": "Provided by a custom integration",
                         "reload": "Reload",
                         "reload_confirm": "The integration was reloaded",
@@ -2284,7 +2316,11 @@
                             "open_site": "Open website"
                         },
                         "finish": "Finish",
-                        "loading_first_time": "Please wait while the integration is being installed",
+                        "loading": {
+                            "fallback_title": "the integration",
+                            "loading_flow": "Please wait while {integration} is being setup",
+                            "loading_step": "Loading next step for {integration}"
+                        },
                         "next": "Next",
                         "not_all_required_fields": "Not all required fields are filled in.",
                         "not_loaded": "The integration could not be loaded, try to restart Home Assistant.",
@@ -2301,7 +2337,6 @@
                     "details": "Integration details",
                     "disable": {
                         "disabled_integrations": "{number} disabled",
-                        "hide_disabled": "Hide disabled integrations",
                         "show": "Show",
                         "show_disabled": "Show disabled integrations"
                     },
@@ -2312,7 +2347,6 @@
                         "confirm_delete_ignore_title": "Stop ignoring {name}?",
                         "confirm_ignore": "Are you sure you don't want to set up this integration? You can undo this by clicking the 'Show ignored integrations' in the overflow menu on the top right.",
                         "confirm_ignore_title": "Ignore discovery of {name}?",
-                        "hide_ignored": "Hide ignored integrations",
                         "ignore": "Ignore",
                         "ignored": "Ignored",
                         "show_ignored": "Show ignored integrations",
@@ -2432,7 +2466,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configure",
                     "description_listen": "Listen to a topic",
                     "description_publish": "Publish a packet",
                     "listening_to": "Listening to",
@@ -2446,7 +2479,6 @@
                     "topic": "topic"
                 },
                 "ozw": {
-                    "button": "Configure",
                     "common": {
                         "controller": "Controller",
                         "instance": "Instance",
@@ -2471,6 +2503,11 @@
                         "nodes": "Nodes",
                         "select_instance": "Select Instance"
                     },
+                    "network": {
+                        "header": "Network Management",
+                        "introduction": "Manage network-wide functions.",
+                        "node_count": "{count} nodes"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "All nodes have been queried",
@@ -2491,10 +2528,9 @@
                         "starting": "Starting",
                         "unknown": "Unknown"
                     },
-                    "network": {
-                        "header": "Network Management",
-                        "introduction": "Manage network-wide functions.",
-                        "node_count": "{count} nodes"
+                    "node": {
+                        "button": "Node Details",
+                        "not_found": "Node not found"
                     },
                     "node_config": {
                         "header": "Node Configuration",
@@ -2524,10 +2560,6 @@
                         "versions": "Obtaining information about firmware and command class versions",
                         "wakeup": "Setting up support for wake-up queues and messages"
                     },
-                    "node": {
-                        "button": "Node Details",
-                        "not_found": "Node not found"
-                    },
                     "nodes_table": {
                         "failed": "Failed",
                         "id": "ID",
@@ -2711,7 +2743,7 @@
                             "input_number": "Input numbers",
                             "input_select": "Input selects",
                             "input_text": "Input texts",
-                            "introduction": "Some parts of Home Assistant can reload without requiring a restart. Hitting reload will unload their current YAML configuration and load the new one.",
+                            "introduction": "Some parts of Home Assistant can reload without requiring a restart. Clicking one of the options below will unload their current YAML configuration and load the new one.",
                             "min_max": "Min/max entities",
                             "mqtt": "Manually configured MQTT entities",
                             "person": "People",
@@ -2832,7 +2864,6 @@
                         "search_again": "Search Again",
                         "spinner": "Searching for ZHA Zigbee devices..."
                     },
-                    "button": "Configure",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attributes of the selected cluster",
                         "get_zigbee_attribute": "Get Zigbee Attribute",
@@ -2862,12 +2893,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Shortcuts",
-                        "update_button": "Update Configuration",
-                        "zha_options": {
-                            "default_light_transition": "Default light transition time (seconds)",
-                            "enable_identify_on_join": "Enable identify effect when devices join the network",
-                            "title": "Global Options"
-                        }
+                        "update_button": "Update Configuration"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuration Complete",
@@ -2949,123 +2975,7 @@
                     "introduction": "Zones allow you to specify certain regions on earth. When a person is within a zone, the state will take the name from the zone. Zones can also be used as a trigger or condition inside automation setups.",
                     "no_zones_created_yet": "Looks like you have not created any zones yet."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Cancel Inclusion",
-                        "controller_in_inclusion_mode": "Your Z-Wave controller is now in inclusion mode.",
-                        "follow_device_instructions": "Follow the directions that came with your device to trigger pairing on the device.",
-                        "inclusion_failed": "The node could not be added. Please check the logs for more information.",
-                        "inclusion_finished": "The node has been added.",
-                        "interview_failed": "The device interview failed. Additional information may be available in the logs.",
-                        "interview_started": "The device is being interviewed. This may take some time.",
-                        "introduction": "This wizard will guide you through adding a node to your Z-Wave network.",
-                        "secure_inclusion_warning": "Secure devices require additional bandwidth; too many secure devices can slow down your Z-Wave network. We recommend only using secure inclusion for devices that require it, like locks or garage door openers.",
-                        "start_inclusion": "Start Inclusion",
-                        "start_secure_inclusion": "Start Secure Inclusion",
-                        "title": "Add a Z-Wave Node",
-                        "use_secure_inclusion": "Use secure inclusion",
-                        "view_device": "View Device"
-                    },
-                    "button": "Configure",
-                    "common": {
-                        "add_node": "Add Node",
-                        "close": "Close",
-                        "heal_network": "Heal Network",
-                        "home_id": "Home ID",
-                        "network": "Network",
-                        "node_id": "Node ID",
-                        "reconfigure_server": "Re-configure Server",
-                        "remove_node": "Remove Node"
-                    },
-                    "dashboard": {
-                        "driver_version": "Driver Version",
-                        "dump_dead_nodes_text": "Some of your nodes didn't respond and are assumed dead. These will not be fully exported.",
-                        "dump_dead_nodes_title": "Some of your nodes are dead",
-                        "dump_debug": "Download a dump of your network to help diagnose issues",
-                        "dump_not_ready_confirm": "Download",
-                        "dump_not_ready_text": "If you create an export while not all nodes are ready, you could miss needed data. Give your network some time to query all nodes. Do you want to continue with the dump?",
-                        "dump_not_ready_title": "Not all nodes are ready yet",
-                        "header": "Manage your Z-Wave Network",
-                        "home_id": "Home ID",
-                        "introduction": "Manage your Z-Wave network and Z-Wave nodes",
-                        "nodes_ready": "Nodes ready",
-                        "server_version": "Server Version"
-                    },
-                    "device_info": {
-                        "device_config": "Configure Device",
-                        "node_ready": "Node Ready",
-                        "node_status": "Node Status",
-                        "zwave_info": "Z-Wave Info"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Network healing has been cancelled.",
-                        "healing_complete": "Network healing is complete.",
-                        "healing_failed": "Healing failed. Additional information may be available in the logs.",
-                        "in_progress": "Network healing is in progress. This will take some time.",
-                        "introduction": "Start a network heal on your Z-Wave network. A network heal will cause all devices to re-calculate their routes back to the controller and is recommended if you have recently moved devices or your controller.",
-                        "run_in_background": "You can close this dialog and the network healing will continue in the background.",
-                        "start_heal": "Start Healing",
-                        "stop_heal": "Stop Healing",
-                        "title": "Heal your Z-Wave Network",
-                        "traffic_warning": "The healing process generates a large amount of traffic on the Z-Wave network. This may cause devices to respond slowly (or not at all) while the heal is in progress."
-                    },
-                    "logs": {
-                        "log_level": "Log Level",
-                        "log_level_changed": "Log Level changed to: {level}",
-                        "subscribed_to_logs": "Subscribed to Z-Wave JS Log Messages...",
-                        "title": "Z-Wave JS Logs"
-                    },
-                    "navigation": {
-                        "logs": "Logs",
-                        "network": "Network"
-                    },
-                    "network_status": {
-                        "connected": "Connected",
-                        "connecting": "Connecting",
-                        "unknown": "Unknown"
-                    },
-                    "node_config": {
-                        "attribution": "Device configuration parameters and descriptions are provided by the {device_database}",
-                        "battery_device_notice": "Battery devices must be awake to update their config. Please refer to your device manual for instructions on how to wake the device.",
-                        "error_device_not_found": "Device not found",
-                        "header": "Z-Wave Device Configuration",
-                        "introduction": "Manage and adjust device (node) specific configuration parameters for the selected device",
-                        "parameter_is_read_only": "This parameter is read-only.",
-                        "set_param_accepted": "The parameter has been updated.",
-                        "set_param_error": "An error occurred.",
-                        "set_param_queued": "The parameter change has been queued, and will be updated when the device wakes up.",
-                        "zwave_js_device_database": "Z-Wave JS Device Database"
-                    },
-                    "node_status": {
-                        "alive": "Alive",
-                        "asleep": "Asleep",
-                        "awake": "Awake",
-                        "dead": "Dead",
-                        "unknown": "Unknown"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "You will need to wake battery powered devices before starting the re-interview. Refer to your device's manual for instructions on how to wake the device.",
-                        "in_progress": "The device is being interviewed. This may take some time.",
-                        "interview_complete": "Device interview complete.",
-                        "interview_failed": "The device interview failed. Additional information may be available in the logs.",
-                        "introduction": "Re-interview a device on your Z-Wave network. Use this feature if your device has missing or incorrect functionality.",
-                        "run_in_background": "You can close this dialog and the interview will continue in the background.",
-                        "start_reinterview": "Start Re-interview",
-                        "title": "Re-interview a Z-Wave Device"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Cancel Exclusion",
-                        "controller_in_exclusion_mode": "Your Z-Wave controller is now in exclusion mode.",
-                        "exclusion_failed": "The node could not be removed. Please check the logs for more information.",
-                        "exclusion_finished": "Node {id} has been removed from your Z-Wave network.",
-                        "follow_device_instructions": "Follow the directions that came with your device to trigger exclusion on the device.",
-                        "introduction": "Remove a node from your Z-Wave network, and remove the associated device and entities from Home Assistant.",
-                        "start_exclusion": "Start Exclusion",
-                        "title": "Remove a Z-Wave Node"
-                    }
-                },
                 "zwave": {
-                    "button": "Configure",
                     "common": {
                         "index": "Index",
                         "instance": "Instance",
@@ -3154,6 +3064,144 @@
                     "values": {
                         "header": "Node Values"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Cancel Inclusion",
+                        "controller_in_inclusion_mode": "Your Z-Wave controller is now in inclusion mode.",
+                        "follow_device_instructions": "Follow the directions that came with your device to trigger pairing on the device.",
+                        "inclusion_failed": "The node could not be added. Please check the logs for more information.",
+                        "inclusion_finished": "The node has been added.",
+                        "interview_failed": "The device interview failed. Additional information may be available in the logs.",
+                        "interview_started": "The device is being interviewed. This may take some time.",
+                        "introduction": "This wizard will guide you through adding a node to your Z-Wave network.",
+                        "secure_inclusion_warning": "Secure devices require additional bandwidth; too many secure devices can slow down your Z-Wave network. We recommend only using secure inclusion for devices that require it, like locks or garage door openers.",
+                        "start_inclusion": "Start Inclusion",
+                        "start_secure_inclusion": "Start Secure Inclusion",
+                        "title": "Add a Z-Wave Node",
+                        "use_secure_inclusion": "Use secure inclusion",
+                        "view_device": "View Device"
+                    },
+                    "common": {
+                        "add_node": "Add Node",
+                        "close": "Close",
+                        "heal_network": "Heal Network",
+                        "home_id": "Home ID",
+                        "network": "Network",
+                        "node_id": "Node ID",
+                        "reconfigure_server": "Re-configure Server",
+                        "remove_node": "Remove Node",
+                        "source": "Source"
+                    },
+                    "dashboard": {
+                        "driver_version": "Driver Version",
+                        "dump_dead_nodes_text": "Some of your nodes didn't respond and are assumed dead. These will not be fully exported.",
+                        "dump_dead_nodes_title": "Some of your nodes are dead",
+                        "dump_debug": "Download a dump of your network to help diagnose issues",
+                        "dump_not_ready_confirm": "Download",
+                        "dump_not_ready_text": "If you create an export while not all nodes are ready, you could miss needed data. Give your network some time to query all nodes. Do you want to continue with the dump?",
+                        "dump_not_ready_title": "Not all nodes are ready yet",
+                        "header": "Manage your Z-Wave Network",
+                        "home_id": "Home ID",
+                        "introduction": "Manage your Z-Wave network and Z-Wave nodes",
+                        "nodes_ready": "Nodes ready",
+                        "server_version": "Server Version"
+                    },
+                    "device_info": {
+                        "device_config": "Configure Device",
+                        "heal_node": "Heal Node",
+                        "node_ready": "Node Ready",
+                        "node_status": "Node Status",
+                        "reinterview_device": "Re-interview Device",
+                        "remove_failed": "Remove Failed Device",
+                        "zwave_info": "Z-Wave Info"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Network healing has been cancelled.",
+                        "healing_complete": "Network healing is complete.",
+                        "healing_failed": "Healing failed. Additional information may be available in the logs.",
+                        "in_progress": "Network healing is in progress. This will take some time.",
+                        "introduction": "Start a network heal on your Z-Wave network. A network heal will cause all devices to re-calculate their routes back to the controller and is recommended if you have recently moved devices or your controller.",
+                        "run_in_background": "You can close this dialog and the network healing will continue in the background.",
+                        "start_heal": "Start Healing",
+                        "stop_heal": "Stop Healing",
+                        "title": "Heal your Z-Wave Network",
+                        "traffic_warning": "The healing process generates a large amount of traffic on the Z-Wave network. This may cause devices to respond slowly (or not at all) while the heal is in progress."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} has been healed.",
+                        "healing_failed": "{device} could not be healed.",
+                        "healing_failed_check_logs": "Additional information may be available in the logs.",
+                        "in_progress": "{device} healing is in progress.",
+                        "introduction": "Tell {device} to update its routes back to the controller. This can help with communication issues if you have recently moved the device or your controller.",
+                        "network_heal_in_progress": "A Z-Wave network heal is already in progress. Please wait for it to finish before healing an individual device.",
+                        "start_heal": "Heal Device",
+                        "title": "Heal a Z-Wave Device",
+                        "traffic_warning": "The healing process generates a large amount of traffic on the Z-Wave network. This may cause devices to respond slowly (or not at all) while the heal is in progress."
+                    },
+                    "logs": {
+                        "log_level": "Log Level",
+                        "log_level_changed": "Log Level changed to: {level}",
+                        "subscribed_to_logs": "Subscribed to Z-Wave JS Log Messages...",
+                        "title": "Z-Wave JS Logs"
+                    },
+                    "navigation": {
+                        "logs": "Logs",
+                        "network": "Network"
+                    },
+                    "network_status": {
+                        "connected": "Connected",
+                        "connecting": "Connecting",
+                        "unknown": "Unknown"
+                    },
+                    "node_config": {
+                        "attribution": "Device configuration parameters and descriptions are provided by the {device_database}",
+                        "battery_device_notice": "Battery devices must be awake to update their config. Please refer to your device manual for instructions on how to wake the device.",
+                        "error_device_not_found": "Device not found",
+                        "header": "Z-Wave Device Configuration",
+                        "introduction": "Manage and adjust device (node) specific configuration parameters for the selected device",
+                        "parameter": "Parameter",
+                        "parameter_is_read_only": "This parameter is read-only.",
+                        "set_param_accepted": "The parameter has been updated.",
+                        "set_param_error": "An error occurred.",
+                        "set_param_queued": "The parameter change has been queued, and will be updated when the device wakes up.",
+                        "zwave_js_device_database": "Z-Wave JS Device Database"
+                    },
+                    "node_status": {
+                        "alive": "Alive",
+                        "asleep": "Asleep",
+                        "awake": "Awake",
+                        "dead": "Dead",
+                        "unknown": "Unknown"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "You will need to wake battery powered devices before starting the re-interview. Refer to your device's manual for instructions on how to wake the device.",
+                        "in_progress": "The device is being interviewed. This may take some time.",
+                        "interview_complete": "Device interview complete.",
+                        "interview_failed": "The device interview failed. Additional information may be available in the logs.",
+                        "introduction": "Re-interview a device on your Z-Wave network. Use this feature if your device has missing or incorrect functionality.",
+                        "run_in_background": "You can close this dialog and the interview will continue in the background.",
+                        "start_reinterview": "Start Re-interview",
+                        "title": "Re-interview a Z-Wave Device"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "The device removal is in progress.",
+                        "introduction": "Remove a failed device from your Z-Wave network. Use this if you are unable to exclude a device normally because it is broken.",
+                        "removal_failed": "The device could not be removed from your Z-Wave network.",
+                        "removal_finished": "Node {id} has been removed from your Z-Wave network.",
+                        "remove_device": "Remove Device",
+                        "title": "Remove a Failed Z-Wave Device"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Cancel Exclusion",
+                        "controller_in_exclusion_mode": "Your Z-Wave controller is now in exclusion mode.",
+                        "exclusion_failed": "The node could not be removed. Please check the logs for more information.",
+                        "exclusion_finished": "Node {id} has been removed from your Z-Wave network.",
+                        "follow_device_instructions": "Follow the directions that came with your device to trigger exclusion on the device.",
+                        "introduction": "Remove a node from your Z-Wave network, and remove the associated device and entities from Home Assistant.",
+                        "start_exclusion": "Start Exclusion",
+                        "title": "Remove a Z-Wave Node"
+                    }
                 }
             },
             "custom": {
@@ -3236,31 +3284,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Go back",
-                "supervisor": {
-                    "ask": "Ask for help",
-                    "observer": "Check the Observer",
-                    "reboot": "Try a reboot of the host",
-                    "system_health": "Check System Health",
-                    "title": "Could not load the Supervisor panel!",
-                    "wait": "If you just started, make sure you have given the supervisor enough time to start."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Last week",
-                    "this_week": "This week",
-                    "today": "Today",
-                    "yesterday": "Yesterday"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Last week",
-                    "this_week": "This week",
-                    "today": "Today",
-                    "yesterday": "Yesterday"
+            "energy": {
+                "charts": {
+                    "by_device": "Consumption by device",
+                    "solar": "Solar",
+                    "stat_house_energy_meter": "Total energy consumption"
+                },
+                "setup": {
+                    "back": "Back",
+                    "done": "Show me my energy dashboard!",
+                    "next": "Next"
                 }
             },
             "lovelace": {
@@ -3374,7 +3407,6 @@
                         "entities": {
                             "description": "The Entities card is the most common type of card. It groups items together into lists.",
                             "edit_special_row": "View the details of this row by clicking the edit button",
-                            "entity_row_editor": "Entity Row Editor",
                             "entity_row": {
                                 "attribute": "Attribute",
                                 "button": "Button",
@@ -3386,6 +3418,7 @@
                                 "section": "Section",
                                 "weblink": "Web Link"
                             },
+                            "entity_row_editor": "Entity Row Editor",
                             "name": "Entities",
                             "secondary_info_values": {
                                 "brightness": "Brightness",
@@ -3412,6 +3445,7 @@
                         "gauge": {
                             "description": "The Gauge card is a basic card that allows visually seeing sensor data.",
                             "name": "Gauge",
+                            "needle_gauge": "Display as needle gauge?",
                             "severity": {
                                 "define": "Define Severity?",
                                 "green": "Green",
@@ -3424,6 +3458,7 @@
                             "attribute": "Attribute",
                             "camera_image": "Camera Entity",
                             "camera_view": "Camera View",
+                            "days_to_show": "Days to Show",
                             "double_tap_action": "Double Tap Action",
                             "entities": "Entities",
                             "entity": "Entity",
@@ -3537,6 +3572,10 @@
                             "integration_not_loaded": "This card requires the `shopping_list` integration to be set up.",
                             "name": "Shopping List"
                         },
+                        "statistics-graph": {
+                            "description": "The Statistics Graph card allows you to display a graph of the statistics for each of the entities listed.",
+                            "name": "Statistics Graph"
+                        },
                         "thermostat": {
                             "description": "The Thermostat card gives control of your climate entity. Allowing you to change the temperature and mode of the entity.",
                             "name": "Thermostat"
@@ -3606,6 +3645,12 @@
                         "tab_badges": "Badges",
                         "tab_settings": "Settings",
                         "tab_visibility": "Visibility",
+                        "type": "View type",
+                        "types": {
+                            "masonry": "Masonry (default)",
+                            "panel": "Panel (1 card)",
+                            "sidebar": "Sidebar"
+                        },
                         "visibility": {
                             "select_users": "Select which users should see this view in the navigation"
                         }
@@ -3660,7 +3705,6 @@
                         "unsaved_changes": "Unsaved changes"
                     },
                     "save_config": {
-                        "cancel": "Never mind",
                         "close": "Close",
                         "empty_config": "Start with an empty dashboard",
                         "header": "Take control of your Lovelace UI",
@@ -3689,8 +3733,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "This renders the first card at full width. Other cards in this view as well as badges will not be rendered.",
-                            "title": "Panel Mode?",
                             "warning_multiple_cards": "This view contains more than one card, but a panel view can only show 1 card."
                         }
                     }
@@ -3893,8 +3935,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Next",
-                    "intro": "Share analytics from your instance. This data will be publicly available at {link}"
+                    "finish": "Next"
                 },
                 "core-config": {
                     "button_detect": "Detect",
@@ -3915,18 +3956,18 @@
                 "next": "Next",
                 "restore": {
                     "addons": "Add-ons",
-                    "confirm_password": "Confirm Snapshot password",
-                    "description": "Alternatively you can restore from a previous snapshot.",
+                    "confirm_password": "Confirm backup password",
+                    "description": "Alternatively you can restore from a previous backup.",
                     "folders": "Folders",
-                    "full_snapshot": "Full snapshot",
+                    "full_backup": "Full backup",
                     "hide_log": "Hide full log",
                     "in_progress": "Restore in progress",
-                    "partial_snapshot": "Partial snapshot",
-                    "password": "Snapshot password",
+                    "partial_backup": "Partial backup",
+                    "password": "Backup password",
                     "password_protection": "Password protection",
                     "select_type": "Select what to restore",
                     "show_log": "Show full log",
-                    "type": "Snapshot type"
+                    "type": "Backup type"
                 },
                 "user": {
                     "create_account": "Create Account",
@@ -4003,6 +4044,12 @@
                     "prompt_copy_token": "Copy your access token. It will not be shown again.",
                     "prompt_name": "Give the token a name"
                 },
+                "mfa": {
+                    "confirm_disable": "Are you sure you want to disable {name}?",
+                    "disable": "Disable",
+                    "enable": "Enable",
+                    "header": "Multi-factor Authentication Modules"
+                },
                 "mfa_setup": {
                     "close": "Close",
                     "step_done": "Setup done for {step}",
@@ -4010,12 +4057,6 @@
                     "title_aborted": "Aborted",
                     "title_success": "Success!"
                 },
-                "mfa": {
-                    "confirm_disable": "Are you sure you want to disable {name}?",
-                    "disable": "Disable",
-                    "enable": "Enable",
-                    "header": "Multi-factor Authentication Modules"
-                },
                 "number_format": {
                     "description": "Choose how numbers are formatted.",
                     "dropdown_label": "Number format",
diff --git a/translations/frontend/eo.json b/translations/frontend/eo.json
index a3de90c8ac..319200cf96 100644
--- a/translations/frontend/eo.json
+++ b/translations/frontend/eo.json
@@ -158,7 +158,6 @@
                         "confirm_delete_ignore_title": "Ĉu haltu ignori {name} ?",
                         "confirm_ignore": "Ĉu vi certas, ke vi ne volas agordi ĉi tiun integriĝon? Vi povas malfari tion alklakante \"Montri ignoratajn integriĝojn\" en la superfluta menuo en la supra dekstra.",
                         "confirm_ignore_title": "Ĉu ignori malkovron de {name} ?",
-                        "hide_ignored": "Kaŝu ignoratajn integriĝojn",
                         "ignore": "Ignori",
                         "ignored": "Ignorata",
                         "show_ignored": "Montru ignoratajn integriĝojn",
@@ -457,12 +456,6 @@
                         "error_invalid_config": "Via config ne estas valida: {error}",
                         "error_parse_yaml": "Ne eblas analizi YAML: {error}",
                         "error_save_yaml": "Ne eblas konservi YAML: {error}"
-                    },
-                    "view": {
-                        "panel_mode": {
-                            "description": "Ĉi tio redonas la unuan karton je plena larĝo; aliaj kartoj laŭ ĉi tiu vido ne estos redonitaj.",
-                            "title": "Panela Modo?"
-                        }
                     }
                 },
                 "menu": {
diff --git a/translations/frontend/es-419.json b/translations/frontend/es-419.json
index 6df6c79aaf..432674cbd1 100644
--- a/translations/frontend/es-419.json
+++ b/translations/frontend/es-419.json
@@ -17,6 +17,7 @@
         "calendar": "Calendario",
         "config": "",
         "developer_tools": "Herramientas para desarrolladores",
+        "energy": "Energía",
         "history": "",
         "logbook": "",
         "mailbox": "",
@@ -26,6 +27,14 @@
         "shopping_list": "Lista de compras",
         "states": ""
     },
+    "state": {
+        "default": {
+            "off": "Apagado",
+            "on": "Encendido",
+            "unavailable": "No disponible",
+            "unknown": "Desconocido"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Fuera de casa"
         }
     },
-    "state": {
-        "default": {
-            "off": "Apagado",
-            "on": "Encendido",
-            "unavailable": "No disponible",
-            "unknown": "Desconocido"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "El complemento no está instalado"
             }
         },
+        "backup": {
+            "addons": "Complementos",
+            "confirm_password": "Confirmar la contraseña de la instantánea",
+            "could_not_create": "No se pudo crear la instantánea",
+            "create": "Crear",
+            "create_blocked_not_running": "No es posible crear una instantánea en este momento porque el sistema está {state}.",
+            "created": "Creado",
+            "delete_backup_confirm": "borrar",
+            "delete_selected": "Eliminar instantáneas seleccionadas",
+            "enter_password": "Por favor ingrese una contraseña.",
+            "failed_to_delete": "No se pudo borrar",
+            "folders": "Carpetas",
+            "name": "Nombre de la instantánea",
+            "password": "Contraseña de instantánea",
+            "password_protection": "Protección con contraseña",
+            "passwords_not_matching": "Las contraseñas no coinciden",
+            "select_type": "Seleccione lo que desea restaurar",
+            "selected": "{number} seleccionadas",
+            "type": "Tipo de instantánea"
+        },
         "common": {
             "cancel": "Cancelar",
             "close": "Cerrar",
@@ -292,7 +313,7 @@
             "save": "Guardar",
             "show_more": "Mostrar más información sobre esto",
             "update": "Actualizar",
-            "update_available": "{count} {count, plural,\n  one {actualización}\n  other {actualizaciones}\n} pendiente/s",
+            "update_available": "{count, plural,\n  one {Actualización}\n  other {{count} actualizaciones}\n} {count, plural, \n  one {pendiente}\n  other {pendientes}\n}",
             "version": "Versión",
             "yes": "Si"
         },
@@ -314,10 +335,18 @@
             "addon_new_version": "Nueva versión disponible",
             "addon_running": "El complemento se está ejecutando",
             "addon_stopped": "El complemento está detenido",
-            "addons": "Complementos",
+            "addons": "Complementos instalados",
             "no_addons": "No hay ningún complemento instalado. ¡Diríjase a la tienda de complementos para comenzar!"
         },
         "dialog": {
+            "hardware": {
+                "attributes": "Atributos",
+                "device_path": "Ruta del dispositivo",
+                "id": "ID",
+                "search": "Buscar hardware",
+                "subsystem": "Subsistema",
+                "title": "Hardware"
+            },
             "network": {
                 "connected_to": "Conectado a {ssid}",
                 "dhcp": "DHCP",
@@ -358,54 +387,23 @@
                 "text": "¿Desea reiniciar el complemento con sus cambios?"
             },
             "update": {
-                "create_snapshot": "Crear una instantánea de {name} antes de actualizar",
-                "snapshot": "Instantánea",
-                "snapshotting": "Creando instantánea de {name}",
                 "updating": "Actualizando {name} a la versión {version}"
             }
         },
         "my": {
             "error": "Ha ocurrido un error desconocido",
+            "error_addon_no_ingress": "El complemento solicitado no admite la entrada",
             "error_addon_not_found": "Complemento no encontrado",
             "error_addon_not_installed": "El complemento solicitado no está instalado. Por favor instálelo primero",
-            "error_addon_not_started": "El complemento solicitado no se están ejecutando. Por favor inícielo antes.",
+            "error_addon_not_started": "El complemento solicitado no se está ejecutando. Por favor, inícielo primero",
             "faq_link": "Mis preguntas frecuentes de Home Assistant",
             "not_supported": "Esta redirección no está soportada por su instancia de Home Assistant. Consulte las redirecciones soportadas y la versión en la que fueron introducidas en {link}."
         },
         "panel": {
             "dashboard": "Tablero",
-            "snapshots": "Instantáneas",
             "store": "Tienda de complementos",
             "system": "Sistema"
         },
-        "snapshot": {
-            "addons": "Complementos",
-            "available_snapshots": "Instantáneas disponibles",
-            "could_not_create": "No se pudo crear la instantánea",
-            "create": "Crear",
-            "create_blocked_not_running": "No es posible crear una instantánea en este momento porque el sistema está {state}.",
-            "create_snapshot": "Crear instantánea",
-            "description": "Las instantáneas le permiten realizar copias de seguridad y restaurar fácilmente todos los datos de su instancia de Home Assistant.",
-            "enter_password": "Por favor ingrese una contraseña.",
-            "folder": {
-                "addons/local": "Complementos locales",
-                "homeassistant": "Configuración de Home Assistant",
-                "media": "Medios",
-                "share": "Compartir",
-                "ssl": "SSL"
-            },
-            "folders": "Carpetas",
-            "full_snapshot": "Instantánea completa",
-            "name": "Nombre",
-            "no_snapshots": "Aún no tiene instantáneas.",
-            "partial_snapshot": "Instantánea parcial",
-            "password": "Contraseña",
-            "password_protected": "protegido por contraseña",
-            "password_protection": "Protección con contraseña",
-            "security": "Seguridad",
-            "type": "Tipo",
-            "upload_snapshot": "Subir instantánea"
-        },
         "store": {
             "missing_addons": "¿Faltan complementos? Habilite el modo avanzado en su página de perfil de usuario",
             "no_results_found": "No se encontraron resultados en {repository} .",
@@ -460,6 +458,7 @@
                 "leave_beta_description": "Obtenga actualizaciones estables para Home Assistant, Supervisor y host",
                 "ram_usage": "Uso de RAM de Supervisor",
                 "reload_supervisor": "Recargar Supervisor",
+                "search": "Buscar",
                 "share_diagnostics": "Compartir diagnósticos",
                 "share_diagnostics_description": "Compartir informes de fallos e información de diagnóstico.",
                 "share_diagonstics_description": "¿Le gustaría compartir automáticamente informes de fallos e información de diagnóstico cuando Supervisor encuentra errores inesperados?; Esto nos permitirá solucionar los problemas.{line_break}La información solo es accesible para el equipo de Home Assistant Core y no se compartirá con otros. {line_break} Los datos no incluyen ninguna información privada o confidencial. Puede desactivar esto en la configuración cuando lo desee.",
@@ -563,9 +562,12 @@
             },
             "light": {
                 "brightness": "Brillo",
+                "cold_white_value": "Brillo blanco frío",
+                "color_brightness": "Brillo de color",
                 "color_temperature": "Temperatura del color",
                 "effect": "Efecto",
-                "white_value": "Valor de blanco"
+                "warm_white_value": "Brillo blanco cálido",
+                "white_value": "Brillo blanco"
             },
             "lock": {
                 "code": "Código",
@@ -716,6 +718,9 @@
                 "no_match": "No se encontraron áreas coincidentes",
                 "show_areas": "Mostrar áreas"
             },
+            "attributes": {
+                "expansion_header": "Atributos"
+            },
             "blueprint-picker": {
                 "add_user": "Agregar usuario",
                 "remove_user": "Quitar usuario",
@@ -734,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Fecha final",
+                "ranges": {
+                    "last_week": "La semana pasada",
+                    "this_week": "Esta semana",
+                    "today": "Hoy",
+                    "yesterday": "Ayer"
+                },
                 "select": "Seleccionar",
                 "start_date": "Fecha de inicio"
             },
@@ -794,6 +805,7 @@
                     "was_unplugged": "fue desenchufado",
                     "was_unsafe": "estaba inseguro"
                 },
+                "retrieval_error": "Error durante la recuperación de la entrada del libro de registro",
                 "show_trace": "Mostrar registro"
             },
             "media-browser": {
@@ -824,10 +836,10 @@
                 "documentation": "documentación",
                 "learn_adding_local_media": "Obtenga más información sobre cómo agregar medios en {documentation}.",
                 "local_media_files": "Coloque sus archivos de video, audio e imagen en el directorio de medios para poder explorarlos y reproducirlos en el navegador o en reproductores multimedia compatibles.",
+                "media-player-browser": "Navegador del reproductor multimedia",
                 "media_browsing_error": "Error de navegación de medios",
                 "media_not_supported": "El Reproductor multimedia no es compatible con este tipo de medios",
                 "media_player": "Reproductor multimedia",
-                "media-player-browser": "Navegador del reproductor multimedia",
                 "no_items": "No hay elementos",
                 "no_local_media_found": "No se encontraron medios locales",
                 "no_media_folder": "Parece que aún no ha creado un directorio multimedia.",
@@ -888,6 +900,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Documentación de integración",
                 "required": "Este campo es requerido",
                 "service_data": "Datos de servicio",
                 "target": "Objetivos",
@@ -896,6 +909,23 @@
             "service-picker": {
                 "service": "Servicio"
             },
+            "statistic-picker": {
+                "learn_more": "Más información sobre estadísticas",
+                "missing_entity": "¿Por qué mi entidad no aparece en la lista?",
+                "no_match": "No se encontraron estadísticas coincidentes",
+                "no_statistics": "No tienes ninguna estadística",
+                "statistic": "Estadística"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Cargando estadísticas...",
+                "no_statistics_found": "No se encontraron estadísticas.",
+                "statistic_types": {
+                    "max": "máx.",
+                    "mean": "media",
+                    "min": "mín.",
+                    "sum": "suma"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Seleccionar área",
                 "add_device_id": "Seleccionar dispositivo",
@@ -914,8 +944,11 @@
         },
         "dialogs": {
             "config_entry_system_options": {
-                "enable_new_entities_description": "Si está deshabilitado, las entidades recién descubiertas para {integration} no se agregarán automáticamente a Home Assistant.",
+                "enable_new_entities_description": "Si los dispositivos recién descubiertos para la {integration} deben agregarse automáticamente.",
                 "enable_new_entities_label": "Habilitar entidades recién agregadas.",
+                "enable_polling_description": "Si Home Assistant debería sondear automáticamente las {integration} para obtener actualizaciones.",
+                "enable_polling_label": "Habilite el sondeo de actualizaciones.",
+                "restart_home_assistant": "Debe reiniciar Home Assistant para que los cambios surtan efecto.",
                 "title": "Opciones del sistema para {integration}",
                 "update": "Actualizar"
             },
@@ -1081,6 +1114,10 @@
                 "form": {
                     "header": "Opciones"
                 },
+                "loading": {
+                    "loading_flow": "Espere mientras se inicializan las opciones de {integration}",
+                    "loading_step": "Cargando siguiente paso para {integration}"
+                },
                 "success": {
                     "description": "Opciones guardadas con éxito."
                 }
@@ -1094,13 +1131,13 @@
                         "core": "General",
                         "customize": "Personalizaciones",
                         "devices": "Dispositivos",
+                        "energy": "Energía",
                         "entities": "Entidades",
                         "helpers": "Ayudantes",
                         "info": "Información",
                         "integrations": "Integraciones",
                         "logs": "Registros",
                         "lovelace": "Paneles Lovelace",
-                        "navigate_to": "Navegar a {panel}",
                         "person": "Personas",
                         "scene": "Escenas",
                         "script": "",
@@ -1195,7 +1232,22 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "Reconfigurando dispositivo"
+                "attribute": "Atributo",
+                "battery_device_warning": "Deberá reactivar los dispositivos que funcionan con batería antes de iniciar el proceso de reconfiguración. Consulte el manual de su dispositivo para obtener instrucciones sobre cómo reactivar el dispositivo.",
+                "bind_header": "Vinculante",
+                "button_hide": "Ocultar detalles",
+                "button_show": "Mostrar detalles",
+                "cluster_header": "Clúster",
+                "configuration_complete": "Se completó la reconfiguración del dispositivo.",
+                "configuration_failed": "Falló la reconfiguración del dispositivo. Puede haber información adicional disponible en los registros.",
+                "configuring_alt": "Configurando",
+                "heading": "Reconfigurando dispositivo",
+                "in_progress": "El dispositivo se está reconfigurando. Esto puede tomar algo de tiempo.",
+                "introduction": "Reconfigure un dispositivo en su red Zigbee. Utilice esta función si su dispositivo no funciona correctamente.",
+                "min_max_change": "mín./máx./cambio",
+                "reporting_header": "Reportando",
+                "run_in_background": "Puede cerrar este cuadro de diálogo y la reconfiguración continuará en segundo plano.",
+                "start_reconfiguration": "Iniciar reconfiguración"
             }
         },
         "duration": {
@@ -1258,7 +1310,8 @@
                     "caption": "Áreas",
                     "data_table": {
                         "area": "Área",
-                        "devices": "Dispositivos"
+                        "devices": "Dispositivos",
+                        "entities": "Entidades"
                     },
                     "delete": {
                         "confirmation_text": "Todos los dispositivos en esta área quedarán sin asignar.",
@@ -1270,8 +1323,10 @@
                         "create": "Crear",
                         "default_name": "Nueva Área",
                         "delete": "Eliminar",
+                        "linked_entities_caption": "Entidades",
                         "name": "Nombre",
                         "name_required": "Se requiere el nombre",
+                        "no_linked_entities": "No hay entidades vinculadas a esta área.",
                         "unknown_error": "Error desconocido",
                         "update": "Actualizar"
                     },
@@ -1311,7 +1366,6 @@
                             "introduction": "Las acciones son lo que hará Home Assistant cuando se active la automatización.",
                             "learn_more": "Más información sobre las acciones",
                             "name": "Acción",
-                            "type_select": "Tipo de acción",
                             "type": {
                                 "choose": {
                                     "add_option": "Agregar opción",
@@ -1352,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Repetir",
                                     "sequence": "Acciones",
-                                    "type_select": "Tipo de repetición",
                                     "type": {
                                         "count": {
                                             "label": "Cantidad"
@@ -1365,7 +1418,8 @@
                                             "conditions": "Mientras que las condiciones",
                                             "label": "Mientras"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Tipo de repetición"
                                 },
                                 "scene": {
                                     "label": "Activar escena"
@@ -1385,6 +1439,7 @@
                                     "wait_template": "Plantilla de espera"
                                 }
                             },
+                            "type_select": "Tipo de acción",
                             "unsupported_action": "No hay soporte en la interfaz de usuario para la acción: {action}"
                         },
                         "alias": "Nombre",
@@ -1403,7 +1458,6 @@
                             "introduction": "Las condiciones son opcionales y evitarán una mayor ejecución a menos que se cumplan todas las condiciones.",
                             "learn_more": "Más información sobre las condiciones",
                             "name": "Condición",
-                            "type_select": "Tipo de condición",
                             "type": {
                                 "and": {
                                     "label": "Y"
@@ -1464,12 +1518,18 @@
                                         "wed": "Miércoles"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "ID de activador",
+                                    "label": "Desencadenar",
+                                    "no_triggers": "No hay desencadenadores disponibles"
+                                },
                                 "zone": {
                                     "entity": "Entidad con ubicación",
                                     "label": "Zona",
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de condición",
                             "unsupported_condition": "No hay soporte en la interfaz de usuario para la condición: {condition}"
                         },
                         "copy_to_clipboard": "Copiar al portapapeles",
@@ -1507,10 +1567,10 @@
                             "delete_confirm": "¿Está seguro de que desea eliminar esto?",
                             "duplicate": "Duplicar",
                             "header": "Desencadenadores",
+                            "id": "Id. de desencadenador (utilizado por la condición de desencadenador)",
                             "introduction": "Los desencadenadores son los que inician el procesamiento de una regla de automatización. Es posible especificar múltiples activadores para la misma regla. Una vez que se inicia un activador, Home Assistant validará las condiciones, si las hay, y activará la acción.",
                             "learn_more": "Más información sobre los desencadenadores",
                             "name": "Desencadenar",
-                            "type_select": "Tipo de desencadenador",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1576,18 +1636,18 @@
                                     "label": "Plantilla",
                                     "value_template": "Plantilla de valor"
                                 },
-                                "time_pattern": {
-                                    "hours": "Horas",
-                                    "label": "Patrón de tiempo",
-                                    "minutes": "Minutos",
-                                    "seconds": "Segundos"
-                                },
                                 "time": {
                                     "at": "A las",
                                     "label": "Hora",
                                     "type_input": "Valor de un auxiliar de tipo fecha/tiempo",
                                     "type_value": "Tiempo corregido"
                                 },
+                                "time_pattern": {
+                                    "hours": "Horas",
+                                    "label": "Patrón de tiempo",
+                                    "minutes": "Minutos",
+                                    "seconds": "Segundos"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "ID de Webhook"
@@ -1601,6 +1661,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de desencadenador",
                             "unsupported_platform": "No hay soporte en la interfaz de usuario para la plataforma: {platform}"
                         },
                         "unsaved_confirm": "Tiene cambios sin guardar. ¿Estás seguro que quieres salir?"
@@ -1620,7 +1681,7 @@
                         },
                         "introduction": "El editor de automatización le permite crear y editar automatizaciones. Siga el enlace a continuación para leer las instrucciones y asegurarse de que haya configurado Home Assistant correctamente.",
                         "learn_more": "Más información sobre las automatizaciones",
-                        "no_automations": "No pudimos encontrar ninguna automatización editable",
+                        "no_automations": "No pudimos encontrar ninguna automatización",
                         "only_editable": "Solo las automatizaciones definidas en automations.yaml son editables.",
                         "pick_automation": "Elija la automatización a editar",
                         "show_info_automation": "Mostrar información acerca de la automatización"
@@ -1696,12 +1757,13 @@
                             "title": "Alexa"
                         },
                         "connected": "Conectado",
+                        "connecting": "Conectando...",
                         "connection_status": "Estado de la conexión en la nube",
-                        "fetching_subscription": "Obteniendo suscripción ...",
+                        "fetching_subscription": "Obteniendo suscripción...",
                         "google": {
                             "config_documentation": "Documentación de configuración",
                             "devices_pin": "PIN de dispositivos de seguridad",
-                            "enable_ha_skill": "Activar la habilidad Home Assistant para Google Assistant",
+                            "enable_ha_skill": "Activar la habilidad Home Assistant en la nube para Google Assistant",
                             "enable_state_reporting": "Habilitar informes de estado",
                             "enter_pin_error": "No se puede guardar el PIN:",
                             "enter_pin_hint": "Ingrese un PIN para usar dispositivos de seguridad",
@@ -1724,12 +1786,19 @@
                         "nabu_casa_account": "Cuenta de Nabu Casa",
                         "not_connected": "No conectado",
                         "remote": {
-                            "access_is_being_prepared": "Se está preparando el acceso remoto. Le notificaremos cuando esté listo.",
+                            "access_is_being_prepared": "Se está preparando el control remoto. Le notificaremos cuando esté listo.",
                             "certificate_info": "Información del certificado",
+                            "connected": "Conectado",
                             "info": "Home Assistant Cloud proporciona una conexión remota segura a su instancia mientras está fuera de casa.",
                             "instance_is_available": "Su instancia está disponible en",
                             "instance_will_be_available": "Su instancia estará disponible en",
                             "link_learn_how_it_works": "Aprenda cómo funciona",
+                            "not_connected": "No conectado",
+                            "reconnecting": "Conexión perdida. Reconectando...",
+                            "remote_enabled": {
+                                "caption": "Conectar automáticamente",
+                                "description": "Habilite esta opción para asegurarse de que su instancia de Home Assistant sea siempre accesible de forma remota."
+                            },
                             "title": "Control remoto"
                         },
                         "sign_out": "Cerrar sesión",
@@ -1753,12 +1822,12 @@
                             "disable_hook_error_msg": "Error al deshabilitar el webhook:",
                             "info": "Cualquier cosa que esté configurada para ser activada por un webhook puede recibir una URL de acceso público para permitirle enviar datos a Home Assistant desde cualquier lugar, sin exponer su instancia a Internet.",
                             "link_learn_more": "Obtenga más información sobre la creación de automatizaciones basadas en webhook.",
-                            "loading": "Cargando ...",
+                            "loading": "Cargando...",
                             "manage": "Administrar",
                             "no_hooks_yet": "Parece que todavía no tienes webhooks. Comience configurando un",
+                            "no_hooks_yet2": " o mediante la creación de un ",
                             "no_hooks_yet_link_automation": "automatización de webhook",
                             "no_hooks_yet_link_integration": "integración basada en webhook",
-                            "no_hooks_yet2": " o mediante la creación de un ",
                             "title": "Webhooks"
                         }
                     },
@@ -1873,41 +1942,13 @@
                     "description": "Sistema de unidades, ubicación, zona horaria y otros parámetros generales",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Antes de habilitar esto, asegúrese de visitar la página de documentación de análisis {link} para comprender qué está enviando y cómo se almacena.",
-                                "header": "Datos analíticos",
-                                "instance_id": "ID de instancia: {huuid}",
-                                "introduction": "Comparta su información de instalación para ayudar a mejorar Home Assistant y ayúdenos a convencer a los fabricantes para que agreguen funciones de control local y centradas en la privacidad.",
-                                "learn_more": "Cómo procesamos sus datos",
-                                "needs_base": "Debe habilitar Datos analíticos básicos para que esta opción esté disponible",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID de instancia, versión y tipo de instalación.",
-                                        "title": "Datos analíticos básicos"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Compartir informes de fallos cuando se produzcan errores inesperados.",
-                                        "title": "Diagnósticos"
-                                    },
-                                    "statistics": {
-                                        "description": "Total de entidades, usuarios y otros elementos utilizados.",
-                                        "title": "Estadísticas de uso"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nombres, versiones y capacidades.",
-                                        "title": "Integraciones y complementos usados"
-                                    },
-                                    "usage": {
-                                        "description": "Nombres e información de versión.",
-                                        "title": "Integraciones utilizadas"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Moneda",
                                 "edit_requires_storage": "Editor desactivado porque config está almacenado en configuration.yaml.",
                                 "elevation": "Elevación",
                                 "elevation_meters": "metros",
                                 "external_url": "URL externa",
+                                "find_currency_value": "Encuentre su valor",
                                 "imperial_example": "Fahrenheit, libras",
                                 "internal_url": "URL interna",
                                 "latitude": "Latitud",
@@ -2036,6 +2077,63 @@
                     "update": "Actualizar",
                     "update_device_error": "Error al actualizar el dispositivo"
                 },
+                "energy": {
+                    "caption": "Energía",
+                    "description": "Controle su producción y consumo de energía",
+                    "device_consumption": {
+                        "add_stat": "Elegir entidad para realizar un seguimiento de la energía",
+                        "dialog": {
+                            "selected_stat_intro": "Seleccione la entidad que representa el uso de energía del dispositivo."
+                        },
+                        "learn_more": "Más información sobre cómo empezar.",
+                        "selected_stat": "Seguimiento de la energía para",
+                        "sub": "El seguimiento del uso de energía de dispositivos individuales permite a Home Assistant desglosar su uso de energía por dispositivo.",
+                        "title": "Dispositivos individuales"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Utilice una entidad con precio actual",
+                                "cost_entity_input": "Entidad con precio actual",
+                                "cost_number": "Utilice un precio estático",
+                                "cost_number_input": "Precio por kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Seleccione cómo Home Assistant debe realizar un seguimiento de los costos de la energía consumida.",
+                                "cost_stat": "Utilice una entidad que rastree los costos totales",
+                                "cost_stat_input": "Entidad Costos Totales",
+                                "energy_stat": "Energía consumida (kWh)",
+                                "header": "Configurar el consumo de la red",
+                                "no_cost": "No realizar un seguimiento de los costos",
+                                "paragraph": "El consumo de la red es la energía que fluye desde la red eléctrica hasta su hogar."
+                            },
+                            "to": {
+                                "cost_entity": "Utilice una entidad con tasa actual",
+                                "cost_entity_input": "Entidad con la tarifa actual",
+                                "cost_number": "Utilice una tasa estática",
+                                "cost_number_input": "Tarifa por kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "¿Recibe dinero cuando devuelve energía a la red?",
+                                "cost_stat": "Utilice una entidad que rastree el dinero total recibido",
+                                "cost_stat_input": "Entidad de compensación total",
+                                "energy_stat": "Energía devuelta a la red (kWh)",
+                                "header": "Configurar la producción de la red",
+                                "no_cost": "No me devuelven el dinero",
+                                "paragraph": "La producción de la red es la energía que fluye de sus paneles solares a la red."
+                            }
+                        },
+                        "learn_more": "Más información sobre cómo empezar.",
+                        "sub": "Configure la cantidad de energía que consume de la red y, si produce energía, devuélvala a la red. Esto permite que Home Assistant realice un seguimiento del uso de energía de todo el hogar.",
+                        "title": "Red eléctrica"
+                    },
+                    "solar": {
+                        "learn_more": "Más información sobre cómo empezar.",
+                        "stat_predicted_production": "Predicción de su producción de energía solar",
+                        "stat_production": "Su producción de energía solar",
+                        "stat_return_to_grid": "La energía solar regresa a la red",
+                        "sub": "Deje que Home Assistant controle sus paneles solares y le brinde información sobre su rendimiento.",
+                        "title": "Paneles solares"
+                    }
+                },
                 "entities": {
                     "caption": "Entidades",
                     "description": "Gestione todas las entidades conocidas.",
@@ -2086,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Limpiar",
-                    "filtering_by": "Filtrar por",
-                    "show": "Mostrar"
-                },
-                "hassio": {
-                    "button": "Configurar"
-                },
                 "header": "Configurar Home Assistant",
                 "helpers": {
                     "caption": "Auxiliares",
@@ -2141,17 +2231,13 @@
                     "license": "Publicado bajo la licencia Apache 2.0",
                     "path_configuration": "Ruta de acceso a configuration.yaml: {path}",
                     "server": "servidor",
+                    "setup_time": "Tiempo de preparación",
                     "source": "Fuente:",
-                    "system_health_error": "El componente de mantenimiento del sistema no está cargado. Agregue 'system_health:' a configuration.yaml",
                     "system_health": {
                         "manage": "Administrar",
                         "more_info": "más información"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "página de integraciones",
-                    "missing_zha": "¿Falta el panel de configuración de ZHA? Se movió a la entrada ZHA en {integrations_page} .",
-                    "missing_zwave": "¿Falta el panel de configuración de Z-Wave? Se movió a la entrada Z-Wave en {integrations_page} ."
+                    },
+                    "system_health_error": "El componente de mantenimiento del sistema no está cargado. Agregue 'system_health:' a configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Agregar integración",
@@ -2166,8 +2252,6 @@
                         "depends_on_cloud": "Depende de la nube",
                         "device_unavailable": "Dispositivo no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositivo}\n  other {dispositivos}\n}",
-                        "disable_error": "Ha fallado la habilitación o deshabilitación de la integración",
-                        "disable_restart_confirm": "Reinicie Home Assistant para terminar de deshabilitar esta integración",
                         "disable": {
                             "disable_confirm": "¿Está seguro de que desea deshabilitar esta entrada de configuración? Sus dispositivos y entidades serán deshabilitados.",
                             "disabled": "Deshabilitado",
@@ -2178,17 +2262,18 @@
                             },
                             "disabled_cause": "El dispositivo está inhabilitado por {cause}."
                         },
+                        "disable_error": "Ha fallado la habilitación o deshabilitación de la integración",
+                        "disable_restart_confirm": "Reinicie Home Assistant para terminar de deshabilitar esta integración",
+                        "disabled_polling": "Sondeo automático para datos actualizados deshabilitado",
                         "documentation": "Documentación",
                         "enable_restart_confirm": "Reinicie Home Assistant para terminar de habilitar esta integración",
                         "entities": "{count} {count, plural,\n  one {entidad}\n  other {entidades}\n}",
                         "entity_unavailable": "Entidad no disponible",
                         "firmware": "Firmware: {version}",
                         "hub": "Conectado a través de",
-                        "logs": "Registros",
                         "manuf": "por {manufacturer}",
                         "no_area": "Ninguna área",
                         "not_loaded": "No cargado",
-                        "options": "Opciones",
                         "provided_by_custom_integration": "Proporcionado por una integración personalizada",
                         "reload": "Recargar",
                         "reload_confirm": "La integración se recargó",
@@ -2202,7 +2287,7 @@
                             "migration_error": "Error de migración",
                             "not_loaded": "No cargado",
                             "setup_error": "No se pudo configurar",
-                            "setup_retry": "Reintentando configurar"
+                            "setup_retry": "Reintentar la instalación"
                         },
                         "system_options": "Opciones de Sistema",
                         "unnamed_entry": "Entrada sin nombre"
@@ -2220,7 +2305,12 @@
                             "open_site": "Abrir sitio web"
                         },
                         "finish": "Finalizar",
-                        "loading_first_time": "Espere mientras se instala la integración",
+                        "loading": {
+                            "fallback_title": "la integración",
+                            "loading_flow": "Espere mientras se configura la {integration}",
+                            "loading_step": "Cargando próximo paso para {integration}"
+                        },
+                        "next": "Siguiente",
                         "not_all_required_fields": "No todos los campos requeridos estén llenos.",
                         "not_loaded": "No se pudo cargar la integración, intente reiniciar Home Assistant.",
                         "pick_flow_step": {
@@ -2232,11 +2322,10 @@
                     "configure": "Configurar",
                     "configured": "Configurado",
                     "confirm_new": "¿Quieres configurar {integration} ?",
-                    "description": "Gestionar integraciones con servicios, dispositivos, ...",
+                    "description": "Administrar integraciones con servicios o dispositivos",
                     "details": "Detalles de integración",
                     "disable": {
                         "disabled_integrations": "{number} inhabilitado",
-                        "hide_disabled": "Ocultar integraciones deshabilitadas",
                         "show": "Mostrar",
                         "show_disabled": "Mostrar integraciones deshabilitadas"
                     },
@@ -2247,7 +2336,6 @@
                         "confirm_delete_ignore_title": "¿Dejar de ignorar a {name} ?",
                         "confirm_ignore": "¿Estás seguro de que no quieres configurar esta integración? Puede deshacer esto haciendo clic en 'Mostrar integraciones ignoradas' en el menú de desbordamiento en la parte superior derecha.",
                         "confirm_ignore_title": "¿Ignorar el descubrimiento de {name}?",
-                        "hide_ignored": "Ocultar integraciones ignoradas",
                         "ignore": "Ignorar",
                         "ignored": "Ignorada",
                         "show_ignored": "Mostrar integraciones ignoradas",
@@ -2260,7 +2348,7 @@
                     "none": "No hay nada configurado",
                     "none_found": "No se encontraron integraciones",
                     "none_found_detail": "Ajuste sus criterios de búsqueda",
-                    "note_about_integrations": "No todas las integraciones se pueden configurar a través de la interfaz de usuario.",
+                    "note_about_integrations": "No hay integraciones que coincidan con su búsqueda, es posible que la integración que desea configurar aún no esté disponible para configurar a través de la interfaz de usuario.",
                     "note_about_website_reference": "Hay más disponibles en ",
                     "reconfigure": "Reconfigurar",
                     "rename_dialog": "Editar el nombre de esta entrada de configuración",
@@ -2367,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configurar",
                     "description_listen": "Escuchar un tema",
                     "description_publish": "Publicar un paquete",
                     "listening_to": "Escuchando a",
@@ -2381,7 +2468,6 @@
                     "topic": "tema"
                 },
                 "ozw": {
-                    "button": "Configurar",
                     "common": {
                         "controller": "Controlador",
                         "instance": "Instancia",
@@ -2406,6 +2492,11 @@
                         "nodes": "Nodos",
                         "select_instance": "Seleccione la instancia"
                     },
+                    "network": {
+                        "header": "Gestión de red",
+                        "introduction": "Gestione las funciones de toda la red.",
+                        "node_count": "{count} nodos"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Todos los nodos han sido consultados",
@@ -2426,10 +2517,9 @@
                         "starting": "Iniciando",
                         "unknown": "Desconocido"
                     },
-                    "network": {
-                        "header": "Gestión de red",
-                        "introduction": "Gestione las funciones de toda la red.",
-                        "node_count": "{count} nodos"
+                    "node": {
+                        "button": "Detalles del nodo",
+                        "not_found": "Nodo no encontrado"
                     },
                     "node_config": {
                         "header": "Configuración del nodo",
@@ -2459,10 +2549,6 @@
                         "versions": "Obteniendo información sobre firmware y versiones de clases de comando",
                         "wakeup": "Configurando soporte para mensajes y colas de activación"
                     },
-                    "node": {
-                        "button": "Detalles del nodo",
-                        "not_found": "Nodo no encontrado"
-                    },
                     "nodes_table": {
                         "failed": "Fallido",
                         "id": "ID",
@@ -2559,6 +2645,8 @@
                         "add_scene": "Agregar escena",
                         "delete_confirm": "¿Estás seguro de que desea eliminar esta escena?",
                         "delete_scene": "Eliminar escena",
+                        "duplicate": "Duplicar",
+                        "duplicate_scene": "Duplicar la escena",
                         "edit_scene": "Editar escena",
                         "header": "Editor de escenas",
                         "headers": {
@@ -2603,10 +2691,12 @@
                         },
                         "save_script": "Guardar script",
                         "sequence": "Secuencia",
-                        "sequence_sentence": "La secuencia de acciones de este script."
+                        "sequence_sentence": "La secuencia de acciones de este script.",
+                        "show_trace": "Show trace"
                     },
                     "picker": {
                         "add_script": "Agregar script",
+                        "dev_script": "Depurar Script",
                         "duplicate": "Duplicado",
                         "duplicate_script": "Duplicar script",
                         "edit_script": "Editar script",
@@ -2616,7 +2706,7 @@
                         },
                         "introduction": "El editor de scripts le permite crear y editar scripts. Por favor, siga el siguiente enlace para leer las instrucciones para asegurarse de que ha configurado Home Assistant correctamente.",
                         "learn_more": "Aprenda más sobre los scripts",
-                        "no_scripts": "No pudimos encontrar ningún script editable",
+                        "no_scripts": "No pudimos encontrar ningún script",
                         "run_script": "Ejecutar script",
                         "show_info": "Mostrar información sobre el script"
                     }
@@ -2627,51 +2717,51 @@
                     "section": {
                         "reloading": {
                             "automation": "Recargar automatizaciones",
-                            "command_line": "Recargar entidades de línea de comando",
+                            "command_line": "Recargar Entidades de línea de comando",
                             "core": "Recargar ubicación y personalizaciones",
                             "filesize": "Recargar entidades de tamaño de archivo",
-                            "filter": "Recargar entidades de filtro",
-                            "generic": "Recargar entidades de cámara IP genéricas",
-                            "generic_thermostat": "Recargar entidades de termostato genéricas",
+                            "filter": "Recargar Entidades de filtro",
+                            "generic": "Recargar Entidades de cámara IP genéricas",
+                            "generic_thermostat": "Recaregar Entidades de termostato genéricas",
                             "group": "Recargar grupos, entidades grupales, y servicios de notificación de grupo",
                             "heading": "Recarga de configuración YAML",
-                            "history_stats": "Recargar entidades de estadísticas del historial",
+                            "history_stats": "Recargar Entidades de estadísticas de historial",
                             "homekit": "Recargar HomeKit",
                             "input_boolean": "Recargar controles booleanos",
                             "input_datetime": "Recargar controles de fechas",
                             "input_number": "Recargar controles numéricos",
                             "input_select": "Recargar controles de selección",
                             "input_text": "Recargar controles de texto",
-                            "introduction": "Algunas partes de Home Assistant pueden recargarse sin requerir un reinicio. Al presionar recargar se descargará su configuración YAML actual y se cargará la nueva.",
-                            "min_max": "Recargar entidades de mín/máx",
+                            "introduction": "Algunas partes de Home Assistant se pueden recargar sin necesidad de reiniciar. Al hacer clic en una de las opciones a continuación, se descargará su configuración actual de YAML y se cargará la nueva.",
+                            "min_max": "Recargar Entidades mín./máx.",
                             "mqtt": "Entidades MQTT manualmente configuradas",
                             "person": "Recargar personas",
                             "ping": "Recargar entidades de sensor binario PING",
                             "reload": "Recargar {domain}",
-                            "rest": "Recargar entidades y servicios de notificación REST.",
+                            "rest": "Recargar Entidades Rest y servicios de notificaciones",
                             "rpi_gpio": "Recargar las entidades GPIO de la Raspberry Pi",
                             "scene": "Recargar escenas",
                             "script": "Recargar scripts",
                             "smtp": "Recargar servicios de notificación SMTP",
-                            "statistics": "Recargar entidades de estadísticas",
+                            "statistics": "Recargar Entidades estadísticas",
                             "telegram": "Recargar servicios de notificación de Telegram",
                             "template": "Recargar las entidades de plantilla",
-                            "trend": "Recargar entidades de tendencia",
-                            "universal": "Recargar entidades de reproductor multimedia universal",
+                            "trend": "Recargar Entidades de tendencia",
+                            "universal": "Recargar Entidades de reproductores multimedia universales",
                             "zone": "Recargar zonas"
                         },
                         "server_management": {
                             "confirm_restart": "¿Estás seguro de que quieres reiniciar el Home Assistant?",
                             "confirm_stop": "¿Estás seguro de que quieres detener Home Assistant?",
                             "heading": "Administración del servidor",
-                            "introduction": "Controle su servidor Home Assistant ... desde Home Assistant.",
+                            "introduction": "Controla tu servidor de Home Assistant... desde Home Assistant.",
                             "restart": "Reiniciar",
                             "stop": "Detener"
                         },
                         "validation": {
                             "check_config": "Comprobar configuración",
                             "heading": "Validación de la configuración",
-                            "introduction": "Valide su configuración si recientemente realizó algunos cambios en su configuración y quiere asegurarse de que sea válida",
+                            "introduction": "Valide su configuración si recientemente realizó algunos cambios en su configuración y desea asegurarse de que sea válida.",
                             "invalid": "Configuración inválida",
                             "valid": "¡Configuración valida!"
                         }
@@ -2763,7 +2853,6 @@
                         "search_again": "Buscar de nuevo",
                         "spinner": "Buscando dispositivos ZHA Zigbee ..."
                     },
-                    "button": "Configurar",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributos del clúster seleccionado",
                         "get_zigbee_attribute": "Obtener el atributo Zigbee",
@@ -2791,6 +2880,10 @@
                         "manufacturer_code_override": "Sobrescritura del código del fabricante",
                         "value": "Valor"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Atajos",
+                        "update_button": "Actualizar configuración"
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuración finalizada",
                         "CONFIGURED_status_text": "Inicializando",
@@ -2871,87 +2964,7 @@
                     "introduction": "Las zonas le permiten especificar ciertas regiones en el planeta. Cuando una persona está dentro de una zona, el estado tomará el nombre de la zona. Las zonas también se pueden usar como desencadenante o condición dentro de las configuraciones de automatización.",
                     "no_zones_created_yet": "Parece que todavía no ha creado ninguna zona."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Cancelar inclusión",
-                        "controller_in_inclusion_mode": "Su controlador Z-Wave ahora está en modo de inclusión.",
-                        "follow_device_instructions": "Siga las instrucciones que vienen con su dispositivo para activar el emparejamiento del mismo.",
-                        "inclusion_failed": "No se pudo agregar el nodo. Consulte los registros para obtener más información.",
-                        "inclusion_finished": "Se ha agregado el nodo. Puede tomar unos minutos para que todas las entidades aparezcan mientras terminamos de configurar el nodo en segundo plano.",
-                        "introduction": "Este asistente lo guiará para agregar un nodo a su red Z-Wave.",
-                        "secure_inclusion_warning": "Los dispositivos seguros requieren ancho de banda adicional; demasiados dispositivos seguros pueden ralentizar su red Z-Wave. Recomendamos usar solo la inclusión segura para dispositivos que lo requieran, como cerraduras o abrepuertas de garaje.",
-                        "start_inclusion": "Iniciar inclusión",
-                        "start_secure_inclusion": "Iniciar Inclusión Segura",
-                        "title": "Agregar un nodo Z-Wave",
-                        "use_secure_inclusion": "Utilizar inclusión segura",
-                        "view_device": "Ver dispositivo"
-                    },
-                    "button": "Configurar",
-                    "common": {
-                        "add_node": "Agregar nodo",
-                        "close": "Cerrar",
-                        "home_id": "ID de Hogar",
-                        "network": "Red",
-                        "node_id": "ID de nodo",
-                        "remove_node": "Quitar nodo"
-                    },
-                    "dashboard": {
-                        "driver_version": "Versión del controlador",
-                        "dump_dead_nodes_text": "Algunos de sus nodos no respondieron y se supone que están muertos. Estos no se exportarán por completo.",
-                        "dump_dead_nodes_title": "Algunos de sus nodos están muertos",
-                        "dump_debug": "Descargue un volcado de su red para ayudar a diagnosticar problemas",
-                        "dump_not_ready_confirm": "Descargar",
-                        "dump_not_ready_text": "Si crea una exportación cuando no todos los nodos están listos, puede perder los datos necesarios. Dale a tu red algo de tiempo para consultar todos los nodos. ¿Quieres continuar con el volcado?",
-                        "dump_not_ready_title": "No todos los nodos están listos todavía",
-                        "header": "Administre su red Z-Wave",
-                        "home_id": "ID de Hogar",
-                        "introduction": "Administre su red Z-Wave y los nodos Z-Wave",
-                        "nodes_ready": "Nodos listos",
-                        "server_version": "Versión del servidor"
-                    },
-                    "device_info": {
-                        "device_config": "Configurar dispositivo",
-                        "node_ready": "Nodo listo",
-                        "node_status": "Estado del nodo",
-                        "zwave_info": "Información de Z-Wave"
-                    },
-                    "navigation": {
-                        "network": "Red"
-                    },
-                    "network_status": {
-                        "connected": "Conectado",
-                        "connecting": "Conectando",
-                        "unknown": "Desconocido"
-                    },
-                    "node_config": {
-                        "attribution": "Los parámetros de configuración de los dispositivos y sus descripciones son provistos por la {device_database}",
-                        "battery_device_notice": "Los dispositivos de batería deben estar activos para actualizar su configuración. Consulte el manual de su dispositivo para obtener instrucciones sobre cómo reactivarlo.",
-                        "error_device_not_found": "Dispositivo no encontrado",
-                        "header": "Configuración del dispositivo Z-Wave",
-                        "introduction": "Gestionar y ajustar los parámetros de configuración específicos del dispositivo (nodo) para el dispositivo seleccionado",
-                        "parameter_is_read_only": "Este parámetro es de solo lectura.",
-                        "zwave_js_device_database": "Base de datos de dispositivos Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Vivo",
-                        "asleep": "Dormido",
-                        "awake": "Despierto",
-                        "dead": "Muerto",
-                        "unknown": "Desconocido"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Cancelar exclusión",
-                        "controller_in_exclusion_mode": "Su controlador Z-Wave ahora está en modo de exclusión.",
-                        "exclusion_failed": "No se pudo eliminar el nodo. Consulte los registros para obtener más información.",
-                        "exclusion_finished": "El nodo {id} se ha eliminado de su red Z-Wave.",
-                        "follow_device_instructions": "Siga las instrucciones que vienen con su dispositivo para activar la exclusión del mismo.",
-                        "introduction": "Elimine un nodo de su red Z-Wave y elimine el dispositivo asociado y las entidades de Home Assistant.",
-                        "start_exclusion": "Iniciar exclusión",
-                        "title": "Eliminar un nodo Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Configurar",
                     "common": {
                         "index": "Índice",
                         "instance": "Instancia",
@@ -3040,6 +3053,144 @@
                     "values": {
                         "header": "Valores del nodo"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Cancelar inclusión",
+                        "controller_in_inclusion_mode": "Su controlador Z-Wave ahora está en modo de inclusión.",
+                        "follow_device_instructions": "Siga las instrucciones que vienen con su dispositivo para activar el emparejamiento del mismo.",
+                        "inclusion_failed": "No se pudo agregar el nodo. Consulte los registros para obtener más información.",
+                        "inclusion_finished": "Se ha agregado el nodo.",
+                        "interview_failed": "La entrevista del dispositivo falló. Puede haber información adicional disponible en los registros.",
+                        "interview_started": "El dispositivo está siendo entrevistado. Esto puede tomar algo de tiempo.",
+                        "introduction": "Este asistente lo guiará para agregar un nodo a su red Z-Wave.",
+                        "secure_inclusion_warning": "Los dispositivos seguros requieren ancho de banda adicional; demasiados dispositivos seguros pueden ralentizar su red Z-Wave. Recomendamos usar solo la inclusión segura para dispositivos que lo requieran, como cerraduras o abrepuertas de garaje.",
+                        "start_inclusion": "Iniciar inclusión",
+                        "start_secure_inclusion": "Iniciar Inclusión Segura",
+                        "title": "Agregar un nodo Z-Wave",
+                        "use_secure_inclusion": "Utilizar inclusión segura",
+                        "view_device": "Ver dispositivo"
+                    },
+                    "common": {
+                        "add_node": "Agregar nodo",
+                        "close": "Cerrar",
+                        "heal_network": "Red de curación",
+                        "home_id": "ID de Hogar",
+                        "network": "Red",
+                        "node_id": "ID de nodo",
+                        "reconfigure_server": "Vuelva a configurar el servidor",
+                        "remove_node": "Quitar nodo",
+                        "source": "Fuente"
+                    },
+                    "dashboard": {
+                        "driver_version": "Versión del controlador",
+                        "dump_dead_nodes_text": "Algunos de sus nodos no respondieron y se supone que están muertos. Estos no se exportarán por completo.",
+                        "dump_dead_nodes_title": "Algunos de sus nodos están muertos",
+                        "dump_debug": "Descargue un volcado de su red para ayudar a diagnosticar problemas",
+                        "dump_not_ready_confirm": "Descargar",
+                        "dump_not_ready_text": "Si crea una exportación cuando no todos los nodos están listos, puede perder los datos necesarios. Dale a tu red algo de tiempo para consultar todos los nodos. ¿Quieres continuar con el volcado?",
+                        "dump_not_ready_title": "No todos los nodos están listos todavía",
+                        "header": "Administre su red Z-Wave",
+                        "home_id": "ID de Hogar",
+                        "introduction": "Administre su red Z-Wave y los nodos Z-Wave",
+                        "nodes_ready": "Nodos listos",
+                        "server_version": "Versión del servidor"
+                    },
+                    "device_info": {
+                        "device_config": "Configurar dispositivo",
+                        "heal_node": "Nodo de curación",
+                        "node_ready": "Nodo listo",
+                        "node_status": "Estado del nodo",
+                        "reinterview_device": "Dispositivo de reentrevista",
+                        "remove_failed": "Quitar dispositivo fallido",
+                        "zwave_info": "Información de Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Se canceló la recuperación de la red.",
+                        "healing_complete": "La recuperación de la red está completa.",
+                        "healing_failed": "La curación falló. Puede haber información adicional disponible en los registros.",
+                        "in_progress": "La recuperación de la red está en curso. Esto tomará algún tiempo.",
+                        "introduction": "Inicie una cura de red en su red Z-Wave. Una reparación de la red hará que todos los dispositivos vuelvan a calcular sus rutas de regreso al controlador y se recomienda si ha movido dispositivos o su controlador recientemente.",
+                        "run_in_background": "Puede cerrar este cuadro de diálogo y la recuperación de la red continuará en segundo plano.",
+                        "start_heal": "Empezar a curar",
+                        "stop_heal": "Detener la curación",
+                        "title": "Sana tu red Z-Wave",
+                        "traffic_warning": "El proceso de recuperación genera una gran cantidad de tráfico en la red Z-Wave. Esto puede hacer que los dispositivos respondan lentamente (o no respondan en absoluto) mientras la curación está en curso."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} ha sido curado.",
+                        "healing_failed": "{device} no se pudo curar.",
+                        "healing_failed_check_logs": "Puede haber información adicional disponible en los registros.",
+                        "in_progress": "La curación del {device} está en curso.",
+                        "introduction": "Indique a {device} que actualice sus rutas de nuevo al controlador. Esto puede ayudar con problemas de comunicación si ha movido recientemente el dispositivo o el controlador.",
+                        "network_heal_in_progress": "Ya se está realizando una curación de la red Z-Wave. Espere a que termine antes de reparar un dispositivo individual.",
+                        "start_heal": "Dispositivo de curación",
+                        "title": "Curar un dispositivo Z-Wave",
+                        "traffic_warning": "El proceso de recuperación genera una gran cantidad de tráfico en la red Z-Wave. Esto puede hacer que los dispositivos respondan lentamente (o no respondan en absoluto) mientras la curación está en curso."
+                    },
+                    "logs": {
+                        "log_level": "Nivel de registro",
+                        "log_level_changed": "El nivel de registro cambió a: {level}",
+                        "subscribed_to_logs": "Suscrito a los mensajes de registro de Z-Wave JS ...",
+                        "title": "Registros de Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Registros",
+                        "network": "Red"
+                    },
+                    "network_status": {
+                        "connected": "Conectado",
+                        "connecting": "Conectando",
+                        "unknown": "Desconocido"
+                    },
+                    "node_config": {
+                        "attribution": "Los parámetros de configuración de los dispositivos y sus descripciones son provistos por la {device_database}",
+                        "battery_device_notice": "Los dispositivos de batería deben estar activos para actualizar su configuración. Consulte el manual de su dispositivo para obtener instrucciones sobre cómo reactivarlo.",
+                        "error_device_not_found": "Dispositivo no encontrado",
+                        "header": "Configuración del dispositivo Z-Wave",
+                        "introduction": "Gestionar y ajustar los parámetros de configuración específicos del dispositivo (nodo) para el dispositivo seleccionado",
+                        "parameter": "Parámetro",
+                        "parameter_is_read_only": "Este parámetro es de solo lectura.",
+                        "set_param_accepted": "El parámetro se ha actualizado.",
+                        "set_param_error": "Ocurrió un error.",
+                        "set_param_queued": "El cambio de parámetro se ha puesto en cola y se actualizará cuando el dispositivo se active.",
+                        "zwave_js_device_database": "Base de datos de dispositivos Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Vivo",
+                        "asleep": "Dormido",
+                        "awake": "Despierto",
+                        "dead": "Muerto",
+                        "unknown": "Desconocido"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Deberá reactivar los dispositivos que funcionan con baterías antes de comenzar la reentrevista. Consulte el manual de su dispositivo para obtener instrucciones sobre cómo reactivar el dispositivo.",
+                        "in_progress": "El dispositivo está siendo entrevistado. Esto puede tomar algo de tiempo.",
+                        "interview_complete": "Se completó la entrevista del dispositivo.",
+                        "interview_failed": "La entrevista del dispositivo falló. Puede haber información adicional disponible en los registros.",
+                        "introduction": "Vuelva a entrevistar un dispositivo en su red Z-Wave. Utilice esta función si su dispositivo tiene una funcionalidad incorrecta o faltante.",
+                        "run_in_background": "Puede cerrar este cuadro de diálogo y la entrevista continuará en segundo plano.",
+                        "start_reinterview": "Empezar a volver a entrevistar",
+                        "title": "Volver a entrevistar a un dispositivo Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "La eliminación del dispositivo está en curso.",
+                        "introduction": "Elimina un dispositivo fallido de tu red Z-Wave. Use esto si no puede excluir un dispositivo normalmente porque está roto.",
+                        "removal_failed": "El dispositivo no se pudo eliminar de su red Z-Wave.",
+                        "removal_finished": "El nodo {id} se ha eliminado de su red Z-Wave.",
+                        "remove_device": "Eliminar dispositivo",
+                        "title": "Quitar un dispositivo Z-Wave fallado"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Cancelar exclusión",
+                        "controller_in_exclusion_mode": "Su controlador Z-Wave ahora está en modo de exclusión.",
+                        "exclusion_failed": "No se pudo eliminar el nodo. Consulte los registros para obtener más información.",
+                        "exclusion_finished": "El nodo {id} se ha eliminado de su red Z-Wave.",
+                        "follow_device_instructions": "Siga las instrucciones que vienen con su dispositivo para activar la exclusión del mismo.",
+                        "introduction": "Elimine un nodo de su red Z-Wave y elimine el dispositivo asociado y las entidades de Home Assistant.",
+                        "start_exclusion": "Iniciar exclusión",
+                        "title": "Eliminar un nodo Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3122,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Volver",
-                "supervisor": {
-                    "ask": "Solicitar ayuda",
-                    "observer": "Verificar Observer",
-                    "reboot": "Intentar reiniciar el host",
-                    "system_health": "Verificar estado del sistema",
-                    "title": "No se pudo cargar el panel de Supervisor",
-                    "wait": "Si recién inicia, asegúrese de darle tiempo suficiente a Supervisor para que se inicie."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "La semana pasada",
-                    "this_week": "Esta semana",
-                    "today": "Hoy",
-                    "yesterday": "Ayer"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "La semana pasada",
-                    "this_week": "Esta semana",
-                    "today": "Hoy",
-                    "yesterday": "Ayer"
+            "energy": {
+                "charts": {
+                    "by_device": "Consumo por dispositivo",
+                    "solar": "Solar",
+                    "stat_house_energy_meter": "Consumo total de energía"
+                },
+                "setup": {
+                    "back": "Atrás",
+                    "done": "¡Muéstrame mi panel de energía!",
+                    "next": "Siguiente"
                 }
             },
             "lovelace": {
@@ -3260,7 +3396,6 @@
                         "entities": {
                             "description": "La tarjeta de entidades es el tipo de tarjeta más común. Agrupa elementos en listas.",
                             "edit_special_row": "Vea los detalles de esta fila haciendo clic en el botón editar",
-                            "entity_row_editor": "Editor de filas de entidades",
                             "entity_row": {
                                 "attribute": "Atributo",
                                 "button": "Botón",
@@ -3272,6 +3407,7 @@
                                 "section": "Sección",
                                 "weblink": "Enlace web"
                             },
+                            "entity_row_editor": "Editor de filas de entidades",
                             "name": "Entidades",
                             "secondary_info_values": {
                                 "brightness": "Brillo",
@@ -3298,6 +3434,7 @@
                         "gauge": {
                             "description": "La tarjeta Gauge es una tarjeta básica que permite ver visualmente los datos del sensor.",
                             "name": "Gauge",
+                            "needle_gauge": "¿Mostrar como medidor de aguja?",
                             "severity": {
                                 "define": "¿Definir gravedad?",
                                 "green": "Verde",
@@ -3310,6 +3447,7 @@
                             "attribute": "Atributo",
                             "camera_image": "Entidad de la cámara",
                             "camera_view": "Vista de la cámara",
+                            "days_to_show": "Días para mostrar",
                             "double_tap_action": "Acción de doble toque",
                             "entities": "Entidades",
                             "entity": "Entidad",
@@ -3423,6 +3561,10 @@
                             "integration_not_loaded": "Esta tarjeta requiere que se configure la integración `shopping_list`.",
                             "name": "Lista de compras"
                         },
+                        "statistics-graph": {
+                            "description": "La tarjeta Gráfico de estadísticas le permite mostrar un gráfico de las estadísticas de cada una de las entidades enumeradas.",
+                            "name": "Gráfico de estadísticas"
+                        },
                         "thermostat": {
                             "description": "La tarjeta del termostato le da el control de su entidad climática. Permitiéndole cambiar la temperatura y el modo de la entidad.",
                             "name": "Termostato"
@@ -3492,6 +3634,12 @@
                         "tab_badges": "Fijar encima",
                         "tab_settings": "Configuraciones",
                         "tab_visibility": "Visibilidad",
+                        "type": "Tipo de vista",
+                        "types": {
+                            "masonry": "Albañilería (predeterminado)",
+                            "panel": "Panel (1 tarjeta)",
+                            "sidebar": "Barra lateral"
+                        },
                         "visibility": {
                             "select_users": "Seleccione qué usuarios deberían ver esta vista en la navegación"
                         }
@@ -3546,7 +3694,6 @@
                         "unsaved_changes": "Cambios no guardados"
                     },
                     "save_config": {
-                        "cancel": "Olvídalo",
                         "close": "Cerrar",
                         "empty_config": "Comience con un tablero vacío",
                         "header": "Toma el control de tu interfaz de usuario de Lovelace",
@@ -3575,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Esto hace que la primera tarjeta tenga el ancho completo. No se mostrarán otras tarjetas en esta vista, así como las insignias.",
-                            "title": "¿Modo de panel?",
                             "warning_multiple_cards": "Esta vista contiene más de una tarjeta, pero una vista de panel solo puede mostrar 1 tarjeta."
                         }
                     }
@@ -3779,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Siguiente",
-                    "intro": "Comparta datos analíticos de su instancia. Estos datos estarán disponibles públicamente en {link}"
+                    "finish": "Siguiente"
                 },
                 "core-config": {
                     "button_detect": "Detectar",
@@ -3800,10 +3944,17 @@
                 "intro": "¿Estás listo para despertar tu hogar, reclamar tu privacidad y unirte a una comunidad mundial de experimentadores?",
                 "next": "Siguiente",
                 "restore": {
+                    "addons": "Complementos",
+                    "confirm_password": "Confirmar la contraseña de la instantánea",
                     "description": "También se puede restaurar desde una instantánea anterior.",
+                    "folders": "Carpetas",
                     "hide_log": "Ocultar registro completo",
                     "in_progress": "Restauración en progreso",
-                    "show_log": "Mostrar registro completo"
+                    "password": "Contraseña de instantánea",
+                    "password_protection": "Protección con contraseña",
+                    "select_type": "Seleccione lo que desea restaurar",
+                    "show_log": "Mostrar registro completo",
+                    "type": "Tipo de instantánea"
                 },
                 "user": {
                     "create_account": "Crear una cuenta",
@@ -3880,6 +4031,12 @@
                     "prompt_copy_token": "Copia tu token de acceso. No se volverá a mostrar",
                     "prompt_name": "Dale un nombre al token"
                 },
+                "mfa": {
+                    "confirm_disable": "¿Estás seguro de que deseas deshabilitar {name} ?",
+                    "disable": "Deshabilitar",
+                    "enable": "Habilitar",
+                    "header": "Módulos de autenticación multifactor"
+                },
                 "mfa_setup": {
                     "close": "Cerrar",
                     "step_done": "Configuración realizada para {step}",
@@ -3887,12 +4044,6 @@
                     "title_aborted": "Abortado",
                     "title_success": "¡Éxito!"
                 },
-                "mfa": {
-                    "confirm_disable": "¿Estás seguro de que deseas deshabilitar {name} ?",
-                    "disable": "Deshabilitar",
-                    "enable": "Habilitar",
-                    "header": "Módulos de autenticación multifactor"
-                },
                 "number_format": {
                     "description": "Elija el formato de los números.",
                     "dropdown_label": "Formato de los números",
@@ -3947,6 +4098,17 @@
                     "primary_color": "Color primario",
                     "reset": "Restablecer"
                 },
+                "time_format": {
+                    "description": "Elija cómo se da formato a las horas.",
+                    "dropdown_label": "Formato de hora",
+                    "formats": {
+                        "12": "12 horas (AM/PM)",
+                        "24": "24 horas",
+                        "language": "Automático (use la configuración de idioma)",
+                        "system": "Usar la configuración regional del sistema"
+                    },
+                    "header": "Formato de hora"
+                },
                 "vibrate": {
                     "description": "Habilitar o deshabilitar la vibración en este dispositivo al controlar dispositivos.",
                     "header": "Vibrar"
diff --git a/translations/frontend/es.json b/translations/frontend/es.json
index 1c956c6c24..1682deb62b 100644
--- a/translations/frontend/es.json
+++ b/translations/frontend/es.json
@@ -17,6 +17,7 @@
         "calendar": "Calendario",
         "config": "Configuración",
         "developer_tools": "Herramientas para desarrolladores",
+        "energy": "Energía",
         "history": "Historial",
         "logbook": "Registro",
         "mailbox": "Buzón",
@@ -26,6 +27,14 @@
         "shopping_list": "Lista de la compra",
         "states": "Resumen"
     },
+    "state": {
+        "default": {
+            "off": "Apagado",
+            "on": "Encendido",
+            "unavailable": "No disponible",
+            "unknown": "Desconocido"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Fuera de casa"
         }
     },
-    "state": {
-        "default": {
-            "off": "Apagado",
-            "on": "Encendido",
-            "unavailable": "No disponible",
-            "unknown": "Desconocido"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -140,7 +141,7 @@
                 },
                 "capability": {
                     "apparmor": {
-                        "description": "AppArmor ('Application Armor') es un módulo de seguridad del kernel de Linux que restringe las capacidades de los complementos como el acceso a la red, el acceso al socket sin procesar y el permiso para leer, escribir o ejecutar archivos específicos. \n\nLos autores de complementos pueden proporcionar sus perfiles de seguridad, optimizados para el complemento, o solicitar su desactivación. Si AppArmor está deshabilitado, aumentará los riesgos de seguridad y, por lo tanto, tendrá un impacto negativo en la puntuación de seguridad del complemento.",
+                        "description": "AppArmor ('Application Armor') es un módulo de seguridad del kernel de Linux que restringe las capacidades de los complementos como el acceso a la red, el acceso a sockets raw y el permiso para leer, escribir o ejecutar archivos específicos. \n\nLos autores de complementos pueden proporcionar sus perfiles de seguridad, optimizados para el complemento, o solicitar su desactivación. Si AppArmor está deshabilitado, aumentará los riesgos de seguridad y, por lo tanto, tendrá un impacto negativo en la puntuación de seguridad del complemento.",
                         "title": "AppArmor"
                     },
                     "auth_api": {
@@ -148,11 +149,11 @@
                         "title": "Autenticación de Home Assistant"
                     },
                     "docker_api": {
-                        "description": "El autor del complemento ha solicitado que el complemento tenga acceso de administración a la instancia de Docker que se ejecuta en tu sistema. Este modo le da al complemento acceso y control total a todo tu sistema Home Assistant, lo que agrega riesgos de seguridad y podría dañar tu sistema si se usa incorrectamente. Por lo tanto, esta característica tiene un impacto negativo en la puntuación de seguridad del complemento. \n\nEste nivel de acceso no se otorga automáticamente y debe ser confirmado por ti. Para hacer esto, debes deshabilitar el modo de protección en el complemento manualmente. Desactiva solo el modo de protección si conoces, necesitas Y confías en la fuente de este complemento.",
+                        "description": "El autor del complemento ha solicitado que el complemento tenga acceso de administración a la instancia de Docker que se ejecuta en tu sistema. Este modo le da al complemento acceso y control total a todo tu sistema Home Assistant, lo que agrega riesgos de seguridad y podría dañar tu sistema si se usa incorrectamente. Por lo tanto, esta característica tiene un impacto negativo en la puntuación de seguridad del complemento. \n\nEste nivel de acceso no se otorga automáticamente y debe ser confirmado por ti. Para hacer esto, debes deshabilitar el modo de protección en el complemento manualmente. Desactiva solo el modo de protección si conoces, necesitas Y CONFÍAS en la fuente de este complemento.",
                         "title": "Acceso completo a Docker"
                     },
                     "full_access": {
-                        "description": "Este complemento tiene acceso completo al hardware de tu sistema, a petición del autor del complemento. El acceso es comparable al modo privilegiado en Docker. Dado que esto abre posibles riesgos de seguridad, esta característica impacta negativamente en la puntuación de seguridad del complemento. \n\nEste nivel de acceso no se otorga automáticamente y debe ser confirmado por ti. Para hacer esto, debes deshabilitar el modo de protección en el complemento manualmente. Desactiva solo el modo de protección si conoces, necesitas Y confías en la fuente de este complemento.",
+                        "description": "Este complemento tiene acceso completo al hardware de tu sistema, a petición del autor del complemento. El acceso es comparable al modo privilegiado en Docker. Dado que esto abre posibles riesgos de seguridad, esta característica impacta negativamente en la puntuación de seguridad del complemento. \n\nEste nivel de acceso no se otorga automáticamente y debe ser confirmado por ti. Para hacer esto, debes deshabilitar el modo de protección en el complemento manualmente. Desactiva solo el modo de protección si conoces, necesitas Y CONFÍAS en la fuente de este complemento.",
                         "title": "Acceso completo al hardware"
                     },
                     "hassio_api": {
@@ -164,11 +165,11 @@
                         "title": "Acceso a la API de Home Assistant"
                     },
                     "host_network": {
-                        "description": "Los complementos generalmente se ejecutan en su propia capa de red aislada, lo que les impide acceder a la red del sistema operativo del host. En algunos casos, este aislamiento de red puede limitar los complementos en la prestación de sus servicios y, por lo tanto, el autor del complemento puede eliminar el aislamiento, lo que le da al complemento acceso completo a las capacidades de red de la máquina host. Esto le da al complemento más capacidades de red pero reduce la seguridad, por lo tanto, la clasificación de seguridad del complemento se reducirá cuando el complemento utilice esta opción.",
+                        "description": "Los complementos generalmente se ejecutan en su propia capa de red aislada, lo que les impide acceder a la red del sistema operativo del host. En algunos casos, este aislamiento de red puede limitar los complementos en la prestación de sus servicios y, por lo tanto, el autor del complemento puede eliminar el aislamiento, lo que le da al complemento acceso completo a las capacidades de red de la máquina host. Esto le da al complemento más capacidades de red pero reduce la seguridad, por consiguiente, la clasificación de seguridad del complemento se reducirá cuando el complemento utilice esta opción.",
                         "title": "Red del host"
                     },
                     "host_pid": {
-                        "description": "Por lo general, los procesos que ejecuta el complemento están aislados de todos los demás procesos del sistema. El autor del complemento ha solicitado que el complemento tenga acceso a los procesos del sistema que se ejecutan en la instancia del sistema host y también que permitas que el complemento genere procesos en el sistema host. Este modo le da al complemento acceso y control total a todo tu sistema Home Assistant, lo que agrega riesgos de seguridad y podría dañar tu sistema si se usa incorrectamente. Por lo tanto, esta característica tiene un impacto negativo en la puntuación de seguridad del complemento. \n\nEste nivel de acceso no se otorga automáticamente y debe ser confirmado por ti. Para hacer esto, debes deshabilitar el modo de protección en el complemento manualmente. Desactiva solo el modo de protección si conoces, necesitas Y confías en la fuente de este complemento.",
+                        "description": "Por lo general, los procesos que ejecuta el complemento están aislados de todos los demás procesos del sistema. El autor del complemento ha solicitado que el complemento tenga acceso a los procesos del sistema que se ejecutan en la instancia del sistema host y también que permitas que el complemento genere procesos en el sistema host. Este modo le da al complemento acceso y control total a todo tu sistema Home Assistant, lo que agrega riesgos de seguridad y podría dañar tu sistema si se usa incorrectamente. Por lo tanto, esta característica tiene un impacto negativo en la puntuación de seguridad del complemento. \n\nEste nivel de acceso no se otorga automáticamente y debe ser confirmado por ti. Para hacer esto debes deshabilitar el modo de protección en el complemento manualmente. Desactiva solo el modo de protección si conoces, necesitas Y CONFÍAS en la fuente de este complemento.",
                         "title": "Espacio de nombres de los procesos del host"
                     },
                     "ingress": {
@@ -205,7 +206,7 @@
                     }
                 },
                 "changelog": "Registro de cambios",
-                "cpu_usage": "Uso de CPU del complemento",
+                "cpu_usage": "Uso de CPU por el complemento",
                 "hostname": "Nombre de host",
                 "install": "instalar",
                 "new_update_available": "{name} {version} está disponible",
@@ -235,11 +236,11 @@
                     }
                 },
                 "protection_mode": {
-                    "content": "¡El modo de protección en este complemento está deshabilitado! Esto le da al complemento acceso completo a todo el sistema, lo que agrega riesgos de seguridad y podría dañar tu sistema si se usa incorrectamente. Desactiva solo el modo de protección si conoces, necesitas Y confías en la fuente de este complemento.",
+                    "content": "¡El modo de protección en este complemento está deshabilitado! Esto le da al complemento acceso completo a todo el sistema, lo que agrega riesgos de seguridad y podría dañar tu sistema si se usa incorrectamente. Desactiva solo el modo de protección si conoces, necesitas Y CONFÍAS en la fuente de este complemento.",
                     "enable": "Habilitar el modo de protección",
-                    "title": "Advertencia: ¡El modo de protección está desactivado!"
+                    "title": "Advertencia: ¡el modo de protección está desactivado!"
                 },
-                "ram_usage": "Uso de RAM del complemento",
+                "ram_usage": "Uso de RAM por el complemento",
                 "rebuild": "reconstruir",
                 "restart": "reiniciar",
                 "start": "iniciar",
@@ -253,7 +254,7 @@
             "failed_to_reset": "No se pudo restablecer la configuración del complemento, {error}",
             "failed_to_save": "No se pudo guardar la configuración del complemento, {error}",
             "logs": {
-                "get_logs": "No se pudieron obtener los registros del complemento, {error}"
+                "get_logs": "No se pudo obtener los registros del complemento, {error}"
             },
             "panel": {
                 "configuration": "Configuración",
@@ -267,6 +268,26 @@
                 "not_installed": "El complemento no está instalado"
             }
         },
+        "backup": {
+            "addons": "Complementos",
+            "confirm_password": "Confirma la contraseña de la instantánea",
+            "could_not_create": "No se pudo crear la instantánea",
+            "create": "Crear",
+            "create_blocked_not_running": "No es posible crear una instantánea en este momento porque el sistema está en el estado {state}.",
+            "created": "Creada",
+            "delete_backup_confirm": "Eliminar",
+            "delete_selected": "Eliminar instantáneas seleccionadas",
+            "enter_password": "Por favor, introduce una contraseña.",
+            "failed_to_delete": "No se pudo eliminar",
+            "folders": "Carpetas",
+            "name": "Nombre de la instantánea",
+            "password": "Contraseña de la instantánea",
+            "password_protection": "Protección con contraseña",
+            "passwords_not_matching": "Las contraseñas no coinciden",
+            "select_type": "Selecciona qué restaurar",
+            "selected": "{number} {number, plural,\n one {seleccionada}\n other {seleccionadas}\n}",
+            "type": "Tipo de instantánea"
+        },
         "common": {
             "cancel": "Cancelar",
             "close": "Cerrar",
@@ -366,9 +387,6 @@
                 "text": "¿Quieres reiniciar el complemento con tus cambios?"
             },
             "update": {
-                "create_snapshot": "Crea una instantánea de {name} antes de actualizar",
-                "snapshot": "Instantánea",
-                "snapshotting": "Creando instantánea de {name}",
                 "updating": "Actualizando {name} a la versión {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Panel de control",
-            "snapshots": "Instantáneas",
             "store": "Tienda de complementos",
             "system": "Sistema"
         },
-        "snapshot": {
-            "addons": "Complementos",
-            "available_snapshots": "Instantáneas disponibles",
-            "confirm_password": "Confirma la contraseña de la instantánea",
-            "could_not_create": "No se pudo crear la instantánea",
-            "create": "Crear",
-            "create_blocked_not_running": "No es posible crear una instantánea en este momento porque el sistema está en el estado {state}.",
-            "create_snapshot": "Crear instantánea",
-            "created": "Creada",
-            "delete_selected": "Eliminar instantáneas seleccionadas",
-            "delete_snapshot_confirm": "Eliminar",
-            "delete_snapshot_text": "¿Deseas eliminar {number} {number, plural,\n  one {instantánea}\n  other {instantáneas}\n}?",
-            "delete_snapshot_title": "Eliminar instantánea",
-            "description": "Las instantáneas te permiten realizar copias de seguridad y restaurar fácilmente todos los datos de tu instancia de Home Assistant.",
-            "enter_password": "Por favor, introduce una contraseña.",
-            "failed_to_delete": "No se pudo eliminar",
-            "folder": {
-                "addons/local": "Complementos locales",
-                "homeassistant": "Configuración de Home Assistant",
-                "media": "Medios",
-                "share": "Compartir",
-                "ssl": "SSL"
-            },
-            "folders": "Carpetas",
-            "full_snapshot": "Instantánea completa",
-            "name": "Nombre de la instantánea",
-            "no_snapshots": "Aún no tienes instantáneas.",
-            "partial_snapshot": "Instantánea parcial",
-            "password": "Contraseña de la instantánea",
-            "password_protected": "protegida por contraseña",
-            "password_protection": "Protección con contraseña",
-            "passwords_not_matching": "Las contraseñas no coinciden",
-            "security": "Seguridad",
-            "select_type": "Selecciona qué restaurar",
-            "selected": "{number} {number, plural,\n one {seleccionada}\n other {seleccionadas}\n}",
-            "type": "Tipo de instantánea",
-            "upload_snapshot": "Subir instantánea"
-        },
         "store": {
             "missing_addons": "¿Faltan complementos? Habilita el modo avanzado en tu página de perfil de usuario",
             "no_results_found": "No se encontraron resultados en {repository}.",
@@ -433,8 +412,8 @@
         },
         "system": {
             "core": {
-                "cpu_usage": "Uso de CPU del core",
-                "ram_usage": "Uso de RAM del core"
+                "cpu_usage": "Uso de CPU por el core",
+                "ram_usage": "Uso de RAM por el core"
             },
             "host": {
                 "change": "Cambiar",
@@ -460,7 +439,7 @@
                 "used_space": "Espacio usado"
             },
             "log": {
-                "get_logs": "No se pudieron obtener los registros de {provider}, {error}",
+                "get_logs": "No se pudo obtener los registros de {provider}, {error}",
                 "log_provider": "Proveedor de registros"
             },
             "supervisor": {
@@ -469,7 +448,7 @@
                 "beta_release_items": "Esto incluye versiones beta para:",
                 "beta_warning": "Las versiones beta son para probadores y usuarios pioneros y pueden contener cambios de código inestables",
                 "channel": "Canal",
-                "cpu_usage": "Uso de CPU del Supervisor",
+                "cpu_usage": "Uso de CPU por el Supervisor",
                 "failed_to_reload": "No pudo recargar el Supervisor",
                 "failed_to_set_option": "No se pudo configurar la opción del Supervisor",
                 "failed_to_update": "No se pudo actualizar el Supervisor",
@@ -477,12 +456,12 @@
                 "join_beta_description": "Obtén actualizaciones beta para Home Assistant (RC), Supervisor y el host",
                 "leave_beta_action": "Salir del canal beta",
                 "leave_beta_description": "Obtén actualizaciones estables para Home Assistant, Supervisor y el host",
-                "ram_usage": "Uso de RAM del Supervisor",
+                "ram_usage": "Uso de RAM por el Supervisor",
                 "reload_supervisor": "Recargar el Supervisor",
                 "search": "Buscar",
                 "share_diagnostics": "Compartir diagnósticos",
                 "share_diagnostics_description": "Comparte informes de fallos e información de diagnóstico.",
-                "share_diagonstics_description": "¿Te gustaría compartir automáticamente informes de fallos e información de diagnóstico cuando el Supervisor encuentra errores inesperados? {line_break} Esto nos permitirá solucionar los problemas, la información solo es accesible para el equipo principal de Home Assistant y no se compartirá con otros. {line_break} Los datos no incluyen ninguna información privada/confidencial y puedes desactivar esto en la configuración en cualquier momento que desees.",
+                "share_diagonstics_description": "¿Te gustaría compartir automáticamente informes de fallos e información de diagnóstico cuando el Supervisor encuentra errores inesperados? {line_break} Esto nos permitirá solucionar los problemas, la información solo es accesible para el equipo principal de Home Assistant y no se compartirá con otros. {line_break} Los datos no incluyen ninguna información privada/confidencial y puedes desactivar esto en la configuración en el momento que desees.",
                 "share_diagonstics_title": "Ayuda a mejorar Home Assistant",
                 "unhealthy_description": "Ejecutar una instalación en mal estado causará problemas. A continuación se muestra una lista de problemas encontrados con tu instalación, haz clic en los enlaces para saber cómo puedes resolver los problemas.",
                 "unhealthy_reason": {
@@ -497,7 +476,7 @@
                 "unsupported_reason": {
                     "apparmor": "AppArmor no está habilitado en el host",
                     "container": "Contenedores conocidos por causar problemas",
-                    "content-trust": "La validación de contenido de confianza está deshabilitada",
+                    "content-trust": "La validación de confianza en el contenido está deshabilitada",
                     "dbus": "DBUS",
                     "docker_configuration": "Configuración de Docker",
                     "docker_version": "Versión de Docker",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Fecha de fin",
+                "ranges": {
+                    "last_week": "La semana pasada",
+                    "this_week": "Esta semana",
+                    "today": "Hoy",
+                    "yesterday": "Ayer"
+                },
                 "select": "Seleccionar",
                 "start_date": "Fecha de inicio"
             },
@@ -851,10 +836,10 @@
                 "documentation": "documentación",
                 "learn_adding_local_media": "Saber más sobre cómo añadir contenido multimedia en la {documentation}.",
                 "local_media_files": "Coloca tus archivos de vídeo, audio e imagen en el directorio multimedia para poder navegar y reproducirlos en el navegador o en los reproductores compatibles.",
+                "media-player-browser": "Navegador del Reproductor Multimedia",
                 "media_browsing_error": "Error de navegación de medios",
                 "media_not_supported": "El Reproductor multimedia del navegador no es compatible con este tipo de medio",
                 "media_player": "Reproductor multimedia",
-                "media-player-browser": "Navegador del Reproductor Multimedia",
                 "no_items": "No hay elementos",
                 "no_local_media_found": "No se ha encontrado contenido multimedia local",
                 "no_media_folder": "Parece que aún no has creado un directorio multimedia.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Servicio"
             },
+            "statistic-picker": {
+                "learn_more": "Saber más sobre estadísticas",
+                "missing_entity": "¿Por qué mi entidad no aparece en la lista?",
+                "no_match": "No se han encontrado estadísticas coincidentes",
+                "no_statistics": "No tienes ninguna estadística",
+                "statistic": "Estadística"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Cargando estadísticas...",
+                "no_statistics_found": "No se encontraron estadísticas.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "promedio",
+                    "min": "min",
+                    "sum": "suma"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Seleccionar área",
                 "add_device_id": "Seleccionar dispositivo",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Opciones"
                 },
+                "loading": {
+                    "loading_flow": "Por favor, espera mientras se inicializan las opciones de {integration}",
+                    "loading_step": "Cargando el siguiente paso para {integration}"
+                },
                 "success": {
                     "description": "Las opciones se guardaron correctamente."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Configuración general",
                         "customize": "Personalizaciones",
                         "devices": "Dispositivos",
+                        "energy": "Energía",
                         "entities": "Entidades",
                         "helpers": "Ayudantes",
                         "info": "Información",
                         "integrations": "Integraciones",
                         "logs": "Registros",
                         "lovelace": "Paneles de Control Lovelace",
-                        "navigate_to": "Navegar a {panel}",
                         "person": "Personas",
                         "scene": "Escenas",
                         "script": "Scripts",
@@ -1215,7 +1221,7 @@
                 "power_source": "Fuente de alimentación",
                 "quirk": "Peculiaridad",
                 "services": {
-                    "reconfigure": "Reconfigura el dispositivo ZHA (curar dispositivo). Usa esto si tienes problemas con el dispositivo. Si el dispositivo en cuestión es un dispositivo alimentado por batería, asegúrate de que está activo y aceptando comandos cuando uses este servicio.",
+                    "reconfigure": "Reconfigura el dispositivo ZHA (recuperar dispositivo). Usa esto si tienes problemas con el dispositivo. Si el dispositivo en cuestión es un dispositivo alimentado por batería, asegúrate de que está activo y aceptando comandos cuando uses este servicio.",
                     "remove": "Eliminar un dispositivo de la red Zigbee.",
                     "updateDeviceName": "Establece un nombre personalizado para este dispositivo en el registro de dispositivos.",
                     "zigbee_information": "Ver la información Zigbee para el dispositivo."
@@ -1227,7 +1233,7 @@
             },
             "zha_reconfigure_device": {
                 "attribute": "Atributo",
-                "battery_device_warning": "Antes de iniciar el proceso de reconfiguración, deberás despertar los dispositivos que funcionan con batería. Consulta el manual de tu dispositivo para obtener instrucciones sobre cómo despertar el dispositivo.",
+                "battery_device_warning": "Antes de iniciar el proceso de reconfiguración deberás despertar los dispositivos que funcionan con batería. Consulta el manual de tu dispositivo para obtener instrucciones sobre cómo despertar el dispositivo.",
                 "bind_header": "Emparejamiento",
                 "button_hide": "Ocultar detalles",
                 "button_show": "Mostrar detalles",
@@ -1360,7 +1366,6 @@
                             "introduction": "Las acciones son lo que hará Home Assistant cuando se desencadene la automatización.",
                             "learn_more": "Saber más sobre las acciones.",
                             "name": "Acción",
-                            "type_select": "Tipo de acción",
                             "type": {
                                 "choose": {
                                     "add_option": "Añadir opción",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Repetir",
                                     "sequence": "Acciones",
-                                    "type_select": "Tipo de repetición",
                                     "type": {
                                         "count": {
                                             "label": "Cuenta"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Condiciones de repetición",
                                             "label": "Mientras"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Tipo de repetición"
                                 },
                                 "scene": {
                                     "label": "Activar escena"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Plantilla de espera"
                                 }
                             },
+                            "type_select": "Tipo de acción",
                             "unsupported_action": "No hay soporte del editor visual para la acción: {action}"
                         },
                         "alias": "Nombre",
@@ -1452,7 +1458,6 @@
                             "introduction": "Las condiciones son opcionales y evitarán que la automatización funcione a menos que se cumplan todas las condiciones.",
                             "learn_more": "Saber más sobre las condiciones",
                             "name": "Condición",
-                            "type_select": "Tipo de condición",
                             "type": {
                                 "and": {
                                     "label": "Y"
@@ -1513,12 +1518,18 @@
                                         "wed": "Miércoles"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "ID del desencadenante",
+                                    "label": "Desencadenante",
+                                    "no_triggers": "No hay desencadenantes disponibles"
+                                },
                                 "zone": {
                                     "entity": "Entidad con la ubicación",
                                     "label": "Zona",
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de condición",
                             "unsupported_condition": "No hay soporte del editor visual para la condición: {condition}"
                         },
                         "copy_to_clipboard": "Copiar al portapapeles",
@@ -1556,10 +1567,10 @@
                             "delete_confirm": "¿Estás seguro de que quieres eliminarlo?",
                             "duplicate": "Duplicar",
                             "header": "Desencadenantes",
+                            "id": "ID del desencadenante (utilizado por la condición desencadenante)",
                             "introduction": "Los desencadenantes son los que inician el funcionamiento de una regla de automatización. Es posible especificar varios desencadenantes para la misma regla. Una vez que se inicia un desencadenante, Home Assistant comprobará las condiciones, si las hubiere, y ejecutará la acción.",
                             "learn_more": "Saber más sobre los desencadenantes",
                             "name": "Desencadenante",
-                            "type_select": "Tipo de desencadenante",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1625,18 +1636,18 @@
                                     "label": "Plantilla",
                                     "value_template": "Valor de la plantilla"
                                 },
-                                "time_pattern": {
-                                    "hours": "Horas",
-                                    "label": "Patrón de tiempo",
-                                    "minutes": "Minutos",
-                                    "seconds": "Segundos"
-                                },
                                 "time": {
                                     "at": "A las",
                                     "label": "Hora",
                                     "type_input": "Valor de un ayudante de fecha/hora",
                                     "type_value": "Horario fijo"
                                 },
+                                "time_pattern": {
+                                    "hours": "Horas",
+                                    "label": "Patrón de tiempo",
+                                    "minutes": "Minutos",
+                                    "seconds": "Segundos"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "ID de webhook"
@@ -1650,6 +1661,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de desencadenante",
                             "unsupported_platform": "No hay soporte del editor visual para la plataforma: {platform}"
                         },
                         "unsaved_confirm": "Tienes cambios sin guardar. ¿Estás seguro de que quieres salir?"
@@ -1671,7 +1683,7 @@
                         "learn_more": "Saber más sobre las automatizaciones",
                         "no_automations": "No pudimos encontrar ninguna automatización",
                         "only_editable": "Solo las automatizaciones definidas en automations.yaml son editables.",
-                        "pick_automation": "Elije la automatización para editar",
+                        "pick_automation": "Elige la automatización para editar",
                         "show_info_automation": "Mostrar información sobre la automatización"
                     },
                     "thingtalk": {
@@ -1683,11 +1695,11 @@
                         },
                         "task_selection": {
                             "error_empty": "Introduce un comando o pulsa omitir.",
-                            "error_unsupported": "No hemos podido crear una automatización para eso (¿todavía?).",
+                            "error_unsupported": "No se ha podido crear una automatización para eso (¿todavía?).",
                             "for_example": "Por ejemplo:",
                             "header": "Crear una nueva automatización",
                             "introduction": "Escribe a continuación lo que debe hacer esta automatización, e intentaremos convertirlo en una automatización de Home Assistant.",
-                            "language_note": "Nota: Solo se admite Inglés por ahora."
+                            "language_note": "Nota: solo se admite inglés por ahora."
                         }
                     }
                 },
@@ -1782,6 +1794,7 @@
                             "instance_will_be_available": "Tu instancia estará disponible en",
                             "link_learn_how_it_works": "Aprende cómo funciona",
                             "not_connected": "No conectado",
+                            "reconnecting": "Reconectando",
                             "remote_enabled": {
                                 "caption": "Conectar automáticamente",
                                 "description": "Habilita esta opción para asegurarte de que tu instancia de Home Assistant está siempre accesible de forma remota."
@@ -1812,9 +1825,9 @@
                             "loading": "Cargando...",
                             "manage": "Administrar",
                             "no_hooks_yet": "Parece que aún no tienes webhooks. Comienza configurando un",
+                            "no_hooks_yet2": " o mediante la creación de un ",
                             "no_hooks_yet_link_automation": "automatización de webhook",
                             "no_hooks_yet_link_integration": "integración basada en webhook",
-                            "no_hooks_yet2": " o mediante la creación de un ",
                             "title": "Webhooks"
                         }
                     },
@@ -1929,41 +1942,13 @@
                     "description": "Sistema de unidades, ubicación, zona horaria y otros parámetros generales",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Antes de habilitar esto, asegúrate de visitar la página de documentación de análisis {link} para comprender qué estás enviando y cómo se almacena.",
-                                "header": "Analítica",
-                                "instance_id": "ID de instancia: {huuid}",
-                                "introduction": "Comparte la información de tu instalación para ayudar a mejorar Home Assistant y ayudarnos a convencer a los fabricantes de que agreguen funciones de control local y centradas en la privacidad.",
-                                "learn_more": "Cómo tratamos tus datos",
-                                "needs_base": "Debes habilitar el análisis base para que esta opción esté disponible",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID de instancia, versión y tipo de instalación.",
-                                        "title": "Analítica básica"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Comparte informes de fallos cuando se produzcan errores inesperados.",
-                                        "title": "Diagnósticos"
-                                    },
-                                    "statistics": {
-                                        "description": "Total de entidades, usuarios y otros elementos utilizados.",
-                                        "title": "Estadísticas de uso"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nombres, versiones y capacidades.",
-                                        "title": "Integraciones y complementos utilizados"
-                                    },
-                                    "usage": {
-                                        "description": "Nombres e información de versión.",
-                                        "title": "Integraciones utilizadas"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Divisa",
                                 "edit_requires_storage": "Editor deshabilitado debido a la configuración almacenada en configuration.yaml.",
                                 "elevation": "Altitud",
                                 "elevation_meters": "metros",
                                 "external_url": "URL externa",
+                                "find_currency_value": "Encuentra tu valor",
                                 "imperial_example": "Fahrenheit, libras",
                                 "internal_url": "URL interna",
                                 "latitude": "Latitud",
@@ -2092,6 +2077,63 @@
                     "update": "Actualizar",
                     "update_device_error": "Error al actualizar el dispositivo"
                 },
+                "energy": {
+                    "caption": "Energía",
+                    "description": "Monitoriza tu producción y consumo de energía",
+                    "device_consumption": {
+                        "add_stat": "Elige la entidad para realizar un seguimiento de la energía de",
+                        "dialog": {
+                            "selected_stat_intro": "Selecciona la entidad que representa el uso de energía del dispositivo."
+                        },
+                        "learn_more": "Más información sobre cómo empezar.",
+                        "selected_stat": "Realizando el seguimiento de la energía para",
+                        "sub": "El seguimiento del uso de energía de dispositivos individuales permite a Home Assistant desglosar tu consumo de energía por dispositivo.",
+                        "title": "Dispositivos individuales"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Usar una entidad con el precio actual",
+                                "cost_entity_input": "Entidad con el precio actual",
+                                "cost_number": "Usar un precio estático",
+                                "cost_number_input": "Precio por kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Selecciona cómo Home Assistant debe realizar un seguimiento de los costes de la energía consumida.",
+                                "cost_stat": "Usar una entidad que realizar un seguimiento de los costes totales",
+                                "cost_stat_input": "Entidad de costes totales",
+                                "energy_stat": "Energía consumida (kWh)",
+                                "header": "Configurar el consumo de la red",
+                                "no_cost": "No hacer un seguimiento de los costes",
+                                "paragraph": "El consumo de la red es la energía que fluye desde la red eléctrica hasta tu hogar."
+                            },
+                            "to": {
+                                "cost_entity": "Usar una entidad con la tarifa actual",
+                                "cost_entity_input": "Entidad con la tarifa actual",
+                                "cost_number": "Usar una tarifa estática",
+                                "cost_number_input": "Tarifa por kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "¿Te devuelven el dinero cuando vuelcas energía a la red?",
+                                "cost_stat": "Usar una entidad que rastrea el total de dinero recibido",
+                                "cost_stat_input": "Entidad de compensación total",
+                                "energy_stat": "Energía devuelta a la red (kWh)",
+                                "header": "Configurar la producción de la red",
+                                "no_cost": "No me devuelven el dinero",
+                                "paragraph": "La producción de la red es la energía que fluye de tus paneles solares a la red."
+                            }
+                        },
+                        "learn_more": "Más información sobre cómo empezar.",
+                        "sub": "Configura la cantidad de energía que consumes de la red y, si produces energía, la que vuelcas a la red. Esto permite que Home Assistant realice un seguimiento del uso de energía de todo el hogar.",
+                        "title": "Red eléctrica"
+                    },
+                    "solar": {
+                        "learn_more": "Más información sobre cómo empezar.",
+                        "stat_predicted_production": "Predicción de tu producción de energía solar",
+                        "stat_production": "Tu producción de energía solar",
+                        "stat_return_to_grid": "Energía solar devuelta a la red",
+                        "sub": "Permite que Home Assistant controle tus paneles solares y te brinde información sobre su rendimiento.",
+                        "title": "Paneles solares"
+                    }
+                },
                 "entities": {
                     "caption": "Entidades",
                     "description": "Administra las entidades conocidas.",
@@ -2142,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Limpiar",
-                    "filtering_by": "Filtrando por",
-                    "show": "Mostrar"
-                },
-                "hassio": {
-                    "button": "Configurar"
-                },
                 "header": "Configurar Home Assistant",
                 "helpers": {
                     "caption": "Ayudantes",
@@ -2199,16 +2233,11 @@
                     "server": "servidor",
                     "setup_time": "Tiempo de configuración",
                     "source": "Fuente:",
-                    "system_health_error": "El componente Estado del Sistema no está cargado. Añade 'system_health:' a configuration.yaml",
                     "system_health": {
                         "manage": "Administrar",
                         "more_info": "más información"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "página de integraciones",
-                    "missing_zha": "¿Echas de menos el panel de configuración de ZHA? Se ha movido a la entrada ZHA en la {integrations_page}.",
-                    "missing_zwave": "¿Echas de menos el panel de configuración de Z-Wave? Se ha movido a la entrada Z-Wave en la {integrations_page}."
+                    },
+                    "system_health_error": "El componente Estado del Sistema no está cargado. Añade 'system_health:' a configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Añadir integración",
@@ -2223,8 +2252,6 @@
                         "depends_on_cloud": "Depende de la nube",
                         "device_unavailable": "Dispositivo no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositivo}\n  other {dispositivos}\n}",
-                        "disable_error": "Error al habilitar o deshabilitar la integración",
-                        "disable_restart_confirm": "Reinicia Home Assistant para terminar de deshabilitar esta integración",
                         "disable": {
                             "disable_confirm": "¿Estás seguro de que deseas deshabilitar esta entrada de configuración? Sus dispositivos y entidades estarán deshabilitados.",
                             "disabled": "Deshabilitada",
@@ -2235,6 +2262,8 @@
                             },
                             "disabled_cause": "Deshabilitada por {cause}"
                         },
+                        "disable_error": "Error al habilitar o deshabilitar la integración",
+                        "disable_restart_confirm": "Reinicia Home Assistant para terminar de deshabilitar esta integración",
                         "disabled_polling": "Sondeo automático para datos actualizados deshabilitado",
                         "documentation": "Documentación",
                         "enable_restart_confirm": "Reinicia Home Assistant para terminar de habilitar esta integración",
@@ -2242,11 +2271,9 @@
                         "entity_unavailable": "Entidad no disponible",
                         "firmware": "Firmware: {version}",
                         "hub": "Conectado a través de",
-                        "logs": "registros",
                         "manuf": "por {manufacturer}",
                         "no_area": "Ningún área",
                         "not_loaded": "No se ha cargado",
-                        "options": "Opciones",
                         "provided_by_custom_integration": "Proporcionada por una integración personalizada",
                         "reload": "Recargar",
                         "reload_confirm": "La integración se ha recargado",
@@ -2278,7 +2305,11 @@
                             "open_site": "Abrir sitio web"
                         },
                         "finish": "Terminar",
-                        "loading_first_time": "Por favor, espera mientras la integración está siendo instalada",
+                        "loading": {
+                            "fallback_title": "la integración",
+                            "loading_flow": "Por favor, espera mientras se configura {integration}",
+                            "loading_step": "Cargando el siguiente paso para {integration}"
+                        },
                         "next": "Siguiente",
                         "not_all_required_fields": "No se han completado todos los campos requeridos.",
                         "not_loaded": "La integración no se ha podido cargar, intenta reiniciar Home Assistant.",
@@ -2295,7 +2326,6 @@
                     "details": "Detalles de la integración",
                     "disable": {
                         "disabled_integrations": "{number} deshabilitadas",
-                        "hide_disabled": "Ocultar integraciones deshabilitadas",
                         "show": "Mostrar",
                         "show_disabled": "Mostrar integraciones deshabilitadas"
                     },
@@ -2306,7 +2336,6 @@
                         "confirm_delete_ignore_title": "¿Dejar de ignorar {name}?",
                         "confirm_ignore": "¿Estás seguro de que no quieres configurar esta integración? Puedes deshacer esto haciendo clic en 'Mostrar integraciones ignoradas' en el menú de desbordamiento en la parte superior derecha.",
                         "confirm_ignore_title": "¿Ignorar la detección de {name}?",
-                        "hide_ignored": "Ocultar integraciones ignoradas",
                         "ignore": "Ignorar",
                         "ignored": "Ignorado",
                         "show_ignored": "Mostrar integraciones ignoradas",
@@ -2426,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configurar",
                     "description_listen": "Escuchar un tema",
                     "description_publish": "Publicar un paquete",
                     "listening_to": "Escuchando",
@@ -2440,7 +2468,6 @@
                     "topic": "tema"
                 },
                 "ozw": {
-                    "button": "Configurar",
                     "common": {
                         "controller": "Controlador",
                         "instance": "Instancia",
@@ -2465,6 +2492,11 @@
                         "nodes": "Nodos",
                         "select_instance": "Seleccionar Instancia"
                     },
+                    "network": {
+                        "header": "Administración de la Red",
+                        "introduction": "Gestionar las funciones de toda la red.",
+                        "node_count": "{count} nodos"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Se han consultado todos los nodos.",
@@ -2485,10 +2517,9 @@
                         "starting": "Iniciando",
                         "unknown": "Desconocido"
                     },
-                    "network": {
-                        "header": "Administración de la Red",
-                        "introduction": "Gestionar las funciones de toda la red.",
-                        "node_count": "{count} nodos"
+                    "node": {
+                        "button": "Detalles del nodo",
+                        "not_found": "Nodo no encontrado"
                     },
                     "node_config": {
                         "header": "Configuración del nodo",
@@ -2518,10 +2549,6 @@
                         "versions": "Obteniendo información sobre versiones de firmware y clases de órdenes",
                         "wakeup": "Configurar soporte para mensajes y colas de activación"
                     },
-                    "node": {
-                        "button": "Detalles del nodo",
-                        "not_found": "Nodo no encontrado"
-                    },
                     "nodes_table": {
                         "failed": "Ha fallado",
                         "id": "ID",
@@ -2645,7 +2672,7 @@
                         "icon": "Icono",
                         "id": "ID de la entidad",
                         "id_already_exists": "Este ID ya existe",
-                        "id_already_exists_save_error": "No puedes guardar este script porque el ID no es único, elije otro ID o déjalo en blanco para generar uno automáticamente.",
+                        "id_already_exists_save_error": "No puedes guardar este script porque el ID no es único, elige otro ID o déjalo en blanco para generar uno automáticamente.",
                         "introduction": "Utiliza scripts para ejecutar una secuencia de acciones.",
                         "link_available_actions": "Saber más sobre las acciones disponibles.",
                         "load_error_not_editable": "Solo los scripts dentro de scripts.yaml son editables.",
@@ -2664,10 +2691,12 @@
                         },
                         "save_script": "Guardar script",
                         "sequence": "Secuencia",
-                        "sequence_sentence": "La secuencia de acciones de este script."
+                        "sequence_sentence": "La secuencia de acciones de este script.",
+                        "show_trace": "Mostrar traza"
                     },
                     "picker": {
                         "add_script": "Añadir script",
+                        "dev_script": "Depurar script",
                         "duplicate": "Duplicar",
                         "duplicate_script": "Duplicar script",
                         "edit_script": "Editar script",
@@ -2703,7 +2732,7 @@
                             "input_number": "Campos numéricos",
                             "input_select": "Campos desplegables",
                             "input_text": "Campos de texto",
-                            "introduction": "Algunas partes de Home Assistant pueden recargarse sin necesidad de reiniciar. Al pulsar en recargar se descartará la configuración YAML actual y se cargará la nueva.",
+                            "introduction": "Algunas partes de Home Assistant se pueden recargar sin necesidad de reiniciar. Al hacer clic en una de las siguientes opciones, se descargará su configuración YAML actual y se cargará la nueva.",
                             "min_max": "Entidades mín/máx",
                             "mqtt": "Entidades MQTT configuradas manualmente",
                             "person": "Personas",
@@ -2824,7 +2853,6 @@
                         "search_again": "Buscar de nuevo",
                         "spinner": "Buscando dispositivos ZHA Zigbee...."
                     },
-                    "button": "Configurar",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributos del clúster seleccionado",
                         "get_zigbee_attribute": "Obtener atributo de Zigbee",
@@ -2854,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Atajos",
-                        "update_button": "Actualizar la configuración",
-                        "zha_options": {
-                            "default_light_transition": "Tiempo de transición de la luz por defecto (segundos)",
-                            "enable_identify_on_join": "Habilita el efecto de identificación cuando los dispositivos se unen a la red",
-                            "title": "Opciones globales"
-                        }
+                        "update_button": "Actualizar la configuración"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuración completada",
@@ -2941,123 +2964,7 @@
                     "introduction": "Las zonas permiten especificar determinadas regiones de la tierra. Cuando una persona está dentro de una zona, su estado tomará el nombre de la zona. Las zonas también se pueden utilizar como desencadenante o condición dentro de las configuraciones de automatización.",
                     "no_zones_created_yet": "Parece que aún no has creado ninguna zona."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Cancelar inclusión",
-                        "controller_in_inclusion_mode": "Tu controlador Z-Wave ahora está en modo de inclusión.",
-                        "follow_device_instructions": "Sigue las instrucciones que vienen con el dispositivo para activar el emparejamiento en el dispositivo.",
-                        "inclusion_failed": "No se pudo agregar el nodo. Por favor, consulta los registros para obtener más información.",
-                        "inclusion_finished": "Se ha agregado el nodo.",
-                        "interview_failed": "La entrevista del dispositivo falló. Es posible que haya información adicional disponible en los registros.",
-                        "interview_started": "El dispositivo está siendo entrevistado. Esto puede llevar algún tiempo.",
-                        "introduction": "Este asistente te guiará para añadir un nodo a tu red Z-Wave.",
-                        "secure_inclusion_warning": "Los dispositivos seguros requieren ancho de banda adicional; demasiados dispositivos seguros pueden ralentizar tu red Z-Wave. Recomendamos usar solo la inclusión segura para dispositivos que lo requieran, como cerraduras o abre-puertas de garaje.",
-                        "start_inclusion": "Iniciar inclusión",
-                        "start_secure_inclusion": "Iniciar inclusión segura",
-                        "title": "Añadir un nodo Z-Wave",
-                        "use_secure_inclusion": "Usar inclusión segura",
-                        "view_device": "Ver dispositivo"
-                    },
-                    "button": "Configurar",
-                    "common": {
-                        "add_node": "Añadir Nodo",
-                        "close": "Cerrar",
-                        "heal_network": "Sanar red",
-                        "home_id": "ID de casa",
-                        "network": "Red",
-                        "node_id": "ID del Nodo",
-                        "reconfigure_server": "Reconfigurar el servidor",
-                        "remove_node": "Eliminar Nodo"
-                    },
-                    "dashboard": {
-                        "driver_version": "Versión del controlador",
-                        "dump_dead_nodes_text": "Algunos de tus nodos no respondieron y se supone que están muertos. Estos no se exportarán por completo.",
-                        "dump_dead_nodes_title": "Algunos de tus nodos están muertos",
-                        "dump_debug": "Descarga un volcado de tu red para ayudar a diagnosticar problemas",
-                        "dump_not_ready_confirm": "Descargar",
-                        "dump_not_ready_text": "Si creas una exportación cuando no todos los nodos están listos, puedes perder datos necesarios. Dale a tu red algo de tiempo para consultar todos los nodos. ¿Quieres continuar con el volcado?",
-                        "dump_not_ready_title": "Aún no están listos todos los nodos",
-                        "header": "Administra tu red Z-Wave",
-                        "home_id": "ID de casa",
-                        "introduction": "Administra tu red Z-Wave y los nodos Z-Wave",
-                        "nodes_ready": "Nodos listos",
-                        "server_version": "Versión del servidor"
-                    },
-                    "device_info": {
-                        "device_config": "Configurar dispositivo",
-                        "node_ready": "Nodo listo",
-                        "node_status": "Estado del Nodo",
-                        "zwave_info": "Información de Z-Wave"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Se ha cancelado la curación de la red.",
-                        "healing_complete": "La curación de la red se ha completado.",
-                        "healing_failed": "La curación falló. Puede haber información adicional disponible en los registros.",
-                        "in_progress": "La curación de la red está en curso. Esto llevará algún tiempo.",
-                        "introduction": "Inicia una cura de red en tu red Z-Wave. Una curación de la red hará que todos los dispositivos vuelvan a calcular sus rutas de regreso al controlador y se recomienda si has movido dispositivos o tu controlador recientemente.",
-                        "run_in_background": "Puedes cerrar este cuadro de diálogo y la curación de la red continuará en segundo plano.",
-                        "start_heal": "Iniciar la curación",
-                        "stop_heal": "Detener la curación",
-                        "title": "Sana tu red Z-Wave",
-                        "traffic_warning": "El proceso de curación genera una gran cantidad de tráfico en la red Z-Wave. Esto puede hacer que los dispositivos respondan lentamente (o no respondan en absoluto) mientras la curación está en curso."
-                    },
-                    "logs": {
-                        "log_level": "Nivel de registro",
-                        "log_level_changed": "Nivel de registro cambiado a: {level}",
-                        "subscribed_to_logs": "Suscrito a los mensajes de registro de Z-Wave JS...",
-                        "title": "Registros de Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "Registros",
-                        "network": "Red"
-                    },
-                    "network_status": {
-                        "connected": "Conectado",
-                        "connecting": "Conectando",
-                        "unknown": "Desconocido"
-                    },
-                    "node_config": {
-                        "attribution": "{device_database} proporciona los parámetros de configuración del dispositivo y las descripciones.",
-                        "battery_device_notice": "Los dispositivos de batería deben estar activos para actualizar su configuración. Consulta el manual de tu dispositivo para obtener instrucciones sobre cómo reactivar el dispositivo.",
-                        "error_device_not_found": "Dispositivo no encontrado",
-                        "header": "Configuración del dispositivo Z-Wave",
-                        "introduction": "Administra y ajusta los parámetros de configuración específicos del dispositivo (nodo) para el dispositivo seleccionado",
-                        "parameter_is_read_only": "Este parámetro es de solo lectura.",
-                        "set_param_accepted": "El parámetro se ha actualizado.",
-                        "set_param_error": "Se ha producido un error.",
-                        "set_param_queued": "El cambio de parámetro se ha puesto en cola y se actualizará cuando el dispositivo se active.",
-                        "zwave_js_device_database": "Base de datos de dispositivos Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Vivo",
-                        "asleep": "Dormido",
-                        "awake": "Despierto",
-                        "dead": "No responde",
-                        "unknown": "Desconocido"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Deberás reactivar los dispositivos que funcionan con baterías antes de comenzar la reentrevista. Consulta el manual de tu dispositivo para obtener instrucciones sobre cómo reactivar el dispositivo.",
-                        "in_progress": "El dispositivo está siendo entrevistado. Esto puede llevar algún tiempo.",
-                        "interview_complete": "Entrevista con el dispositivo completa.",
-                        "interview_failed": "La entrevista del dispositivo falló. Es posible que haya información adicional disponible en los registros.",
-                        "introduction": "Vuelve a entrevistar un dispositivo en tu red Z-Wave. Utiliza esta función si tu dispositivo tiene una funcionalidad incorrecta o ausente.",
-                        "run_in_background": "Puedes cerrar este cuadro de diálogo y la entrevista continuará en segundo plano.",
-                        "start_reinterview": "Iniciar la reentrevista",
-                        "title": "Volver a entrevistar un dispositivo Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Cancelar exclusión",
-                        "controller_in_exclusion_mode": "Tu controlador Z-Wave ahora está en modo de exclusión.",
-                        "exclusion_failed": "No se pudo eliminar el nodo. Por favor, consulta los registros para obtener más información.",
-                        "exclusion_finished": "El nodo {id} se ha eliminado de tu red Z-Wave.",
-                        "follow_device_instructions": "Sigue las instrucciones que vienen con el dispositivo para activar la exclusión en el dispositivo.",
-                        "introduction": "Elimina un nodo de tu red Z-Wave y elimina el dispositivo y las entidades asociadas de Home Assistant.",
-                        "start_exclusion": "Iniciar exclusión",
-                        "title": "Eliminar un nodo Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Configurar",
                     "common": {
                         "index": "Índice",
                         "instance": "Instancia",
@@ -3102,7 +3009,7 @@
                         "exclude_entity": "Excluir esta entidad de Home Assistant",
                         "group": "Grupo",
                         "header": "Gestión de nodos Z-Wave",
-                        "introduction": "Ejecuta comandos de Z-Wave que afectan a un solo nodo. Elije un nodo para ver una lista de comandos disponibles.",
+                        "introduction": "Ejecuta comandos de Z-Wave que afectan a un solo nodo. Elige un nodo para ver una lista de comandos disponibles.",
                         "max_associations": "Asociaciones máximas:",
                         "node_group_associations": "Asociaciones de grupos de nodos",
                         "node_protection": "Protección del nodo",
@@ -3127,8 +3034,8 @@
                         "add_node": "Añadir nodo",
                         "add_node_secure": "Añadir nodo seguro",
                         "cancel_command": "Cancelar comando",
-                        "heal_network": "Sanar red",
-                        "heal_node": "Sanar nodo",
+                        "heal_network": "Recuperar red",
+                        "heal_node": "Recuperar nodo",
                         "node_info": "Información del nodo",
                         "print_node": "Imprimir nodo",
                         "refresh_entity": "Actualizar Entidad",
@@ -3146,6 +3053,144 @@
                     "values": {
                         "header": "Valores del nodo"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Cancelar inclusión",
+                        "controller_in_inclusion_mode": "Tu controlador Z-Wave ahora está en modo de inclusión.",
+                        "follow_device_instructions": "Sigue las instrucciones que vienen con el dispositivo para activar el emparejamiento en el dispositivo.",
+                        "inclusion_failed": "No se pudo agregar el nodo. Por favor, consulta los registros para obtener más información.",
+                        "inclusion_finished": "Se ha agregado el nodo.",
+                        "interview_failed": "La entrevista del dispositivo falló. Es posible que haya información adicional disponible en los registros.",
+                        "interview_started": "El dispositivo está siendo entrevistado. Esto puede llevar algún tiempo.",
+                        "introduction": "Este asistente te guiará para añadir un nodo a tu red Z-Wave.",
+                        "secure_inclusion_warning": "Los dispositivos seguros requieren ancho de banda adicional; demasiados dispositivos seguros pueden ralentizar tu red Z-Wave. Recomendamos usar solo la inclusión segura para dispositivos que lo requieran, como cerraduras o abre-puertas de garaje.",
+                        "start_inclusion": "Iniciar inclusión",
+                        "start_secure_inclusion": "Iniciar inclusión segura",
+                        "title": "Añadir un nodo Z-Wave",
+                        "use_secure_inclusion": "Usar inclusión segura",
+                        "view_device": "Ver dispositivo"
+                    },
+                    "common": {
+                        "add_node": "Añadir Nodo",
+                        "close": "Cerrar",
+                        "heal_network": "Recuperar red",
+                        "home_id": "ID de casa",
+                        "network": "Red",
+                        "node_id": "ID del Nodo",
+                        "reconfigure_server": "Reconfigurar el servidor",
+                        "remove_node": "Eliminar Nodo",
+                        "source": "Fuente"
+                    },
+                    "dashboard": {
+                        "driver_version": "Versión del controlador",
+                        "dump_dead_nodes_text": "Algunos de tus nodos no respondieron y se supone que están muertos. Estos no se exportarán por completo.",
+                        "dump_dead_nodes_title": "Algunos de tus nodos están muertos",
+                        "dump_debug": "Descarga un volcado de tu red para ayudar a diagnosticar problemas",
+                        "dump_not_ready_confirm": "Descargar",
+                        "dump_not_ready_text": "Si creas una exportación cuando no todos los nodos están listos, puedes perder datos necesarios. Dale a tu red algo de tiempo para consultar todos los nodos. ¿Quieres continuar con el volcado?",
+                        "dump_not_ready_title": "Aún no están listos todos los nodos",
+                        "header": "Administra tu red Z-Wave",
+                        "home_id": "ID de casa",
+                        "introduction": "Administra tu red Z-Wave y los nodos Z-Wave",
+                        "nodes_ready": "Nodos listos",
+                        "server_version": "Versión del servidor"
+                    },
+                    "device_info": {
+                        "device_config": "Configurar dispositivo",
+                        "heal_node": "Recuperar nodo",
+                        "node_ready": "Nodo listo",
+                        "node_status": "Estado del Nodo",
+                        "reinterview_device": "Volver a entrevistar el dispositivo",
+                        "remove_failed": "Eliminar dispositivo fallido",
+                        "zwave_info": "Información de Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Se ha cancelado la recuperación de la red.",
+                        "healing_complete": "La recuperación de la red se ha completado.",
+                        "healing_failed": "La recuperación falló. Puede haber información adicional disponible en los registros.",
+                        "in_progress": "La recuperación de la red está en curso. Esto llevará algún tiempo.",
+                        "introduction": "Inicia un proceso de recuperación de red en tu red Z-Wave. Una recuperación de la red hará que todos los dispositivos vuelvan a calcular sus rutas hacia el controlador y se recomienda si has cambiado algún dispositivo de sitio o tu controlador recientemente.",
+                        "run_in_background": "Puedes cerrar este cuadro de diálogo y la recuperación de la red continuará en segundo plano.",
+                        "start_heal": "Iniciar la recuperación",
+                        "stop_heal": "Detener la recuperación",
+                        "title": "Recupera tu red Z-Wave",
+                        "traffic_warning": "El proceso de recuperación genera una gran cantidad de tráfico en la red Z-Wave. Esto puede hacer que los dispositivos respondan lentamente (o no respondan en absoluto) mientras la recuperación está en curso."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} ha sido recuperado.",
+                        "healing_failed": "{device} no se pudo recuperar.",
+                        "healing_failed_check_logs": "Puede haber información adicional disponible en los registros.",
+                        "in_progress": "La recuperación de {device} está en curso.",
+                        "introduction": "Dile a {device} que actualice sus rutas al controlador. Esto puede ayudar con problemas de comunicación si recientemente has movido el dispositivo o tu controlador.",
+                        "network_heal_in_progress": "Ya se está realizando una recuperación de la red Z-Wave. Espera a que termine antes de recuperar un dispositivo individual.",
+                        "start_heal": "Recuperar dispositivo",
+                        "title": "Recuperar un dispositivo Z-Wave",
+                        "traffic_warning": "El proceso de recuperación genera una gran cantidad de tráfico en la red Z-Wave. Esto puede hacer que los dispositivos respondan lentamente (o no respondan en absoluto) mientras la recuperación está en curso."
+                    },
+                    "logs": {
+                        "log_level": "Nivel de registro",
+                        "log_level_changed": "Nivel de registro cambiado a: {level}",
+                        "subscribed_to_logs": "Suscrito a los mensajes de registro de Z-Wave JS...",
+                        "title": "Registros de Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Registros",
+                        "network": "Red"
+                    },
+                    "network_status": {
+                        "connected": "Conectado",
+                        "connecting": "Conectando",
+                        "unknown": "Desconocido"
+                    },
+                    "node_config": {
+                        "attribution": "{device_database} proporciona los parámetros de configuración del dispositivo y las descripciones.",
+                        "battery_device_notice": "Los dispositivos de batería deben estar activos para actualizar su configuración. Consulta el manual de tu dispositivo para obtener instrucciones sobre cómo reactivar el dispositivo.",
+                        "error_device_not_found": "Dispositivo no encontrado",
+                        "header": "Configuración del dispositivo Z-Wave",
+                        "introduction": "Administra y ajusta los parámetros de configuración específicos del dispositivo (nodo) para el dispositivo seleccionado",
+                        "parameter": "Parámetro",
+                        "parameter_is_read_only": "Este parámetro es de solo lectura.",
+                        "set_param_accepted": "El parámetro se ha actualizado.",
+                        "set_param_error": "Se ha producido un error.",
+                        "set_param_queued": "El cambio de parámetro se ha puesto en cola y se actualizará cuando el dispositivo se active.",
+                        "zwave_js_device_database": "Base de datos de dispositivos Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Vivo",
+                        "asleep": "Dormido",
+                        "awake": "Despierto",
+                        "dead": "No responde",
+                        "unknown": "Desconocido"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Antes de iniciar el proceso de reentrevista deberás despertar los dispositivos que funcionan con batería. Consulta el manual de tu dispositivo para obtener instrucciones sobre cómo despertar el dispositivo.",
+                        "in_progress": "El dispositivo está siendo entrevistado. Esto puede llevar algún tiempo.",
+                        "interview_complete": "Entrevista con el dispositivo completa.",
+                        "interview_failed": "La entrevista del dispositivo falló. Es posible que haya información adicional disponible en los registros.",
+                        "introduction": "Vuelve a entrevistar un dispositivo en tu red Z-Wave. Utiliza esta función si tu dispositivo tiene una funcionalidad incorrecta o ausente.",
+                        "run_in_background": "Puedes cerrar este cuadro de diálogo y la entrevista continuará en segundo plano.",
+                        "start_reinterview": "Iniciar la reentrevista",
+                        "title": "Volver a entrevistar un dispositivo Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "La eliminación del dispositivo está en curso.",
+                        "introduction": "Elimina un dispositivo fallido de tu red Z-Wave. Usa esto si no puedes excluir un dispositivo normalmente porque está estropeado.",
+                        "removal_failed": "El dispositivo no se pudo eliminar de tu red Z-Wave.",
+                        "removal_finished": "El nodo {id} se ha eliminado de tu red Z-Wave.",
+                        "remove_device": "Eliminar dispositivo",
+                        "title": "Eliminar un dispositivo Z-Wave fallido"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Cancelar exclusión",
+                        "controller_in_exclusion_mode": "Tu controlador Z-Wave ahora está en modo de exclusión.",
+                        "exclusion_failed": "No se pudo eliminar el nodo. Por favor, consulta los registros para obtener más información.",
+                        "exclusion_finished": "El nodo {id} se ha eliminado de tu red Z-Wave.",
+                        "follow_device_instructions": "Sigue las instrucciones que vienen con el dispositivo para activar la exclusión en el dispositivo.",
+                        "introduction": "Elimina un nodo de tu red Z-Wave y elimina el dispositivo y las entidades asociadas de Home Assistant.",
+                        "start_exclusion": "Iniciar exclusión",
+                        "title": "Eliminar un nodo Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3228,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Volver",
-                "supervisor": {
-                    "ask": "Pide ayuda",
-                    "observer": "Comprueba el Observador",
-                    "reboot": "Intenta reiniciar el host",
-                    "system_health": "Comprueba la salud del sistema",
-                    "title": "¡No se pudo cargar el panel del Supervisor!",
-                    "wait": "Si acabas de empezar, asegúrate de haber dado al supervisor suficiente tiempo para comenzar."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "La semana pasada",
-                    "this_week": "Esta semana",
-                    "today": "Hoy",
-                    "yesterday": "Ayer"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "La semana pasada",
-                    "this_week": "Esta semana",
-                    "today": "Hoy",
-                    "yesterday": "Ayer"
+            "energy": {
+                "charts": {
+                    "by_device": "Consumo por dispositivo",
+                    "solar": "Solar",
+                    "stat_house_energy_meter": "Consumo total de energía"
+                },
+                "setup": {
+                    "back": "Volver",
+                    "done": "¡Muéstrame mi panel de control de energía!",
+                    "next": "Siguiente"
                 }
             },
             "lovelace": {
@@ -3366,7 +3396,6 @@
                         "entities": {
                             "description": "La tarjeta Entidades es el tipo de tarjeta más común. Agrupa los elementos en listas.",
                             "edit_special_row": "Ve los detalles de esta fila haciendo clic en el botón de edición",
-                            "entity_row_editor": "Editor de filas de entidades",
                             "entity_row": {
                                 "attribute": "Atributo",
                                 "button": "Botón",
@@ -3378,6 +3407,7 @@
                                 "section": "Sección",
                                 "weblink": "Enlace web"
                             },
+                            "entity_row_editor": "Editor de filas de entidades",
                             "name": "Entidades",
                             "secondary_info_values": {
                                 "brightness": "Brillo",
@@ -3404,6 +3434,7 @@
                         "gauge": {
                             "description": "La tarjeta Indicador es una tarjeta básica que permite ver visualmente los datos de los sensores.",
                             "name": "Indicador",
+                            "needle_gauge": "¿Mostrar como medidor de aguja?",
                             "severity": {
                                 "define": "¿Definir gravedad?",
                                 "green": "Verde",
@@ -3416,6 +3447,7 @@
                             "attribute": "Atributo",
                             "camera_image": "Entidad de cámara",
                             "camera_view": "Vista de cámara",
+                            "days_to_show": "Días para mostrar",
                             "double_tap_action": "Acción de doble toque",
                             "entities": "Entidades",
                             "entity": "Entidad",
@@ -3529,6 +3561,10 @@
                             "integration_not_loaded": "Esta tarjeta requiere que se configure la integración 'Lista de la compra'.",
                             "name": "Lista de la compra"
                         },
+                        "statistics-graph": {
+                            "description": "La tarjeta Gráfico de estadísticas te permite mostrar un gráfico de las estadísticas de cada una de las entidades enumeradas.",
+                            "name": "Gráfico de estadísticas"
+                        },
                         "thermostat": {
                             "description": "La tarjeta Termostato te da el control de tu entidad climática. Te permite cambiar la temperatura y el modo de la entidad.",
                             "name": "Termostato"
@@ -3598,13 +3634,19 @@
                         "tab_badges": "Insignias",
                         "tab_settings": "Configuración",
                         "tab_visibility": "Visibilidad",
+                        "type": "Tipo de vista",
+                        "types": {
+                            "masonry": "Mampostería (predeterminado)",
+                            "panel": "Panel (1 tarjeta)",
+                            "sidebar": "Barra lateral"
+                        },
                         "visibility": {
                             "select_users": "Selecciona qué usuarios deberían ver esta vista en la navegación"
                         }
                     },
                     "header": "Editar la interfaz de usuario",
                     "header-footer": {
-                        "choose_header_footer": "Elija un {type}",
+                        "choose_header_footer": "Elige un {type}",
                         "footer": "Pie de página",
                         "header": "Encabezado",
                         "types": {
@@ -3612,7 +3654,7 @@
                                 "name": "Botones"
                             },
                             "graph": {
-                                "name": "Grafico"
+                                "name": "Gráfico"
                             },
                             "picture": {
                                 "name": "Imagen"
@@ -3652,7 +3694,6 @@
                         "unsaved_changes": "Cambios no guardados"
                     },
                     "save_config": {
-                        "cancel": "Cancelar",
                         "close": "Cerrar",
                         "empty_config": "Empezar con un panel de control vacío",
                         "header": "Tomar el control de la interfaz de usuario Lovelace",
@@ -3681,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Esto muestra la primera tarjeta a ancho completo. Otras tarjetas en esta vista, así como las insignias, no se mostrarán.",
-                            "title": "¿Modo de panel?",
                             "warning_multiple_cards": "Esta vista contiene más de una tarjeta, pero una vista de panel solo puede mostrar 1 tarjeta."
                         }
                     }
@@ -3885,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Siguiente",
-                    "intro": "Comparte análisis de tu instancia. Estos datos estarán disponibles públicamente en {link}"
+                    "finish": "Siguiente"
                 },
                 "core-config": {
                     "button_detect": "Detectar",
@@ -3910,10 +3948,8 @@
                     "confirm_password": "Confirma la contraseña de la instantánea",
                     "description": "Alternativamente, puedes restaurar desde una copia de seguridad anterior.",
                     "folders": "Carpetas",
-                    "full_snapshot": "Instantánea completa",
                     "hide_log": "Ocultar registro completo",
                     "in_progress": "Restauración en curso",
-                    "partial_snapshot": "Instantánea parcial",
                     "password": "Contraseña de la instantánea",
                     "password_protection": "Protección con contraseña",
                     "select_type": "Selecciona qué restaurar",
@@ -3995,6 +4031,12 @@
                     "prompt_copy_token": "Copia tu token de acceso. No se mostrará de nuevo.",
                     "prompt_name": "Dale un nombre al token"
                 },
+                "mfa": {
+                    "confirm_disable": "¿Estás seguro de que deseas deshabilitar {name}?",
+                    "disable": "Deshabilitar",
+                    "enable": "Activar",
+                    "header": "Módulos de autenticación multifactor"
+                },
                 "mfa_setup": {
                     "close": "Cerrar",
                     "step_done": "Configuración realizada para {step}",
@@ -4002,14 +4044,8 @@
                     "title_aborted": "Abortado",
                     "title_success": "¡Éxito!"
                 },
-                "mfa": {
-                    "confirm_disable": "¿Estás seguro de que deseas deshabilitar {name}?",
-                    "disable": "Deshabilitar",
-                    "enable": "Activar",
-                    "header": "Módulos de autenticación multifactor"
-                },
                 "number_format": {
-                    "description": "Elije cómo se formatean los números.",
+                    "description": "Elige cómo se muestran los números.",
                     "dropdown_label": "Formato numérico",
                     "formats": {
                         "comma_decimal": "1,234,567.89",
@@ -4063,7 +4099,7 @@
                     "reset": "Reiniciar"
                 },
                 "time_format": {
-                    "description": "Elije cómo se formatean las horas.",
+                    "description": "Elige cómo se muestra la hora.",
                     "dropdown_label": "Formato de hora",
                     "formats": {
                         "12": "12 horas (AM/PM)",
diff --git a/translations/frontend/et.json b/translations/frontend/et.json
index a3e46f2926..b6762371fd 100644
--- a/translations/frontend/et.json
+++ b/translations/frontend/et.json
@@ -17,6 +17,7 @@
         "calendar": "Kalender",
         "config": "Seaded",
         "developer_tools": "Arendaja tööriistad",
+        "energy": "Energia",
         "history": "Ajalugu",
         "logbook": "Logi",
         "mailbox": "Postkast",
@@ -26,6 +27,14 @@
         "shopping_list": "Ostunimekiri",
         "states": "Ülevaade"
     },
+    "state": {
+        "default": {
+            "off": "Väljas",
+            "on": "Sees",
+            "unavailable": "Kadunud",
+            "unknown": "Teadmata"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Eemal"
         }
     },
-    "state": {
-        "default": {
-            "off": "Väljas",
-            "on": "Sees",
-            "unavailable": "Kadunud",
-            "unknown": "Teadmata"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Lisandmoodulit pole paigaldatud"
             }
         },
+        "backup": {
+            "addons": "Lisandmoodulid",
+            "confirm_password": "Varukoopia salasõna kinnitamine",
+            "could_not_create": "Varukoopia loomine nurjus",
+            "create": "Loo",
+            "create_blocked_not_running": "Varukoopia loomine pole praegu võimalik kuna süsteem on olekus {state}.",
+            "created": "Loodud",
+            "delete_backup_confirm": "kustuta",
+            "delete_selected": "Kustuta valitud varukoopiad",
+            "enter_password": "Sisesta salasõna.",
+            "failed_to_delete": "Kustutamine nurjus",
+            "folders": "Kaustad",
+            "name": "Varukoopia nimi",
+            "password": "Varukoopia salasõna",
+            "password_protection": "Salasõnaga kaitstud",
+            "passwords_not_matching": "Salasõnad ei ühti",
+            "select_type": "Vali mida taastada",
+            "selected": "{number} valitud",
+            "type": "Varukoopia tüüp"
+        },
         "common": {
             "cancel": "Loobu",
             "close": "Sulge",
@@ -366,9 +387,6 @@
                 "text": "Kas soovid lisandmooduli taaskäivitada rakendades muudatused?"
             },
             "update": {
-                "create_snapshot": "Enne {name} värskendamist loo varukoopia",
-                "snapshot": "Varukoopia",
-                "snapshotting": "Üksuse {name} varukoopia loomine",
                 "updating": "Üksuse {name} värskendamine versioonile {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Kasutajaliidese vaade",
-            "snapshots": "Hetke varukoopia",
             "store": "Lisandmoodulite hoidla",
             "system": "Süsteem"
         },
-        "snapshot": {
-            "addons": "Lisandmoodulid",
-            "available_snapshots": "Saadaolevad varukoopiad",
-            "confirm_password": "Varukoopia salasõna kinnitamine",
-            "could_not_create": "Varukoopia loomine nurjus",
-            "create": "Loo",
-            "create_blocked_not_running": "Varukoopia loomine pole praegu võimalik kuna süsteem on olekus {state}.",
-            "create_snapshot": "Loo varukoopia",
-            "created": "Loodud",
-            "delete_selected": "Kustuta valitud varukoopiad",
-            "delete_snapshot_confirm": "kustuta",
-            "delete_snapshot_text": "Kas kustutada {number} {number, plural,\n  one {varukoopia}\n  other {varukoopiat}\n}?",
-            "delete_snapshot_title": "Kustuta varukoopia",
-            "description": "Varukoopiad võimaldavad hõlpsalt varundada ja taastada kõik Home Assistanti andmed.",
-            "enter_password": "Sisesta salasõna.",
-            "failed_to_delete": "Kustutamine nurjus",
-            "folder": {
-                "addons/local": "Kohalikud lisandmoodulid",
-                "homeassistant": "Home Assistanti sätted",
-                "media": "Andmekandja",
-                "share": "Jaga",
-                "ssl": "SSL"
-            },
-            "folders": "Kaustad",
-            "full_snapshot": "Täielik varukoopia",
-            "name": "Varukoopia nimi",
-            "no_snapshots": "Sul pole veel ühtegi varukoopiat.",
-            "partial_snapshot": "Osaline varukoopia",
-            "password": "Varukoopia salasõna",
-            "password_protected": "salasõnaha kaitstud",
-            "password_protection": "Salasõnaga kaitstud",
-            "passwords_not_matching": "Salasõnad ei ühti",
-            "security": "Turvalisus",
-            "select_type": "Vali mida taastada",
-            "selected": "{number} valitud",
-            "type": "Varukoopia tüüp",
-            "upload_snapshot": "Varukoopia üleslaadimine"
-        },
         "store": {
             "missing_addons": "Ei näe lisandmooduleid? Luba täpsem režiim oma kasutajaprofiili lehel",
             "no_results_found": "Hoidlast {repository} ei leitud tulemeid.",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Lõpu kuupäev",
+                "ranges": {
+                    "last_week": "Eelmine nädal",
+                    "this_week": "See nädal",
+                    "today": "Täna",
+                    "yesterday": "Eile"
+                },
                 "select": "Vali",
                 "start_date": "Alguse kuupäev"
             },
@@ -851,10 +836,10 @@
                 "documentation": "dokumentatsioon",
                 "learn_adding_local_media": "Lisateavet meedia lisamise kohta leiate {documentation} .",
                 "local_media_files": "Asetage oma video-, heli- ja pildifailid meediumikataloogi, et saaksite neid sirvida ja taasesitada brauseris või toetatud meediumipleierites.",
+                "media-player-browser": "Meediumipleieri brauser",
                 "media_browsing_error": "Sisu otsimise viga",
                 "media_not_supported": "Brauseri meediumipleier ei toeta seda tüüpi sisu",
                 "media_player": "Meediamängija",
-                "media-player-browser": "Meediumipleieri brauser",
                 "no_items": "Sisu puudub",
                 "no_local_media_found": "Kohalikku meediat ei leitud",
                 "no_media_folder": "Paistab, et Te pole veel meediaikataloogi loonud.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Teenus"
             },
+            "statistic-picker": {
+                "learn_more": "Lisateave statistika kohta",
+                "missing_entity": "Miks minu üksus ei ole loetelus?",
+                "no_match": "Sobivat statistikat ei leitud",
+                "no_statistics": "Statistika puudub",
+                "statistic": "Statistika"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Statistika laadimine ...",
+                "no_statistics_found": "Statistikakirjeid ei leitud.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "keskmine",
+                    "min": "min",
+                    "sum": "summa"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Vali ala",
                 "add_device_id": "Vali seade",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Valikud"
                 },
+                "loading": {
+                    "loading_flow": "Oota kuni {integration} suvandeid lähtestatakse",
+                    "loading_step": "{integration} paigaldamise järgmist sammu laadimine"
+                },
                 "success": {
                     "description": "Valikud on edukalt salvestatud."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Üldine",
                         "customize": "Kohandamised",
                         "devices": "Seadmed",
+                        "energy": "Energia",
                         "entities": "Olemid",
                         "helpers": "Abimehed",
                         "info": "Info",
                         "integrations": "Sidumised",
                         "logs": "Logid",
                         "lovelace": "Lovelace vaated",
-                        "navigate_to": "Mine vaatesse {panel}",
                         "person": "Isikud",
                         "scene": "Stseenid",
                         "script": "Scriptid",
@@ -1360,7 +1366,6 @@
                             "introduction": "Tegevused on need, mida Home Assistant teeb kui päästik käivitab automatiseeringu.",
                             "learn_more": "Lisateave tegevuste kohta",
                             "name": "Tegevus",
-                            "type_select": "Tegevuse tüüp",
                             "type": {
                                 "choose": {
                                     "add_option": "Lisa valik",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Korda",
                                     "sequence": "Tegevused",
-                                    "type_select": "Korduse tüüp",
                                     "type": {
                                         "count": {
                                             "label": "Korda"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Kui tingimused",
                                             "label": "Kui"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Korduse tüüp"
                                 },
                                 "scene": {
                                     "label": "Aktiveeri stseen"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Ootamise mall"
                                 }
                             },
+                            "type_select": "Tegevuse tüüp",
                             "unsupported_action": "Kasutajaliides ei toeta tegevust: {action}"
                         },
                         "alias": "Nimi",
@@ -1452,7 +1458,6 @@
                             "introduction": "Tingimused on valikulised ja takistavad automatiseerimise käivitamist, välja arvatud juhul kui kõik tingimused on täidetud.",
                             "learn_more": "Lisateave tingimuste kohta",
                             "name": "Tingimus",
-                            "type_select": "Tingimuse tüüp",
                             "type": {
                                 "and": {
                                     "label": "ja"
@@ -1524,6 +1529,7 @@
                                     "zone": "Tsoon"
                                 }
                             },
+                            "type_select": "Tingimuse tüüp",
                             "unsupported_condition": "Kasutajaliides ei toeta tingimust: {condition}"
                         },
                         "copy_to_clipboard": "Kopeeri lõikelauale",
@@ -1565,7 +1571,6 @@
                             "introduction": "Päästikud on need, millest algab automatiseeringu töö. Ühe automatiseeringu jaoks on võimalik määrata mitu päästikut. Kui päästik vallandub, kontrollib Home Assistant võimalike tingimuste täidetust ja käivitab tegevuse.",
                             "learn_more": "Lisateave päästikute kohta",
                             "name": "Päästik",
-                            "type_select": "Päästiku tüüp",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1636,18 @@
                                     "label": "Mall",
                                     "value_template": "Väärtuse mall"
                                 },
-                                "time_pattern": {
-                                    "hours": "Tundi",
-                                    "label": "Aeg",
-                                    "minutes": "Minutit",
-                                    "seconds": "Sekundit"
-                                },
                                 "time": {
                                     "at": "Kellaaeg",
                                     "label": "Aeg",
                                     "type_input": "Kuupäeva / kellaaja abistaja väärtus",
                                     "type_value": "Kindel aeg"
                                 },
+                                "time_pattern": {
+                                    "hours": "Tundi",
+                                    "label": "Aeg",
+                                    "minutes": "Minutit",
+                                    "seconds": "Sekundit"
+                                },
                                 "webhook": {
                                     "label": "Veebihaak",
                                     "webhook_id": "Veebihaagi ID"
@@ -1656,6 +1661,7 @@
                                     "zone": "Tsoon"
                                 }
                             },
+                            "type_select": "Päästiku tüüp",
                             "unsupported_platform": "Kasutajaliides ei toeta: {platform}"
                         },
                         "unsaved_confirm": "Sul on salvestamata muudatusi. Oled kindel, et soovid lahkuda?"
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "Teie Home Assistanti aadressiks saab",
                             "link_learn_how_it_works": "Loe kuidas see töötab",
                             "not_connected": "Ühendus puudub",
+                            "reconnecting": "Taasühendan",
                             "remote_enabled": {
                                 "caption": "Ühendu automaatselt",
                                 "description": "Lubage see valik, et Home Assistantt oleks alati eemalt kättesaadav."
@@ -1818,9 +1825,9 @@
                             "loading": "Laadin ...",
                             "manage": "Halda",
                             "no_hooks_yet": "Paistab, et Teil pole veel loodud veebihaake. Alustamiseks konfigureerige ",
+                            "no_hooks_yet2": " või luues ",
                             "no_hooks_yet_link_automation": "veebihaagi automatiseering",
                             "no_hooks_yet_link_integration": "veebihaagipõhine sidumine",
-                            "no_hooks_yet2": " või luues ",
                             "title": "Veebihaagid"
                         }
                     },
@@ -1935,41 +1942,13 @@
                     "description": "Ühikud, asukoht, ajavöönd ja muud üldised parameetrid",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Enne selle lubamist külasta kindlasti olekuteabe dokumentatsiooni lehte {link} et aru saada, mida saadetakse ja kuidas see talletatakse.",
-                                "header": "Olekuteave",
-                                "instance_id": "Eksemplari ID: {huuid}",
-                                "introduction": "Jaga oma paigalduse teavet, et muuta Home Assistant paremaks ja aidata meil veenda tootjaid lisama kohalikku juhtimist ja privaatsusele keskendunud funktsioone.",
-                                "learn_more": "Uuri lisateavet andmete töötlemise kohta",
-                                "needs_base": "Selle suvandi kasutamiseks pead lubama põhilise olekuteabe",
-                                "preference": {
-                                    "base": {
-                                        "description": "Eksemplari ID, versioon ja paigalduse tüüp.",
-                                        "title": "Põhiline olekuteave"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Ootamatute vigade ilmnemisel jaga krahhiaruandeid.",
-                                        "title": "Diagnostika"
-                                    },
-                                    "statistics": {
-                                        "description": "Kasutatud olemid, kasutajad ja muud elemendid kokku.",
-                                        "title": "Kasutusstatistika"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nimed, versioonid ja võimalused.",
-                                        "title": "Kasutusel olevad sidumised ja lisandmoodulid"
-                                    },
-                                    "usage": {
-                                        "description": "Nimed ja teave versiooni kohta.",
-                                        "title": "Kasutusel olevad sidumised"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Rahaühik",
                                 "edit_requires_storage": "Redaktor on keelatud, kuna seaded asuvad configuration.yaml failis.",
                                 "elevation": "Kõrgus",
                                 "elevation_meters": "meetrit",
                                 "external_url": "Välispääsu URL",
+                                "find_currency_value": "Leia oma väärtus",
                                 "imperial_example": "Fahrenheit, naelad",
                                 "internal_url": "Kohaliku võrgu URL",
                                 "latitude": "Laius",
@@ -2098,6 +2077,63 @@
                     "update": "Uuenda",
                     "update_device_error": "Seadme värskendamine nurjus"
                 },
+                "energy": {
+                    "caption": "Energia",
+                    "description": "Jälgi oma energiatootmist ja -tarbimist",
+                    "device_consumption": {
+                        "add_stat": "Vali olem energia jälgimiseks",
+                        "dialog": {
+                            "selected_stat_intro": "Vali olem mis näitab seadme energiatarbimist."
+                        },
+                        "learn_more": "Lisateave alustamise kohta.",
+                        "selected_stat": "Energia jälgimine",
+                        "sub": "Üksikute seadmete energiakasutuse jälgimine võimaldab Home Assistantil jaotada energiakasutuse seadmete kaupa.",
+                        "title": "Üksikud seadmed"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Kasuta praeguse hinnaga olemit",
+                                "cost_entity_input": "Praeguse hinnaga olem",
+                                "cost_number": "Kasutage püsihinda",
+                                "cost_number_input": "Hind kWh kohta",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Saad valida kuidas Home Assistant peaks tarbitud energia kulusid jälgima.",
+                                "cost_stat": "Kogukulusid jälgiva olemi kasutamine",
+                                "cost_stat_input": "Olem mis jälgib kogukulusid",
+                                "energy_stat": "Tarbitud energia (kWh)",
+                                "header": "Võrgu tarbimise seadistamine",
+                                "no_cost": "Ära jälgi kulusid",
+                                "paragraph": "Võrgu tarbimine on energia, mis tuleb energiavõrgust teie koju."
+                            },
+                            "to": {
+                                "cost_entity": "Kasuta praeguse hinnaga olemit",
+                                "cost_entity_input": "Praeguse hinnaga olem",
+                                "cost_number": "Kasuta püsitariifi",
+                                "cost_number_input": "Hind kWh kohta",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Kas te saad raha tagasi kui tagastad energiat võrku?",
+                                "cost_stat": "Kogu saadud raha jälgiva olemi kasutamine",
+                                "cost_stat_input": "Olem mis jälgib saadud omatoodangut",
+                                "energy_stat": "Võrku tagastatud energia (kWh)",
+                                "header": "Võrgu tootmise seadistamine",
+                                "no_cost": "Ma ei saa raha tagasi.",
+                                "paragraph": "Võrgu tootmine on energia, mis  päikesepaneelid annavad võrku."
+                            }
+                        },
+                        "learn_more": "Lisateave alustamise kohta.",
+                        "sub": "Seadista võrgus tarbitava energia erinevad tariifid ja kui tagastad energiat võrku, siis energia, mille võrku tagasi annad. See võimaldab Home Assistantil jälgida tarbimiskoha energiakasutust.",
+                        "title": "Elektrivõrk"
+                    },
+                    "solar": {
+                        "learn_more": "Lisateave alustamise kohta.",
+                        "stat_predicted_production": "Päikeseenergia tootmise prognoos",
+                        "stat_production": "Päikeseenergia tootmine",
+                        "stat_return_to_grid": "Võrku tagastatud päikeseenergia (kWh)",
+                        "sub": "Luba Home Assistantil jälgida oma päikesepaneele ja anda ülevaade nende jõudlusest.",
+                        "title": "Päikesepaneelid"
+                    }
+                },
                 "entities": {
                     "caption": "Olemite register",
                     "description": "Ülevaade kõikidest teadaolevatest olemitest.",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Puhasta",
-                    "filtering_by": "Filtreeri",
-                    "show": "Kuva"
-                },
-                "hassio": {
-                    "button": "Seadista"
-                },
                 "header": "Home Assistant'i seadistamine",
                 "helpers": {
                     "caption": "Abimehed",
@@ -2205,16 +2233,11 @@
                     "server": "server",
                     "setup_time": "Käivitusaeg",
                     "source": "Allikas:",
-                    "system_health_error": "Süsteemi seisundi komponenti ei laadita. Lisage \"system_health:\" configuration.yaml",
                     "system_health": {
                         "manage": "Halda",
                         "more_info": "rohkem infot"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Sidumiste leht",
-                    "missing_zha": "Ei leia ZHA seadistamise paneeli? See teisaldati lehele {integrations_page} ZHA kirje juurde.",
-                    "missing_zwave": "Puudub Z-Wave seadistamise paneel? See teisaldati lehele {integrations_page} Z-Wave kirje juurde."
+                    },
+                    "system_health_error": "Süsteemi seisundi komponenti ei laadita. Lisage \"system_health:\" configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Lisa sidumine",
@@ -2229,8 +2252,6 @@
                         "depends_on_cloud": "Sõltub pilveteenusest",
                         "device_unavailable": "Seade pole saadaval",
                         "devices": "{count} {count, plural,\n  one {seade}\n  other {seadet}\n}",
-                        "disable_error": "Sidumise lubamine või keelamine nurjus",
-                        "disable_restart_confirm": "Taaskäivita Home Assistant, et lõpetada selle sidumise keelamine",
                         "disable": {
                             "disable_confirm": "Kas soovid selle seadistuskirje kindlasti keelata? Selle seadmed ja üksused keelatakse.",
                             "disabled": "Keelatud",
@@ -2241,6 +2262,8 @@
                             },
                             "disabled_cause": "Keelatud {cause} põhjusel"
                         },
+                        "disable_error": "Sidumise lubamine või keelamine nurjus",
+                        "disable_restart_confirm": "Taaskäivita Home Assistant, et lõpetada selle sidumise keelamine",
                         "disabled_polling": "Uuendatud andmete automaatne päring on välja lülitatud",
                         "documentation": "Vaata dokumentatsiooni",
                         "enable_restart_confirm": "Selle sidumise lubamise lõpetamiseks taaskäivita Home Assistant",
@@ -2248,11 +2271,9 @@
                         "entity_unavailable": "Olem pole saadaval",
                         "firmware": "Püsivara: {version}",
                         "hub": "Ühendatud",
-                        "logs": "Logid",
                         "manuf": "{manufacturer}",
                         "no_area": "Ala puudub",
                         "not_loaded": "Pole laaditud",
-                        "options": "Valikud",
                         "provided_by_custom_integration": "Saadaval välise sidumise kaudu",
                         "reload": "Taaslae",
                         "reload_confirm": "Sidumine on taaslaetud",
@@ -2284,7 +2305,11 @@
                             "open_site": "Ava veebisait"
                         },
                         "finish": "Lõpeta",
-                        "loading_first_time": "Palun oodake kuni sidumist paigaldatakse",
+                        "loading": {
+                            "fallback_title": "sidumine",
+                            "loading_flow": "Oota kuni {integration} on häälestatud",
+                            "loading_step": "{integration} paigaldamise järgmist sammu laadimine"
+                        },
                         "next": "Järgmine",
                         "not_all_required_fields": "Kõik nõutavad väljad pole täidetud.",
                         "not_loaded": "Sidumist ei õnnestunud laadida. Proovi taaskäivitada Home Assistant.",
@@ -2301,7 +2326,6 @@
                     "details": "Sidumise üksikasjad",
                     "disable": {
                         "disabled_integrations": "{number} keelatut",
-                        "hide_disabled": "Peida keelatud sidumised",
                         "show": "Kuva",
                         "show_disabled": "Kuva keelatud sidumised"
                     },
@@ -2312,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Kas lõpetada {name} eiramine?",
                         "confirm_ignore": "Olete Te kindel, et ei soovi seda integratsiooni seadistada? Selle saate tagasi võtta klõpsates paremas ülanurgas menüüs valikul „Kuva ignoreeritud sidumised”.",
                         "confirm_ignore_title": "Kas eirata {name} avastamist?",
-                        "hide_ignored": "Peida eiratud sidumised",
                         "ignore": "Eira",
                         "ignored": "Eiratud",
                         "show_ignored": "Näita eiratud sidumisi",
@@ -2432,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Seadista",
                     "description_listen": "Kuula teemat",
                     "description_publish": "Avaldage pakett",
                     "listening_to": "Kuulamas",
@@ -2446,7 +2468,6 @@
                     "topic": "teema"
                 },
                 "ozw": {
-                    "button": "Seadista",
                     "common": {
                         "controller": "Kontroller",
                         "instance": "Eksemplar",
@@ -2471,6 +2492,11 @@
                         "nodes": "Sõlmed",
                         "select_instance": "Valige eksemplar"
                     },
+                    "network": {
+                        "header": "Võrgu haldamine",
+                        "introduction": "Kogu võrku hõlmavate funktsioonide haldamine.",
+                        "node_count": "{count} sõlme"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Kõigi sõlmede kohta on päringuid tehtud",
@@ -2491,10 +2517,9 @@
                         "starting": "Alustan",
                         "unknown": "Teadmata"
                     },
-                    "network": {
-                        "header": "Võrgu haldamine",
-                        "introduction": "Kogu võrku hõlmavate funktsioonide haldamine.",
-                        "node_count": "{count} sõlme"
+                    "node": {
+                        "button": "Sõlme üksikasjad",
+                        "not_found": "Sõlme ei leitud"
                     },
                     "node_config": {
                         "header": "Sõlme seaded",
@@ -2524,10 +2549,6 @@
                         "versions": "Püsivara ja käsuklassi versioonide kohta teabe hankimine",
                         "wakeup": "Äratusjärjekordade ja sõnumite toe häälestamine"
                     },
-                    "node": {
-                        "button": "Sõlme üksikasjad",
-                        "not_found": "Sõlme ei leitud"
-                    },
                     "nodes_table": {
                         "failed": "Nurjus",
                         "id": "ID",
@@ -2711,7 +2732,7 @@
                             "input_number": "Arvsisestused",
                             "input_select": "Sisendi valikud",
                             "input_text": "Tekstisisestused",
-                            "introduction": "Mõned Home Assistant'i komponendid on taaslaetavad ilma taaskäivituseta. Taaslaadimise klõpsamisel tühistatakse nende praegused seaded ja laetakse uued.",
+                            "introduction": "Mõned Home Assistant'i komponendid on taaslaetavad ilma taaskäivituseta. Mõne alloleva valiku klõpsamisel tühistatakse nende praegused YAML seaded ja laetakse uued.",
                             "min_max": "Min/max olemid",
                             "mqtt": "Käsitsi konfigureeritud MQTT olemid",
                             "person": "Isikud",
@@ -2832,7 +2853,6 @@
                         "search_again": "Otsi uuesti",
                         "spinner": "ZHA Zigbee seadmete otsimine ..."
                     },
-                    "button": "Seadista",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Valitud klastri atribuudid",
                         "get_zigbee_attribute": "Hangi Zigbee atribuut",
@@ -2862,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Otseteed",
-                        "update_button": "Seadete värskendamine",
-                        "zha_options": {
-                            "default_light_transition": "Valguse vaikeülemineku aeg (sekundites)",
-                            "enable_identify_on_join": "Luba tuvastamise efekt kui seadmed liituvad võrguga",
-                            "title": "Üldised valikud"
-                        }
+                        "update_button": "Seadete värskendamine"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Seadistamine on lõpetatud",
@@ -2949,123 +2964,7 @@
                     "introduction": "Tsoonid võimaldavad määratleda teatud piirkondi maakeral. Kui isik asub tsoonis, saab olek selle tsooni nime. Tsoone saab kasutada ka päästikuna või tingimusena automatiseerimisseadetes.",
                     "no_zones_created_yet": "Paistab, et sa pole veel ühtegi tsooni loonud."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Tühista kaasamine",
-                        "controller_in_inclusion_mode": "Z-Wave kontroller on nüüd kaasamise režiimis.",
-                        "follow_device_instructions": "Sidumise käivitamiseks järgi seadmega kaasas olnud juhiseid.",
-                        "inclusion_failed": "Sõlme ei saanud lisada. Lisateabe saamiseks vaata logi.",
-                        "inclusion_finished": "Sõlm on lisatud.",
-                        "interview_failed": "Seadme küsitlemine nurjus. Lisateave võib olla kättesaadav logides.",
-                        "interview_started": "Seadet küsitletakse. See võib võtta aega.",
-                        "introduction": "See viisard juhendab sõlme lisamisel Z-Wave'i võrku.",
-                        "secure_inclusion_warning": "Turvalised seadmed vajavad täiendavat ribalaiust; liiga palju turvalisi seadmeid võib Z-Wave võrku aeglustada. Turvalist kaasamist soovitame kasutada ainult seadmete jaoks mis seda vajavad, näiteks lukud või garaažiukse avajad.",
-                        "start_inclusion": "Alusta kaasamist",
-                        "start_secure_inclusion": "Käivita turvaline kaasamine",
-                        "title": "Lisa Z-Wave sõlm",
-                        "use_secure_inclusion": "Kasuta turvalist kaasamist",
-                        "view_device": "Kuva seade"
-                    },
-                    "button": "Seadista",
-                    "common": {
-                        "add_node": "Lisa sõlm",
-                        "close": "Sulge",
-                        "heal_network": "Paranda võrgustikku",
-                        "home_id": "Kodu ID",
-                        "network": "Võrk",
-                        "node_id": "Sõlme ID",
-                        "reconfigure_server": "Taasseadista server",
-                        "remove_node": "Eemalda sõlm"
-                    },
-                    "dashboard": {
-                        "driver_version": "Ajuri versioon",
-                        "dump_dead_nodes_text": "Mõni sõlm ei vastanud ja eeldatakse, et see on surnud. Neid ei ekspordita täielikult.",
-                        "dump_dead_nodes_title": "Mõned sõlmed on surnud",
-                        "dump_debug": "Probleemide diagnoosimiseks lae alla oma võrgutõmmis",
-                        "dump_not_ready_confirm": "Lae alla",
-                        "dump_not_ready_text": "Kui lood ekspordi kui kõik sõlmed pole veel valmis, võid vajaminevad andmed vahele jätta. Anna oma võrgule aega kõigi sõlmede päringuteks. Kas soovid elspordiga jätkata?",
-                        "dump_not_ready_title": "Kõik sõlmed pole veel valmis",
-                        "header": "Halda oma Z-Wave'i võrku",
-                        "home_id": "Kodu ID",
-                        "introduction": "Halda oma Z-Wave'i võrgustikku ja Z-Wave'i sõlmi",
-                        "nodes_ready": "Valmisolevad sõlmed",
-                        "server_version": "Serveri versioon"
-                    },
-                    "device_info": {
-                        "device_config": "Seadme häälestamine",
-                        "node_ready": "Sõlm on aktiivne",
-                        "node_status": "Sõlme olek",
-                        "zwave_info": "Z-Wave teave"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Võrgu parandamine on tühistatud.",
-                        "healing_complete": "Võrgu parandamine on lõpule viidud.",
-                        "healing_failed": "Parandamine nurjus. Lisateave võib olla saadaval logides.",
-                        "in_progress": "Võrgu parandamine on pooleli. See võtab aega.",
-                        "introduction": "Alusta oma Z-Wave võrgu parandamist. Võrgu parandamine põhjustab kõigi seadmete marsruudi kontrollerisse tagasi arvutamise ja on soovitatav, kui oled hiljuti seadmeid või oma kontrollerit teisaldanud.",
-                        "run_in_background": "Saad selle dialoogi sulgeda ja võrgu parandamine jätkub taustal.",
-                        "start_heal": "Alusta parandamist",
-                        "stop_heal": "Peata parandamine",
-                        "title": "Paranda oma Z-Wave võrku",
-                        "traffic_warning": "Parandamissprotsess tekitab Z-Wave võrgus palju liiklust. See võib põhjustada seadmete aeglast reageerimise (või üldse mitte) kuni parandamine on pooleli."
-                    },
-                    "logs": {
-                        "log_level": "Logimise tase",
-                        "log_level_changed": "Silumisteave on muudetud: {level}",
-                        "subscribed_to_logs": "Z-Wave JS Logi sõnumite tellimine...",
-                        "title": "Z-Wave JS logid"
-                    },
-                    "navigation": {
-                        "logs": "Logid",
-                        "network": "Võrk"
-                    },
-                    "network_status": {
-                        "connected": "Ühendatud",
-                        "connecting": "Ühendun",
-                        "unknown": "Tundmatu"
-                    },
-                    "node_config": {
-                        "attribution": "Seadme parameetrid ja kirjeldused on esitatud {device_database}",
-                        "battery_device_notice": "Patareitoitel seadmed peavad olema ärkvel, et värskendada oma sätteid. Seadme äratamiseks vaata oma seadme kasutusjuhendit.",
-                        "error_device_not_found": "Seadet ei leitud",
-                        "header": "Z-Wave seadme häälestamine",
-                        "introduction": "Valitud seadme (sõlme) spetsiifiliste seadistuste haldamine ja muutmine",
-                        "parameter_is_read_only": "See parameeter on kirjutuskaitstud.",
-                        "set_param_accepted": "Parameeter on uuendatud.",
-                        "set_param_error": "Ilmnes tõrge.",
-                        "set_param_queued": "Parameetri uuendamine on ootel ja seda värskendatakse seadme ärkamisel.",
-                        "zwave_js_device_database": "Z-Wave JS seadmete andmebaas"
-                    },
-                    "node_status": {
-                        "alive": "Aktiivne",
-                        "asleep": "Ootel",
-                        "awake": "Ärkvel",
-                        "dead": "Kadunud",
-                        "unknown": "Teadmata"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Patareitoitel seadmed peavad olema ärkvel, et neid küsitleda. Seadme äratamiseks vaata oma seadme kasutusjuhendit.",
-                        "in_progress": "Seadet küsitletakse. See võib võtta aega.",
-                        "interview_complete": "Seadme küsitlemine on lõpetatud.",
-                        "interview_failed": "Seadme küsitlemine nurjus. Lisateave võib olla kättesaadav logides.",
-                        "introduction": "Küsitle uuesti seadet  Z-Wave-võrgus. Kasuta seda funktsiooni kui seadmel on puuduv või vale funktsionaalsus.",
-                        "run_in_background": "Saad selle dialoogi sulgeda ja küsitlus jätkub taustal.",
-                        "start_reinterview": "Alusta küsitlust uuesti",
-                        "title": "Z-Wave seadme taasküsitlemine"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Tühista välistamine",
-                        "controller_in_exclusion_mode": "Z-Wave kontroller on nüüd välistamisrežiimis.",
-                        "exclusion_failed": "Sõlme ei saanud eemaldada. Lisateabe saamiseks vaata logi.",
-                        "exclusion_finished": "Sõlm {id} on Z-Wave'i võrgust eemaldatud.",
-                        "follow_device_instructions": "Seadme välistamise käivitamiseks järgi seadmega kaasas olnud juhiseid.",
-                        "introduction": "Eemalda sõlm Z-Wave'i võrgust ja seotud seade ning olemid Home Assistantist.",
-                        "start_exclusion": "Alusta välistamist",
-                        "title": "Eemalda Z-Wave sõlm"
-                    }
-                },
                 "zwave": {
-                    "button": "Seadista",
                     "common": {
                         "index": "Indeks",
                         "instance": "Eksemplar",
@@ -3154,6 +3053,144 @@
                     "values": {
                         "header": "Sõlme väärtused"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Tühista kaasamine",
+                        "controller_in_inclusion_mode": "Z-Wave kontroller on nüüd kaasamise režiimis.",
+                        "follow_device_instructions": "Sidumise käivitamiseks järgi seadmega kaasas olnud juhiseid.",
+                        "inclusion_failed": "Sõlme ei saanud lisada. Lisateabe saamiseks vaata logi.",
+                        "inclusion_finished": "Sõlm on lisatud.",
+                        "interview_failed": "Seadme küsitlemine nurjus. Lisateave võib olla kättesaadav logides.",
+                        "interview_started": "Seadet küsitletakse. See võib võtta aega.",
+                        "introduction": "See viisard juhendab sõlme lisamisel Z-Wave'i võrku.",
+                        "secure_inclusion_warning": "Turvalised seadmed vajavad täiendavat ribalaiust; liiga palju turvalisi seadmeid võib Z-Wave võrku aeglustada. Turvalist kaasamist soovitame kasutada ainult seadmete jaoks mis seda vajavad, näiteks lukud või garaažiukse avajad.",
+                        "start_inclusion": "Alusta kaasamist",
+                        "start_secure_inclusion": "Käivita turvaline kaasamine",
+                        "title": "Lisa Z-Wave sõlm",
+                        "use_secure_inclusion": "Kasuta turvalist kaasamist",
+                        "view_device": "Kuva seade"
+                    },
+                    "common": {
+                        "add_node": "Lisa sõlm",
+                        "close": "Sulge",
+                        "heal_network": "Paranda võrgustikku",
+                        "home_id": "Kodu ID",
+                        "network": "Võrk",
+                        "node_id": "Sõlme ID",
+                        "reconfigure_server": "Taasseadista server",
+                        "remove_node": "Eemalda sõlm",
+                        "source": "Allikas"
+                    },
+                    "dashboard": {
+                        "driver_version": "Ajuri versioon",
+                        "dump_dead_nodes_text": "Mõni sõlm ei vastanud ja eeldatakse, et see on surnud. Neid ei ekspordita täielikult.",
+                        "dump_dead_nodes_title": "Mõned sõlmed on surnud",
+                        "dump_debug": "Probleemide diagnoosimiseks lae alla oma võrgutõmmis",
+                        "dump_not_ready_confirm": "Lae alla",
+                        "dump_not_ready_text": "Kui lood ekspordi kui kõik sõlmed pole veel valmis, võid vajaminevad andmed vahele jätta. Anna oma võrgule aega kõigi sõlmede päringuteks. Kas soovid elspordiga jätkata?",
+                        "dump_not_ready_title": "Kõik sõlmed pole veel valmis",
+                        "header": "Halda oma Z-Wave'i võrku",
+                        "home_id": "Kodu ID",
+                        "introduction": "Halda oma Z-Wave'i võrgustikku ja Z-Wave'i sõlmi",
+                        "nodes_ready": "Valmisolevad sõlmed",
+                        "server_version": "Serveri versioon"
+                    },
+                    "device_info": {
+                        "device_config": "Seadme häälestamine",
+                        "heal_node": "Paranda sõlme",
+                        "node_ready": "Sõlm on aktiivne",
+                        "node_status": "Sõlme olek",
+                        "reinterview_device": "Seadme taasküsitlemine",
+                        "remove_failed": "Eemalda vigane seade",
+                        "zwave_info": "Z-Wave teave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Võrgu parandamine on tühistatud.",
+                        "healing_complete": "Võrgu parandamine on lõpule viidud.",
+                        "healing_failed": "Parandamine nurjus. Lisateave võib olla saadaval logides.",
+                        "in_progress": "Võrgu parandamine on pooleli. See võtab aega.",
+                        "introduction": "Alusta oma Z-Wave võrgu parandamist. Võrgu parandamine põhjustab kõigi seadmete marsruudi kontrollerisse tagasi arvutamise ja on soovitatav, kui oled hiljuti seadmeid või oma kontrollerit teisaldanud.",
+                        "run_in_background": "Saad selle dialoogi sulgeda ja võrgu parandamine jätkub taustal.",
+                        "start_heal": "Alusta parandamist",
+                        "stop_heal": "Peata parandamine",
+                        "title": "Paranda oma Z-Wave võrku",
+                        "traffic_warning": "Parandamissprotsess tekitab Z-Wave võrgus palju liiklust. See võib põhjustada seadmete aeglast reageerimise (või üldse mitte) kuni parandamine on pooleli."
+                    },
+                    "heal_node": {
+                        "healing_complete": "Seade {device} on parandatud.",
+                        "healing_failed": "Seadme {device} parandamine nurjus.",
+                        "healing_failed_check_logs": "Lisateavet võib saada logidest.",
+                        "in_progress": "Seadme {device} paranemine on käimas.",
+                        "introduction": "Ütle {seadmele}, et ta uuendaks oma marsruute tagasi kontrollerile. See võib aidata ühendusprobleemide korral  kui oled hiljuti seadet või kontrollerit ümber paigutanud.",
+                        "network_heal_in_progress": "Z-Wave võrgu parandamine on juba käimas. Enne üksiku seadme parandamist oota kuni see lõpeb.",
+                        "start_heal": "Paranda seadet",
+                        "title": "Paranda Z-Wave seadet",
+                        "traffic_warning": "Parandamissprotsess tekitab Z-Wave võrgus palju liiklust. See võib põhjustada seadmete aeglast reageerimise (või üldse mitte) kuni parandamine on pooleli."
+                    },
+                    "logs": {
+                        "log_level": "Logimise tase",
+                        "log_level_changed": "Silumisteave on muudetud: {level}",
+                        "subscribed_to_logs": "Z-Wave JS Logi sõnumite tellimine...",
+                        "title": "Z-Wave JS logid"
+                    },
+                    "navigation": {
+                        "logs": "Logid",
+                        "network": "Võrk"
+                    },
+                    "network_status": {
+                        "connected": "Ühendatud",
+                        "connecting": "Ühendun",
+                        "unknown": "Tundmatu"
+                    },
+                    "node_config": {
+                        "attribution": "Seadme parameetrid ja kirjeldused on esitatud {device_database}",
+                        "battery_device_notice": "Patareitoitel seadmed peavad olema ärkvel, et värskendada oma sätteid. Seadme äratamiseks vaata oma seadme kasutusjuhendit.",
+                        "error_device_not_found": "Seadet ei leitud",
+                        "header": "Z-Wave seadme häälestamine",
+                        "introduction": "Valitud seadme (sõlme) spetsiifiliste seadistuste haldamine ja muutmine",
+                        "parameter": "Parameeter",
+                        "parameter_is_read_only": "See parameeter on kirjutuskaitstud.",
+                        "set_param_accepted": "Parameeter on uuendatud.",
+                        "set_param_error": "Ilmnes tõrge.",
+                        "set_param_queued": "Parameetri uuendamine on ootel ja seda värskendatakse seadme ärkamisel.",
+                        "zwave_js_device_database": "Z-Wave JS seadmete andmebaas"
+                    },
+                    "node_status": {
+                        "alive": "Aktiivne",
+                        "asleep": "Ootel",
+                        "awake": "Ärkvel",
+                        "dead": "Kadunud",
+                        "unknown": "Teadmata"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Patareitoitel seadmed peavad olema ärkvel, et neid küsitleda. Seadme äratamiseks vaata oma seadme kasutusjuhendit.",
+                        "in_progress": "Seadet küsitletakse. See võib võtta aega.",
+                        "interview_complete": "Seadme küsitlemine on lõpetatud.",
+                        "interview_failed": "Seadme küsitlemine nurjus. Lisateave võib olla kättesaadav logides.",
+                        "introduction": "Küsitle uuesti seadet  Z-Wave-võrgus. Kasuta seda funktsiooni kui seadmel on puuduv või vale funktsionaalsus.",
+                        "run_in_background": "Saad selle dialoogi sulgeda ja küsitlus jätkub taustal.",
+                        "start_reinterview": "Alusta küsitlust uuesti",
+                        "title": "Z-Wave seadme taasküsitlemine"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Seadme eemaldamine on käimas.",
+                        "introduction": "Eemalda vigane seade Z-Wave'i võrgust. Kasuta seda kui ei saa seadet tavapäraselt välistada kuna see on katki.",
+                        "removal_failed": "Seadet ei saanud Z-Wave'i võrgust eemaldada.",
+                        "removal_finished": "Sõlm {id} on Z-Wave'i võrgust eemaldatud.",
+                        "remove_device": "Eemalda seade",
+                        "title": "Vigase Z-wave-seadme eemaldamine"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Tühista välistamine",
+                        "controller_in_exclusion_mode": "Z-Wave kontroller on nüüd välistamisrežiimis.",
+                        "exclusion_failed": "Sõlme ei saanud eemaldada. Lisateabe saamiseks vaata logi.",
+                        "exclusion_finished": "Sõlm {id} on Z-Wave'i võrgust eemaldatud.",
+                        "follow_device_instructions": "Seadme välistamise käivitamiseks järgi seadmega kaasas olnud juhiseid.",
+                        "introduction": "Eemalda sõlm Z-Wave'i võrgust ja seotud seade ning olemid Home Assistantist.",
+                        "start_exclusion": "Alusta välistamist",
+                        "title": "Eemalda Z-Wave sõlm"
+                    }
                 }
             },
             "custom": {
@@ -3236,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Mine tagasi",
-                "supervisor": {
-                    "ask": "Küsi abi",
-                    "observer": "Kontrolli Observerit",
-                    "reboot": "Proovi host taaskäivitada",
-                    "system_health": "Kontrolli süsteemi seisundit",
-                    "title": "Supervisori paneeli laadimine nurjus!",
-                    "wait": "Kui just alustasid siis veendu, et oled andnud superviisorile piisavalt aega käivitumiseks."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Eelmine nädal",
-                    "this_week": "See nädal",
-                    "today": "Täna",
-                    "yesterday": "Eile"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Eelmine nädal",
-                    "this_week": "See nädal",
-                    "today": "Täna",
-                    "yesterday": "Eile"
+            "energy": {
+                "charts": {
+                    "by_device": "Tarbimine seadmete kaupa",
+                    "solar": "Päikeseenergia",
+                    "stat_house_energy_meter": "Energia tarbimine kokku"
+                },
+                "setup": {
+                    "back": "Tagasi",
+                    "done": "Kuva energiabilansi vaade!",
+                    "next": "Järgmine"
                 }
             },
             "lovelace": {
@@ -3374,7 +3396,6 @@
                         "entities": {
                             "description": "Olemite kaart  on kõige levinum kaarditüüp. See rühmitab olemid loenditeks.",
                             "edit_special_row": "Selle rea üksikasjade vaatamiseks klõpsa nuppu Muuda",
-                            "entity_row_editor": "Olemirea redaktor",
                             "entity_row": {
                                 "attribute": "Atribuut",
                                 "button": "Nupp",
@@ -3386,6 +3407,7 @@
                                 "section": "Sektsioon",
                                 "weblink": "Veebilink"
                             },
+                            "entity_row_editor": "Olemirea redaktor",
                             "name": "Olemid",
                             "secondary_info_values": {
                                 "brightness": "Heledus",
@@ -3412,6 +3434,7 @@
                         "gauge": {
                             "description": "Mõõturikaart on lihtne kaart, mis võimaldab visuaalselt näha andurite andmeid.",
                             "name": "Mõõtur",
+                            "needle_gauge": "Kas kuvada osutina?",
                             "severity": {
                                 "define": "Kas määrata raskusaste?",
                                 "green": "Roheline",
@@ -3424,6 +3447,7 @@
                             "attribute": "Atribuut",
                             "camera_image": "Kaamera olem",
                             "camera_view": "Kaamera vaade",
+                            "days_to_show": "Kuvatavate päevade arv",
                             "double_tap_action": "Topeltklõps",
                             "entities": "Olemid",
                             "entity": "Olem",
@@ -3537,6 +3561,10 @@
                             "integration_not_loaded": "See kaart nõuab eelnevalt tehtud \"shopping_list\"sidumist.",
                             "name": "Ostunimekiri"
                         },
+                        "statistics-graph": {
+                            "description": "Kaart Statistika graafik võimaldab kuvada iga loetletud üksuse statistika graafikut.",
+                            "name": "Statistika graafik"
+                        },
                         "thermostat": {
                             "description": "Termostaadikaart võimaldab kontrollida teie kliimaolemeid. Võimaldab teil muuta olemi temperatuuri ja režiimi.",
                             "name": "Termostaat"
@@ -3606,6 +3634,12 @@
                         "tab_badges": "Märgid",
                         "tab_settings": "Seaded",
                         "tab_visibility": "Nähtavus",
+                        "type": "Kuva tüüp",
+                        "types": {
+                            "masonry": "Müürileht (vaikimisi)",
+                            "panel": "Paneel (1 kaart)",
+                            "sidebar": "Külgriba"
+                        },
                         "visibility": {
                             "select_users": "Valige, millised kasutajad näevad seda vaadet navigeerimisel"
                         }
@@ -3660,7 +3694,6 @@
                         "unsaved_changes": "Salvestamata muudatused"
                     },
                     "save_config": {
-                        "cancel": "Ära pane tähele",
                         "close": "Sulge",
                         "empty_config": "Alustage tühja kasutajaliidesega",
                         "header": "Võta Lovelace kasutajaliides oma kontrolli alla",
@@ -3689,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Esimene kaart kuvatakse täislaiuses, teisi selle vaate kaarte ja märke ei kuvata",
-                            "title": "Üksiku kaardi režiim?",
                             "warning_multiple_cards": "See vaade koosneb rohkem kui ühest kaardist, aga paneeli vaade saab näidata ainult ühte kaarti"
                         }
                     }
@@ -3893,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Järgmine",
-                    "intro": "Jaga oma Home Assistanti oleku teavet. Need andmed on avalikult saadaval aadressil {link}"
+                    "finish": "Järgmine"
                 },
                 "core-config": {
                     "button_detect": "Tuvasta",
@@ -3915,18 +3945,16 @@
                 "next": "Järgmine",
                 "restore": {
                     "addons": "Lisandmoodulid",
-                    "confirm_password": "Kinnita salasõna",
+                    "confirm_password": "Varukoopia salasõna kinnitamine",
                     "description": "Teise võimalusena saad taastada eelmise varukoopia.",
                     "folders": "Kaustad",
-                    "full_snapshot": "Täielik varukoopia",
                     "hide_log": "Peida täielik logi",
                     "in_progress": "Toimub taastamine",
-                    "partial_snapshot": "Osaline varukoopia",
-                    "password": "Salasõna",
+                    "password": "Varukoopia salasõna",
                     "password_protection": "Salasõnaga kaitstud",
-                    "select_type": "Vali andmestiku tüüp",
+                    "select_type": "Vali mida taastada",
                     "show_log": "Kuva täielik logi",
-                    "type": "Andmestiku tüüp"
+                    "type": "Varukoopia tüüp"
                 },
                 "user": {
                     "create_account": "Loo konto",
@@ -4003,6 +4031,12 @@
                     "prompt_copy_token": "Kopeeri oma juurdepääsutõend. Seda ei näidata rohkem.",
                     "prompt_name": "Pane pikaajalisele juurdepääsutõendile nimi"
                 },
+                "mfa": {
+                    "confirm_disable": "Oled kindel, et soovid keelata kasutaja {name}?",
+                    "disable": "Keela",
+                    "enable": "Luba",
+                    "header": "Mitmeastmelise autentimise moodulid"
+                },
                 "mfa_setup": {
                     "close": "Sulge",
                     "step_done": "{step} seadistatud",
@@ -4010,12 +4044,6 @@
                     "title_aborted": "Katkestatud",
                     "title_success": "Korras!"
                 },
-                "mfa": {
-                    "confirm_disable": "Oled kindel, et soovid keelata kasutaja {name}?",
-                    "disable": "Keela",
-                    "enable": "Luba",
-                    "header": "Mitmeastmelise autentimise moodulid"
-                },
                 "number_format": {
                     "description": "Vali arvude vormindamise.",
                     "dropdown_label": "Numbrivorming",
diff --git a/translations/frontend/eu.json b/translations/frontend/eu.json
index b27939ca23..8f5d64a600 100644
--- a/translations/frontend/eu.json
+++ b/translations/frontend/eu.json
@@ -16,6 +16,12 @@
         "shopping_list": "Erosketa zerrenda",
         "states": "Laburpena"
     },
+    "state": {
+        "default": {
+            "unavailable": "Ez dago erabilgarri",
+            "unknown": "Ezezaguna"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -39,12 +45,6 @@
             "not_home": "Kanpoan"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "Ez dago erabilgarri",
-            "unknown": "Ezezaguna"
-        }
-    },
     "ui": {
         "auth_store": {
             "ask": "Saio hau gorde nahi duzu?",
@@ -210,7 +210,6 @@
                             "duplicate": "Bikoiztu",
                             "header": "Ekintzak",
                             "learn_more": "Ekintzei buruz gehiago ikasi",
-                            "type_select": "Ekintza mota",
                             "type": {
                                 "condition": {
                                     "label": "Baldintza"
@@ -227,6 +226,7 @@
                                     "wait_template": "Itxaron txantiloia"
                                 }
                             },
+                            "type_select": "Ekintza mota",
                             "unsupported_action": "Ekintza ez onartua: {action}"
                         },
                         "alias": "Izena",
@@ -236,7 +236,6 @@
                             "duplicate": "Bikoiztu",
                             "header": "Baldintzak",
                             "learn_more": "Baldintzei buruz gehiago ikasi",
-                            "type_select": "Baldintza mota",
                             "type": {
                                 "state": {
                                     "label": "Egoera",
@@ -257,7 +256,8 @@
                                         "mon": "Astelehena"
                                     }
                                 }
-                            }
+                            },
+                            "type_select": "Baldintza mota"
                         },
                         "default_name": "Automatizazio berria",
                         "load_error_not_editable": "Soilik automations.yaml fitxategian dauden automatizazioak dira editagarriak.",
@@ -269,7 +269,6 @@
                             "duplicate": "Bikoiztu",
                             "header": "Abiarazleak",
                             "learn_more": "Abiarazleei buruz gehiago ikasi",
-                            "type_select": "Abiarazle mota",
                             "type": {
                                 "event": {
                                     "event_type": "Gertaera mota",
@@ -309,16 +308,16 @@
                                     "label": "Txantiloia",
                                     "value_template": "Balio txantiloia"
                                 },
+                                "time": {
+                                    "at": "Noiz",
+                                    "label": "Ordua"
+                                },
                                 "time_pattern": {
                                     "hours": "Orduak",
                                     "label": "Denbora Eredua",
                                     "minutes": "Minutuak",
                                     "seconds": "Segunduak"
                                 },
-                                "time": {
-                                    "at": "Noiz",
-                                    "label": "Ordua"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook IDa"
@@ -327,7 +326,8 @@
                                     "enter": "Sartu",
                                     "leave": "Utzi"
                                 }
-                            }
+                            },
+                            "type_select": "Abiarazle mota"
                         }
                     },
                     "picker": {
@@ -492,7 +492,6 @@
                         "unsaved_changes": "Gorde gabeko aldaketak"
                     },
                     "save_config": {
-                        "cancel": "Berdin dio",
                         "header": "Hartu zure Lovelace UI-aren kontrola",
                         "save": "Kontrola hartu"
                     }
@@ -621,15 +620,15 @@
                     "prompt_copy_token": "Zure sarbide tokena kopiatu. Ez da berriro erakutsiko.",
                     "prompt_name": "Izena?"
                 },
+                "mfa": {
+                    "confirm_disable": "{name} desgaitu nahi duzula ziur zaude?",
+                    "enable": "Gaitu"
+                },
                 "mfa_setup": {
                     "close": "Itxi",
                     "submit": "Bidali",
                     "title_success": "Arrakasta!"
                 },
-                "mfa": {
-                    "confirm_disable": "{name} desgaitu nahi duzula ziur zaude?",
-                    "enable": "Gaitu"
-                },
                 "push_notifications": {
                     "error_load_platform": "notify.html5 konfiguratu.",
                     "header": "Push jakinarazpenak",
diff --git a/translations/frontend/fa.json b/translations/frontend/fa.json
index b2e67f6c47..c273b8d805 100644
--- a/translations/frontend/fa.json
+++ b/translations/frontend/fa.json
@@ -25,6 +25,14 @@
         "shopping_list": "لیست خرید",
         "states": "نمای کلی"
     },
+    "state": {
+        "default": {
+            "off": "خاموش",
+            "on": "روشن",
+            "unavailable": "غیرقابل دسترس",
+            "unknown": "نامشخص"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -92,14 +100,6 @@
             "not_home": "بیرون"
         }
     },
-    "state": {
-        "default": {
-            "off": "خاموش",
-            "on": "روشن",
-            "unavailable": "غیرقابل دسترس",
-            "unknown": "نامشخص"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -321,6 +321,14 @@
             "data-table": {
                 "search": "جستجو"
             },
+            "date-range-picker": {
+                "ranges": {
+                    "last_week": "هفته گذشته",
+                    "this_week": "این هفته",
+                    "today": "امروز",
+                    "yesterday": "دیروز"
+                }
+            },
             "device-picker": {
                 "no_devices": "شما هیچ دستگاهی ندارید",
                 "no_match": "هیچ دستگاه منطبقی یافت نشد"
@@ -362,6 +370,9 @@
             "service-picker": {
                 "service": "سرویس"
             },
+            "statistic-picker": {
+                "learn_more": "درباره داده ها بیشتر بدانید"
+            },
             "target-picker": {
                 "add_area_id": "ناحیه را انتخاب کنید",
                 "add_device_id": "دستگاه را انتخاب کنید",
@@ -580,7 +591,6 @@
                             "header": "اقدامات",
                             "introduction": "این اقدامات همان چیزی است که Home Assistantانجام می دهد وقتی که اتوماسیون راه اندازی می شود.",
                             "learn_more": "درباره عملگردها بیشتر بدانید",
-                            "type_select": "نوع عمل",
                             "type": {
                                 "choose": {
                                     "label": "انتخاب کنید"
@@ -615,6 +625,7 @@
                                     "wait_template": "منتظر قالب"
                                 }
                             },
+                            "type_select": "نوع عمل",
                             "unsupported_action": "بدون پشتیبانی رابط کاربری برای عمل: {action}"
                         },
                         "alias": "نام",
@@ -626,7 +637,6 @@
                             "header": "شرایط",
                             "introduction": "شرایط اختیاری است و از اجرای بیشتر جلوگیری می کند مگر اینکه همه شرایط برآورده شود.",
                             "learn_more": "درباره شرایط بیشتر بدانید",
-                            "type_select": "نوع وضعیت",
                             "type": {
                                 "and": {
                                     "label": "و"
@@ -682,6 +692,7 @@
                                     "zone": "منطقه"
                                 }
                             },
+                            "type_select": "نوع وضعیت",
                             "unsupported_condition": "بدون پشتیبانی رابط کاربری برای این شزایط: {condition}"
                         },
                         "default_name": "اضافه کردن اتوماسیون",
@@ -701,7 +712,6 @@
                             "header": "راه اندازها",
                             "introduction": "راه حلی است که پردازش یک قانون اتوماسیون را آغاز می کند. ممکن است چند عامل برای یک قاعده مشخص شود. هنگامی که یک ماشه شروع می شود، Home Assistant شرایط را تایید می کند، اگر وجود داشته باشد، و اقدام را فراخوانی می کند.",
                             "learn_more": "درباره راه اندازها بیشتر بیاموزید",
-                            "type_select": "نوع راه انداز",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -760,16 +770,16 @@
                                     "label": "قالب",
                                     "value_template": "مقدار قالب"
                                 },
+                                "time": {
+                                    "at": "در زمان",
+                                    "label": "زمان"
+                                },
                                 "time_pattern": {
                                     "hours": "ساعت ها",
                                     "label": "الگو زمان",
                                     "minutes": "دقیقه ها",
                                     "seconds": "ثانیه ها"
                                 },
-                                "time": {
-                                    "at": "در زمان",
-                                    "label": "زمان"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "شناسه Webhook"
@@ -783,6 +793,7 @@
                                     "zone": "منطقه"
                                 }
                             },
+                            "type_select": "نوع راه انداز",
                             "unsupported_platform": "بدون پشتیبانی رابط کاربری برای پلت فرم:  {platform}"
                         },
                         "unsaved_confirm": "شما تغییرات ذخیره نشده ای دارید. آیا مطمئنی که می خواهی خارج بشی؟"
@@ -929,14 +940,13 @@
                     "description": "سیستم واحد ، مکان ، منطقه زمانی و سایر پارامترهای کلی",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "learn_more": "درباره نحوه پردازش داده های خود بیشتر بیاموزید."
-                            },
                             "core_config": {
+                                "currency": "واحد پول",
                                 "edit_requires_storage": "ویرایشگر غیرفعال شده است چون پیکربندی ذخیره شده در configuration.yaml.",
                                 "elevation": "ارتفاع",
                                 "elevation_meters": "متر",
                                 "external_url": "URL خارجی",
+                                "find_currency_value": "ارزش خود را بیابید",
                                 "imperial_example": "فارنهایت، پوند",
                                 "internal_url": "URL داخلی",
                                 "latitude": "طول و عرض جغرافیایی",
@@ -1043,6 +1053,11 @@
                     "unnamed_device": "Dispozitiv nedenumit",
                     "update": "Actualizeaza"
                 },
+                "energy": {
+                    "device_consumption": {
+                        "selected_stat": "ردیابی انرژی برای"
+                    }
+                },
                 "entities": {
                     "caption": "نهاد ها",
                     "description": "مدیریت نهادهای شناخته شده",
@@ -1068,13 +1083,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "پاک کردن",
-                    "filtering_by": "فیلتر کردن با"
-                },
-                "hassio": {
-                    "button": "پیکربندی"
-                },
                 "header": "پیکربندی HOME ASSistant",
                 "helpers": {
                     "caption": "Ajutoare",
@@ -1122,7 +1130,6 @@
                         "hub": "اتصال از طریق",
                         "manuf": "توسط {manufacturer}",
                         "no_area": "بدون منطقه",
-                        "options": "گزینه ها",
                         "rename": "تغییر نام",
                         "restart_confirm": "برای حذف کامل این یکپارچگی home assistant را دوباره راهاندازی کنید.",
                         "system_options": "گزینه های سیستم"
@@ -1136,7 +1143,6 @@
                             "open_site": "باز کردن سایت"
                         },
                         "finish": "Termina",
-                        "loading_first_time": "لطفاً منتظر بمانید تا ادغام نصب شود",
                         "not_all_required_fields": "Nu toate campurile necesare sunt completate",
                         "submit": "Trimite"
                     },
@@ -1145,7 +1151,6 @@
                     "description": "مدیریت یکپارچه سازی با خدمات، دستگاه ها، ...",
                     "discovered": "کشف شده",
                     "ignore": {
-                        "hide_ignored": "Ascunde integrarile ignorate",
                         "ignore": "Ignora",
                         "ignored": "Ignorat",
                         "show_ignored": "Afiseaza integrarile ignorate"
@@ -1243,7 +1248,6 @@
                     "title": "MQTT"
                 },
                 "ozw": {
-                    "button": "پیکربندی",
                     "common": {
                         "controller": "کنترل کننده",
                         "network": "شبکه"
@@ -1452,7 +1456,6 @@
                     "no_zones_created_yet": "Se pare ca inca nu ai creat nicio zona"
                 },
                 "zwave": {
-                    "button": "پیکربندی",
                     "common": {
                         "index": "Index",
                         "instance": "نمونه، مثال",
@@ -1494,6 +1497,16 @@
                         "stop_network": "توقف شبکه",
                         "test_network": "Testare Retea"
                     }
+                },
+                "zwave_js": {
+                    "heal_node": {
+                        "start_heal": "تعمیر دستگاه",
+                        "title": " یک دستگاه  Z-Wave را تعمیر کنید"
+                    },
+                    "remove_failed_node": {
+                        "remove_device": "حذف دستگاه",
+                        "title": "یک دستگاه Z-Wave خراب را حذف کنید"
+                    }
                 }
             },
             "developer-tools": {
@@ -1529,19 +1542,10 @@
                     }
                 }
             },
-            "history": {
-                "ranges": {
-                    "this_week": "این هفته",
-                    "today": "امروز",
-                    "yesterday": "دیروز"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "هفته گذشته",
-                    "this_week": "این هفته",
-                    "today": "امروز",
-                    "yesterday": "دیروز"
+            "energy": {
+                "setup": {
+                    "back": "بازگشت",
+                    "next": "بعدی"
                 }
             },
             "lovelace": {
@@ -1726,6 +1730,10 @@
                         "edit": "ویرایش نما",
                         "header": "مشاهده پیکربندی",
                         "tab_visibility": "رویت پذیری",
+                        "type": "نوع مشاهده",
+                        "types": {
+                            "sidebar": "نوار کناری"
+                        },
                         "visibility": {
                             "select_users": "انتخاب کنید کدام کاربران باید این نمای را در پیمایش ببینند"
                         }
@@ -1757,7 +1765,6 @@
                         "unsaved_changes": "تغییرات ذخیره نشده"
                     },
                     "save_config": {
-                        "cancel": "بیخیال",
                         "close": "ببند",
                         "empty_config": "شروع با یک داشبورد خالی",
                         "header": "کنترل رابط کاربری Lovelace خود را در دست بگیرید",
@@ -2035,6 +2042,12 @@
                     "prompt_copy_token": "رمز دسترسی خود را کپی کنید. دوباره نمایش داده نمی شود.",
                     "prompt_name": "به توکن یک اسم بگذارید"
                 },
+                "mfa": {
+                    "confirm_disable": "آیا مطمئن هستید که میخواهید {name} را غیرفعال کنید؟",
+                    "disable": "غیر فعال کردن",
+                    "enable": "فعال کردن",
+                    "header": "ماژول های احراز هویت چند عاملی"
+                },
                 "mfa_setup": {
                     "close": "بستن",
                     "step_done": "راه اندازی موفق برای {step}",
@@ -2042,12 +2055,6 @@
                     "title_aborted": "لغو شد",
                     "title_success": "موفقیت!"
                 },
-                "mfa": {
-                    "confirm_disable": "آیا مطمئن هستید که میخواهید {name} را غیرفعال کنید؟",
-                    "disable": "غیر فعال کردن",
-                    "enable": "فعال کردن",
-                    "header": "ماژول های احراز هویت چند عاملی"
-                },
                 "push_notifications": {
                     "add_device_prompt": {
                         "input_label": "نام دستگاه"
diff --git a/translations/frontend/fi.json b/translations/frontend/fi.json
index 250dd5ded7..d147ba4ccd 100644
--- a/translations/frontend/fi.json
+++ b/translations/frontend/fi.json
@@ -17,6 +17,7 @@
         "calendar": "Kalenteri",
         "config": "Asetukset",
         "developer_tools": "Kehittäjän työkalut",
+        "energy": "Energia",
         "history": "Historia",
         "logbook": "Lokikirja",
         "mailbox": "Postilaatikko",
@@ -26,6 +27,14 @@
         "shopping_list": "Ostoslista",
         "states": "Yleisnäkymä"
     },
+    "state": {
+        "default": {
+            "off": "Pois",
+            "on": "Päällä",
+            "unavailable": "Ei saatavissa",
+            "unknown": "Tuntematon"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Poissa"
         }
     },
-    "state": {
-        "default": {
-            "off": "Pois",
-            "on": "Päällä",
-            "unavailable": "Ei saatavissa",
-            "unknown": "Tuntematon"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -122,17 +123,21 @@
                     "edit_in_ui": "Muokkaa käyttöliittymässä",
                     "edit_in_yaml": "Muokkaa YAML-tiedostona",
                     "header": "Asetukset",
-                    "invalid_yaml": "Virheellinen YAML"
+                    "invalid_yaml": "Virheellinen YAML",
+                    "show_unused_optional": "Näytä käyttämättömät valinnaiset asetukset"
                 }
             },
             "dashboard": {
                 "action_error": {
+                    "get_changelog": "Lisäosan muutoslokin hakeminen epäonnistui",
+                    "go_to_config": "Lisäosaa ei voitu käynnistää - asetusten tarkistus epäonnistui!",
                     "install": "Lisäosan asennus epäonnistui",
                     "restart": "Lisäosan uudelleenkäynnistys epäonnistui",
                     "start": "Lisäosan käynnistäminen epäonnistui",
                     "start_invalid_config": "Siirry asetuksiin",
                     "stop": "Lisäosan pysäyttäminen epäonnistui",
-                    "uninstall": "Lisäosan poistaminen epäonnistui"
+                    "uninstall": "Lisäosan poistaminen epäonnistui",
+                    "validate_config": "Lisäosan asetusten tarkistus epäonnistui"
                 },
                 "capability": {
                     "apparmor": {
@@ -256,6 +261,26 @@
                 "not_installed": "Lisäosaa ei ole asennettu"
             }
         },
+        "backup": {
+            "addons": "Lisäosat",
+            "confirm_password": "Vahvista tilannekuvan salasana",
+            "could_not_create": "Tilannekuvaa ei voitu luoda",
+            "create": "Luo",
+            "create_blocked_not_running": "Tilannekuvaa ei voi luoda tällä hetkellä, koska järjestelmä on tilassa {state}.",
+            "created": "Luotu ",
+            "delete_backup_confirm": "poista",
+            "delete_selected": "Poista valitut tilannekuvat",
+            "enter_password": "Syötä salasana.",
+            "failed_to_delete": "Poistaminen epäonnistui",
+            "folders": "Kansiot",
+            "name": "Nimi",
+            "password": "Salasana",
+            "password_protection": "Salasanasuojaus",
+            "passwords_not_matching": "Salasanat eivät täsmää",
+            "select_type": "Valitse palautettavat tiedot",
+            "selected": "{numero} valittu",
+            "type": "Tyyppi"
+        },
         "common": {
             "cancel": "Peru",
             "close": "Sulje",
@@ -269,6 +294,7 @@
             "newest_version": "Uusin versio",
             "no": "Ei",
             "refresh": "Päivitä",
+            "release_notes": "Julkaisutiedot",
             "reload": "Lataa uudelleen",
             "reset_defaults": "Palauta oletukset",
             "reset_options": "Nollaa asetukset",
@@ -288,9 +314,11 @@
                 "title": "Nollaa asetukset"
             },
             "restart": {
+                "text": "Haluatko varmasti käynnistää {name} uudelleen?",
                 "title": "Käynnistä {name} uudelleen"
             },
             "update": {
+                "text": "Haluatko varmasti päivittää {name} versioon {version}?",
                 "title": "Päivitä {name}"
             }
         },
@@ -298,10 +326,18 @@
             "addon_new_version": "Uusi versio saatavilla",
             "addon_running": "Lisäosa on käynnissä",
             "addon_stopped": "Lisäosa on pysäytetty",
-            "addons": "Lisäosat",
+            "addons": "Asennetut lisäosat",
             "no_addons": "Et ole vielä asentanut lisäosia. Aloita siirtymällä lisäosakauppaan!"
         },
         "dialog": {
+            "hardware": {
+                "attributes": "Ominaisuudet",
+                "device_path": "Laitteen polku",
+                "id": "ID",
+                "search": "Etsi laitteita",
+                "subsystem": "Alijärjestelmä",
+                "title": "Laitteisto"
+            },
             "network": {
                 "connected_to": "Yhdistetty kohteeseen {ssid}",
                 "dhcp": "DHCP",
@@ -342,47 +378,22 @@
                 "text": "Haluatko käynnistää lisäosan uudelleen muutostesi kanssa?"
             },
             "update": {
-                "create_snapshot": "Luo tilannevedos kohteesta {name} ennen päivittämistä",
-                "snapshot": "Tilannevedos",
-                "snapshotting": "Luo tilannevedos kohteesta {name}",
                 "updating": "Päivitetään {name} versioon {version}"
             }
         },
         "my": {
-            "error_addon_not_found": "Lisäosaa ei löydy"
+            "error": "Tapahtui tuntematon virhe",
+            "error_addon_not_found": "Lisäosaa ei löydy",
+            "error_addon_not_installed": "Pyydettyä lisäosaa ei ole asennettu. Asenna se ensin",
+            "error_addon_not_started": "Pyydetty lisäosa ei ole käynnissä. Käynnistä se ensin"
         },
         "panel": {
             "dashboard": "Kojelauta",
-            "snapshots": "Tilannekuvat",
             "store": "Lisäosakauppa",
             "system": "Järjestelmä"
         },
-        "snapshot": {
-            "addons": "Lisäosat",
-            "available_snapshots": "Saatavilla olevat tilannekuvat",
-            "create": "Luo",
-            "create_snapshot": "Luo tilannevedos",
-            "created": "Luotu ",
-            "enter_password": "Syötä salasana.",
-            "folder": {
-                "addons/local": "Paikalliset lisäosat",
-                "homeassistant": "Home Assistantin asetukset",
-                "media": "Media",
-                "share": "Jaetut tiedostot",
-                "ssl": "SSL"
-            },
-            "folders": "Kansiot",
-            "full_snapshot": "Täysi tilannevedos",
-            "name": "Nimi",
-            "partial_snapshot": "Osittainen tilannevedos",
-            "password": "Salasana",
-            "password_protected": "salasanasuojattu",
-            "password_protection": "Salasanasuojaus",
-            "security": "Suojaus",
-            "type": "Tyyppi",
-            "upload_snapshot": "Lähetä tilannevedos"
-        },
         "store": {
+            "missing_addons": "Puuttuuko lisäosia? Ota edistynyt tila käyttöön käyttäjäprofiilisivullasi",
             "no_results_found": "Ei tuloksia kohteesta {repository}.",
             "registries": "Rekisterit",
             "repositories": "Tietovarastot"
@@ -399,6 +410,7 @@
                 "confirm_shutdown": "Haluatko varmasti sammuttaa isännän?",
                 "deployment": "Käyttöönotto",
                 "docker_version": "Docker-versio",
+                "emmc_lifetime_used": "eMMC:n käyttöiästä käytetty",
                 "failed_to_get_hardware_list": "Laitteistoluettelon luominen epäonnistui",
                 "failed_to_import_from_usb": "Tuonti USB:stä epäonnistui",
                 "failed_to_reboot": "Isännän uudelleenkäynnistys epäonnistui",
@@ -439,12 +451,18 @@
                 "share_diagnostics_description": "Jaa kaatumisraportit ja diagnostiikkatiedot.",
                 "share_diagonstics_description": "Haluatko jakaa kaatumisraportit ja diagnostiikkatiedot automaattisesti, kun Supervisor havaitsee odottamattomia virheitä? {line_break} Tämän avulla voimme korjata ongelmat. Tiedot ovat vain Home Assistant Core -tiimin käytettävissä, eikä niitä jaeta muille. {line_break} Tiedot eivät sisällä yksityisiä tai arkaluontoisia tietoja, ja voit poistaa tämän käytöstä asetuksissa milloin tahansa.",
                 "share_diagonstics_title": "Auta parantamaan Home Assistanttia",
+                "unhealthy_description": "Virheellisen asennuksen käyttö aiheuttaa ongelmia. Alla on lista asennuksestasi havaituista ongelmista; klikkaa linkkejä saadaksesi tietoa ongelmien ratkaisemisesta.",
                 "unhealthy_reason": {
                     "docker": "Docker-ympäristö ei toimi oikein",
-                    "supervisor": "Supervisorin päivitys epäonnistui"
+                    "privileged": "Supervisorilla ei ole laajoja käyttöoikeuksia",
+                    "setup": "Supervisorin asennus epäonnistui",
+                    "supervisor": "Supervisorin päivitys epäonnistui",
+                    "untrusted": "Epäluotettavaa sisältöä havaittu"
                 },
+                "unhealthy_title": "Asennuksessasi on ongelmia",
                 "unsupported_description": "Alla on lista asennuksestasi löydetyistä ongelmista. Klikkaa linkkejä saadaksesi ohjeita ongelmien ratkaisemiseen.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor ei ole käytössä isännässä",
                     "container": "Tunnetusti ongelmia aiheuttavat kontit",
                     "dbus": "DBUS",
                     "docker_configuration": "Docker-asetukset",
@@ -452,6 +470,7 @@
                     "lxc": "LXC",
                     "network_manager": "Network Manager",
                     "os": "Käyttöjärjestelmä",
+                    "privileged": "Supervisorilla ei ole laajoja käyttöoikeuksia",
                     "systemd": "Systemd"
                 },
                 "unsupported_title": "Käytät asennusta, jota ei tueta",
@@ -529,9 +548,11 @@
             },
             "light": {
                 "brightness": "Kirkkaus",
+                "cold_white_value": "Kylmän valkoisen kirkkaus",
                 "color_brightness": "Värikirkkaus",
                 "color_temperature": "Värilämpötila",
                 "effect": "Efekti",
+                "warm_white_value": "Lämpimän valkoisen kirkkaus",
                 "white_value": "Valkoisuusarvo"
             },
             "lock": {
@@ -630,6 +651,7 @@
             "close": "Sulje",
             "continue": "Jatka",
             "copied": "Kopioitu",
+            "copied_clipboard": "Kopioitu leikepöydälle",
             "delete": "Poista",
             "disable": "Poista käytöstä",
             "enable": "Ota käyttöön",
@@ -655,7 +677,17 @@
         },
         "components": {
             "addon-picker": {
-                "addon": "Lisäosa"
+                "addon": "Lisäosa",
+                "error": {
+                    "fetch_addons": {
+                        "description": "Lisäosien haku palautti virheen.",
+                        "title": "Virhe haettaessa lisäosia"
+                    },
+                    "no_supervisor": {
+                        "description": "Supervisoria ei löytynyt, joten lisäosia ei voitu ladata.",
+                        "title": "Ei Supervisoria"
+                    }
+                }
             },
             "area-picker": {
                 "add_dialog": {
@@ -672,6 +704,9 @@
                 "no_match": "Vastaavia alueita ei löytynyt",
                 "show_areas": "Näytä alueet"
             },
+            "attributes": {
+                "expansion_header": "Määritteet"
+            },
             "blueprint-picker": {
                 "add_user": "Lisää käyttäjä",
                 "remove_user": "Poista käyttäjä",
@@ -690,6 +725,12 @@
             },
             "date-range-picker": {
                 "end_date": "Päättymispäivä",
+                "ranges": {
+                    "last_week": "Viime viikolla",
+                    "this_week": "Tällä viikolla",
+                    "today": "Tänään",
+                    "yesterday": "Eilen"
+                },
                 "select": "Valitse",
                 "start_date": "Aloituspäivä"
             },
@@ -715,12 +756,13 @@
                 }
             },
             "history_charts": {
+                "history_disabled": "Historiaintegraatio poistettu käytöstä",
                 "loading_history": "Ladataan tilahistoriaa...",
                 "no_history_found": "Tilahistoriaa ei löydetty"
             },
             "logbook": {
-                "by": "mukaan",
-                "by_service": "palvelun mukaan",
+                "by": "lähteestä",
+                "by_service": "palvelusta",
                 "entries_not_found": "Lokikirjauksia ei löytynyt.",
                 "messages": {
                     "became_unavailable": "ei ollut käytettävissä",
@@ -749,6 +791,7 @@
                     "was_unplugged": "kytkettin irti",
                     "was_unsafe": "oli vaarallinen"
                 },
+                "retrieval_error": "Virhe lokikirjamerkintää haettaessa",
                 "show_trace": "Näytä jäljitys"
             },
             "media-browser": {
@@ -779,10 +822,10 @@
                 "documentation": "dokumentaatiosta",
                 "learn_adding_local_media": "Lue lisätietoja median lisäämisestä {documentation} .",
                 "local_media_files": "Sijoita video-, ääni- ja kuvatiedostot mediahakemistoon, jotta voit selata ja toistaa niitä selaimessa tai tuetuissa mediasoittimissa.",
+                "media-player-browser": "Media Player -selain",
                 "media_browsing_error": "Median selausvirhe",
                 "media_not_supported": "Browser Media Player ei tue tämän tyyppistä mediaa",
                 "media_player": "Mediatoistin",
-                "media-player-browser": "Media Player -selain",
                 "no_items": "Ei kohteita",
                 "no_local_media_found": "Paikallista mediaa ei löytynyt",
                 "no_media_folder": "Vaikuttaa siltä, että et ole vielä luonut mediahakemistoa.",
@@ -801,8 +844,10 @@
             "related-filter-menu": {
                 "filter_by_area": "Suodata alueen mukaan",
                 "filter_by_device": "Suodata laitteen mukaan",
+                "filter_by_entity": "Suodata kohteen mukaan",
                 "filtered_by_area": "alue: {area_name}",
-                "filtered_by_device": "laite: {device_name}"
+                "filtered_by_device": "laite: {device_name}",
+                "filtered_by_entity": "kohde: {entity_name}"
             },
             "related-items": {
                 "area": "Alue",
@@ -840,9 +885,26 @@
                     "week": "{count} {count, plural,\n  one {viikkoa}\n  other {viikkoa}\n} sitten"
                 }
             },
+            "service-control": {
+                "integration_doc": "Integraation dokumentaatio",
+                "required": "Tämä kenttä vaaditaan"
+            },
             "service-picker": {
                 "service": "Palvelu"
             },
+            "statistic-picker": {
+                "learn_more": "Lisätietoja tilastoista"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Ladataan tilastoja...",
+                "no_statistics_found": "Tilastoja ei löytynyt.",
+                "statistic_types": {
+                    "max": "maks",
+                    "mean": "keskiarvo",
+                    "min": "min",
+                    "sum": "summa"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Valitse alue",
                 "add_device_id": "Valitse laite",
@@ -861,6 +923,9 @@
             "config_entry_system_options": {
                 "enable_new_entities_description": "Jos tämä ei ole käytössä, {integration}-sovelluksen äskettäin löydettyjä entiteettejä ei lisätä automaattisesti Home Assistantiin.",
                 "enable_new_entities_label": "Ota vasta lisätyt kohteet käyttöön.",
+                "enable_polling_description": "Jos Home Assistantin pitä kysellä automaattisesti \n{integration}:n entiteettien päivityksistä",
+                "enable_polling_label": "Ota päivitysten kysely käyttöön.",
+                "restart_home_assistant": "Sinun on käynnistettävä Home Assistant uudelleen, jotta muutokset tulevat voimaan.",
                 "title": "Järjestelmäasetukset kohteelle {integration}",
                 "update": "Päivitä"
             },
@@ -944,7 +1009,7 @@
                     "pattern": "Regex-malli käyttäjäpuolen validointia varten.",
                     "text": "Teksti"
                 },
-                "platform_not_loaded": "Integrointia {platform} ei ole ladattu. Voit ladata sen lisäämällä \"default_config:\" tai ''{platform}:'' konfiguraatiotiedostoon.",
+                "platform_not_loaded": "Integraatiota {platform} ei ole ladattu. Voit ladata sen lisäämällä \"default_config:\" tai ''{platform}:'' konfiguraatiotiedostoon.",
                 "required_error_msg": "Tämä kenttä on pakollinen",
                 "timer": {
                     "duration": "Kesto"
@@ -1028,16 +1093,16 @@
                         "core": "Yleinen",
                         "customize": "Kustomointi",
                         "devices": "Laitteet",
+                        "energy": "Energia",
                         "entities": "Kohteet",
                         "helpers": "Auttajat",
                         "info": "Tiedot",
                         "integrations": "Integraatiot",
                         "logs": "Lokit",
                         "lovelace": "Lovelace-kojelaudat",
-                        "navigate_to": "Siirry kohteeseen {panel}",
                         "person": "Henkilöt",
                         "scene": "Tilanteet",
-                        "script": "Skripti",
+                        "script": "Skriptit",
                         "server_control": "Palvelimen hallinta",
                         "tag": "Tunnisteet",
                         "users": "Käyttäjät",
@@ -1045,23 +1110,39 @@
                     },
                     "reload": {
                         "automation": "Automaatiot",
-                        "filesize": "Lataa tiedostokokokohteet uudelleen",
-                        "homekit": "Lataa HomeKit uudelleen",
-                        "input_boolean": "Lataa booleanit uudelleen",
-                        "input_datetime": "Lataa syöttöpäivämäärät uudelleen",
-                        "input_number": "Lataa syöttönumerot uudelleen",
-                        "mqtt": "Lataa mqtt-entiteetit uudelleen",
-                        "person": "Lataa henkilöt uudelleen",
-                        "rpi_gpio": "Lataa Raspberry Pi GPIO -entiteetit uudelleen",
-                        "scene": "Lataa tilanteet uudelleen",
-                        "script": "Lataa skriptit uudelleen",
-                        "smtp": "Lataa smtp-ilmoituspalvelut uudelleen",
-                        "telegram": "Päivitä Telegram-ilmoituspalvelut",
-                        "template": "Malli entiteetit",
-                        "zone": "Lataa alueet uudelleen"
+                        "command_line": "Komentorivientiteetit",
+                        "core": "Sijainti & muokkaukset",
+                        "filesize": "Tiedostokokokohteet",
+                        "filter": "Suodatinentiteetit",
+                        "generic": "Yleiset IP-kameraentiteetit",
+                        "generic_thermostat": "Yleiset termostaattientiteetit",
+                        "group": "Ryhmät, ryhmäentiteetit ja ilmoituspalvelut",
+                        "history_stats": "Historiatilastoentiteetit",
+                        "homekit": "HomeKit",
+                        "input_boolean": "Boolean-syötteet",
+                        "input_datetime": "Päivämääräsyötteet",
+                        "input_number": "Numerosyötteet",
+                        "input_select": "Valintalaatikkosyötteet",
+                        "input_text": "Tekstisyötteet",
+                        "min_max": "Min/max-entiteetit",
+                        "mqtt": "Manuaalisesti määritetyt MQTT-entiteetit",
+                        "person": "Henkilöt",
+                        "ping": "Binääriset ping-sensorientiteetit",
+                        "reload": "{domain}",
+                        "rest": "REST-entiteetit ja ilmoituspalvelut",
+                        "rpi_gpio": "Raspberry Pi GPIO -entiteetit",
+                        "scene": "Tilanteet",
+                        "script": "Skriptit",
+                        "smtp": "SMTP-ilmoituspalvelut",
+                        "statistics": "Tilastoentiteetit",
+                        "telegram": "Telegram-ilmoituspalvelut",
+                        "template": "Mallientiteetit",
+                        "trend": "Trendientiteetit",
+                        "universal": "Yleiset mediasoitinentiteetit",
+                        "zone": "Alueet"
                     },
                     "server_control": {
-                        "perform_action": "{action} Palvelin",
+                        "perform_action": "{action} palvelin",
                         "restart": "Käynnistä uudelleen",
                         "stop": "Pysäytä"
                     },
@@ -1111,11 +1192,18 @@
             },
             "zha_reconfigure_device": {
                 "attribute": "Määrite",
+                "battery_device_warning": "Sinun on herätettävä paristokäyttöiset laitteet ennen uudelleenkonfigurointiprosessin aloittamista. Katso laitteen ohjekirjasta ohjeet laitteen herättämiseen.",
                 "button_hide": "Piilota yksityiskohdat",
                 "button_show": "Näytä yksityiskohdat",
                 "cluster_header": "Klusteri",
+                "configuration_complete": "Laitteen uudelleenmääritys on valmis.",
+                "configuration_failed": "Laitteen uudelleenmääritys epäonnistui. Lisätietoja voi olla lokeissa.",
                 "configuring_alt": "Määrittää",
-                "reporting_header": "Raportoi"
+                "in_progress": "Laitetta määriteltään uudelleen. Tämä voi viedä aikaa.",
+                "min_max_change": "min/max/muutos",
+                "reporting_header": "Raportoi",
+                "run_in_background": "Voit sulkea tämän valintaikkunan, ja uudelleenmääritys jatkuu taustalla.",
+                "start_reconfiguration": "Aloita uudelleenmääritys"
             }
         },
         "duration": {
@@ -1127,6 +1215,9 @@
         },
         "errors": {
             "config": {
+                "edit_in_yaml_supported": "Voit silti muokata asetuksiasi YAML:ssä.",
+                "editor_not_available": "Visuaalista editoria ei ole saataville tyypille \"{type}\".",
+                "editor_not_supported": "Visuaalista editoria ei tueta näille asetuksille",
                 "no_template_editor_support": "Visuaalinen editori ei tue malleja",
                 "no_type_provided": "Tyyppiä ei ole annettu."
             },
@@ -1221,7 +1312,6 @@
                             "introduction": "Home Assistant suorittaa toiminnot, kun automaatio laukaistaan.",
                             "learn_more": "Lisätietoja toiminnoista",
                             "name": "Toiminta",
-                            "type_select": "Toiminnon tyyppi",
                             "type": {
                                 "choose": {
                                     "add_option": "Lisää vaihtoehto",
@@ -1242,10 +1332,12 @@
                                 "device_id": {
                                     "action": "Toiminta",
                                     "extra_fields": {
+                                        "brightness_pct": "Kirkkaus",
                                         "code": "Koodi",
                                         "humidity": "Kosteus",
                                         "message": "Viesti",
                                         "mode": "Tila",
+                                        "position": "Sijainti",
                                         "title": "Otsikko",
                                         "value": "Arvo"
                                     },
@@ -1259,7 +1351,6 @@
                                 "repeat": {
                                     "label": "Toista",
                                     "sequence": "Toiminnot",
-                                    "type_select": "Toistotyyppi",
                                     "type": {
                                         "count": {
                                             "label": "Laske"
@@ -1272,7 +1363,8 @@
                                             "conditions": "Sillä aikaa, kun ehdot",
                                             "label": "Sillä aikaa"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Toistotyyppi"
                                 },
                                 "scene": {
                                     "label": "Aktivoi tilanne"
@@ -1292,6 +1384,7 @@
                                     "wait_template": "Odotusmalli (template)"
                                 }
                             },
+                            "type_select": "Toiminnon tyyppi",
                             "unsupported_action": "Toimintoa {action} ei tueta"
                         },
                         "alias": "Nimi",
@@ -1310,7 +1403,6 @@
                             "introduction": "Ehdot ovat vapaaehtoinen osa automaatiosääntöä. Niillä voidaan estää toimintoa tapahtumasta, vaikka se olisi laukaistu. Ehdot näyttävät hyvin samanlaisilta kuin laukaisimet, mutta ne ovat eri asia. Laukaisimen tehtävä on tarkkailla järjestelmän tapahtumia. Ehto kuitenkin katsoo systeemin tilaa vain ja ainoastaan yhdellä hetkellä. Laukaisin voi esimerkiksi huomata, jos jokin vipu käännetään päälle. Ehto voi nähdä vain onko vipu päällä vai pois päältä.",
                             "learn_more": "Lisätietoja ehdoista",
                             "name": "Ehto",
-                            "type_select": "Ehdon tyyppi",
                             "type": {
                                 "and": {
                                     "label": "Ja"
@@ -1371,12 +1463,18 @@
                                         "wed": "Keskiviikko"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Laukaisimen ID",
+                                    "label": "Laukaisin",
+                                    "no_triggers": "Ei laukaisimia saatavilla"
+                                },
                                 "zone": {
                                     "entity": "Kokonaisuus, jolla on sijainti",
                                     "label": "Alue",
                                     "zone": "Alue"
                                 }
                             },
+                            "type_select": "Ehdon tyyppi",
                             "unsupported_condition": "Ehtoa ei tueta: {condition}"
                         },
                         "copy_to_clipboard": "Kopioi leikepöydälle",
@@ -1396,33 +1494,35 @@
                             "queued": "Jonon pituus"
                         },
                         "modes": {
-                            "description": "Tila määrittää, mitä tapahtuu, kun automaatio käynnistyy, kun toiminnot ovat edelleen käynnissä edellisestä käynnistyksestä. Lisätietoja osoitteessa {documentation_link}.",
-                            "documentation": "automaation dokumentaatio",
+                            "description": "Tila määrittää, mitä tapahtuu, kun automaatio käynnistyy uudelleen edellisen käynnistyskerran toimintojen ollessa vielä käynnissä. Lisätietoja {documentation_link}.",
+                            "documentation": "automaatioiden ohjeissa",
                             "label": "Tila",
                             "parallel": "Rinnakkain",
-                            "queued": "Jonossa",
-                            "restart": "Käynnistä uudelleen",
-                            "single": "Yksittäinen (oletus)"
+                            "queued": "Peräkkäin",
+                            "restart": "Aloita alusta",
+                            "single": "Yksi kerrallaan (oletus)"
                         },
                         "move_down": "Siirrä alaspäin",
                         "move_up": "Siirrä ylöspäin",
                         "save": "Tallenna",
+                        "show_trace": "Näytä jäljitys",
                         "triggers": {
                             "add": "Laukaisuehto",
                             "delete": "Poista",
                             "delete_confirm": "Haluatko varmasti poistaa tämän?",
                             "duplicate": "Kopioi",
                             "header": "Laukaisuehdot",
+                            "id": "Laukaisimen ID (käytetään laukaisin-ehdossa)",
                             "introduction": "Laukaisuehdot määrittelevät, milloin automaatiota aletaan suorittaa. Samassa säännössä voi olla useita laukaisuehtoja. Kun laukaisuehto täyttyy, Home Assistant varmistaa ehdot. Jos ehdot täyttyvät, toiminto suoritetaan.",
                             "learn_more": "Lisätietoja triggereistä",
                             "name": "Käynnistysehto",
-                            "type_select": "Laukaisimen tyyppi",
                             "type": {
                                 "device": {
                                     "extra_fields": {
                                         "above": "Yli",
                                         "below": "Alle",
-                                        "for": "Kesto"
+                                        "for": "Kesto",
+                                        "zone": "Alue"
                                     },
                                     "label": "Laite",
                                     "trigger": "Laukaisin"
@@ -1481,18 +1581,18 @@
                                     "label": "Malli (template)",
                                     "value_template": "Arvomalli (template)"
                                 },
-                                "time_pattern": {
-                                    "hours": "Tuntia",
-                                    "label": "Aikakuvio",
-                                    "minutes": "Minuuttia",
-                                    "seconds": "Sekuntia"
-                                },
                                 "time": {
                                     "at": "Kellonaikana",
                                     "label": "Aika",
                                     "type_input": "Päivämäärä- ja aika-apurin arvo",
                                     "type_value": "Kiinteä aika"
                                 },
+                                "time_pattern": {
+                                    "hours": "Tuntia",
+                                    "label": "Aikakuvio",
+                                    "minutes": "Minuuttia",
+                                    "seconds": "Sekuntia"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook-tunnus"
@@ -1506,6 +1606,7 @@
                                     "zone": "Alue"
                                 }
                             },
+                            "type_select": "Laukaisimen tyyppi",
                             "unsupported_platform": "Alustaa {platform} ei tueta"
                         },
                         "unsaved_confirm": "Sinulla on tallentamattomia muutoksia. Haluatko varmasti poistua?"
@@ -1596,6 +1697,7 @@
                             "title": "Alexa"
                         },
                         "connected": "Yhdistetty",
+                        "connecting": "Yhdistetään...",
                         "connection_status": "Pilviyhteyden tila",
                         "fetching_subscription": "Haetaan tilausta...",
                         "google": {
@@ -1630,6 +1732,10 @@
                             "instance_will_be_available": "Asennuksesi tulee saataville",
                             "link_learn_how_it_works": "Lisätietoja toiminnasta",
                             "not_connected": "Ei yhteyttä",
+                            "remote_enabled": {
+                                "caption": "Yhdistä automaattisesti",
+                                "description": "Ota tämä vaihtoehto käyttöön, jos haluat varmistaa, että Home Assistant -instanssisi on aina etäkäytettävissä."
+                            },
                             "title": "Etähallinta"
                         },
                         "sign_out": "Kirjaudu ulos",
@@ -1654,9 +1760,9 @@
                             "loading": "Ladataan...",
                             "manage": "Hallitse",
                             "no_hooks_yet": "Näyttää sinulla ei ole vielä webhookeja. Aloita määrittämällä ",
+                            "no_hooks_yet2": "tai luomalla",
                             "no_hooks_yet_link_automation": "webhook-automaatio",
                             "no_hooks_yet_link_integration": "webhook-pohjainen integraatio",
-                            "no_hooks_yet2": "tai luomalla",
                             "title": "Webhooks"
                         }
                     },
@@ -1690,7 +1796,7 @@
                         "copied_to_clipboard": "Kopioitiin leikepöydälle",
                         "info_disable_webhook": "Jos et enää halua käyttää tätä webhookia, voit",
                         "link_disable_webhook": "Poista käytöstä",
-                        "managed_by_integration": "Tätä webhookia hallitsee integrointi, eikä sitä voi poistaa käytöstä.",
+                        "managed_by_integration": "Tätä webhookia hallitsee integraatio, eikä sitä voi poistaa käytöstä.",
                         "view_documentation": "Näytä dokumentaatio",
                         "webhook_for": "Webhook kohteelle {name}"
                     },
@@ -1771,20 +1877,8 @@
                     "description": "Muuta Home Assistantin yleisiä asetuksiasi",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "preference": {
-                                    "diagnostics": {
-                                        "title": "Diagnostiikka"
-                                    },
-                                    "statistics": {
-                                        "title": "Käyttötilastot"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nimet, versiot ja ominaisuudet."
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Valuutta",
                                 "edit_requires_storage": "Editori on poistettu käytöstä, koska asetuksia on annettu configuration.yaml:ssa.",
                                 "elevation": "Korkeus merenpinnasta",
                                 "elevation_meters": "metriä",
@@ -1856,7 +1950,7 @@
                     "caption": "Laitteet",
                     "confirm_delete": "Haluatko varmasti poistaa tämän laitteen?",
                     "confirm_rename_entity_ids": "Haluatko myös nimetä kohteiden ID:t uudelleen?",
-                    "confirm_rename_entity_ids_warning": "Tämä ei muuta mitään määrityksiä (kuten automaatiot, komentosarjat, tilanteet, kojelaudat), jotka käyttävät tällä hetkellä entiteettejä! Sinun on päivitettävä ne itse käyttääksesi uusia entiteettitunnuksia!",
+                    "confirm_rename_entity_ids_warning": "Tämä ei muuta mitään määrityksiä (kuten automaatiot, skriptit, tilanteet, kojelaudat), jotka käyttävät tällä hetkellä entiteettejä! Sinun on päivitettävä ne itse käyttääksesi uusia entiteettitunnuksia!",
                     "data_table": {
                         "area": "Alue",
                         "battery": "Akku",
@@ -1913,7 +2007,43 @@
                     "scripts": "Skriptit",
                     "unknown_error": "Tuntematon virhe",
                     "unnamed_device": "Nimeämätön laite",
-                    "update": "Päivitä"
+                    "update": "Päivitä",
+                    "update_device_error": "Laitteen päivittäminen epäonnistui"
+                },
+                "energy": {
+                    "caption": "Energia",
+                    "description": "Seuraa energiantuotantoasi ja -kulutustasi",
+                    "device_consumption": {
+                        "add_stat": "Valitse entiteetti, jonka energiaa seurataan",
+                        "learn_more": "Lisätietoja siitä, miten pääset alkuun.",
+                        "selected_stat": "Seurataan energiaa kohteelle"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Käytä nykyisen hinnan sisältävää entiteettiä",
+                                "cost_entity_input": "Nykyisen hinnan entiteetti",
+                                "cost_number": "Käytä staattista hintaa",
+                                "cost_number_input": "Hinta/kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Valitse, miten Home Assistant pitää kirjaa kulutetun energian kustannuksista.",
+                                "cost_stat": "Käytä kokonaiskustannuksia seuraavaa entiteettiä",
+                                "cost_stat_input": "Kokonaiskustannuksia seuraava entiteetti",
+                                "energy_stat": "Kulutettu energia (kWh)"
+                            },
+                            "to": {
+                                "cost_number": "Käytä kiinteää hintaa",
+                                "cost_number_input": "Hinta/kWh",
+                                "cost_number_suffix": "{currency}/kWh"
+                            }
+                        },
+                        "learn_more": "Lisätietoja siitä, miten pääset alkuun.",
+                        "title": "Sähköverkko"
+                    },
+                    "solar": {
+                        "learn_more": "Lisätietoja siitä, miten pääset alkuun.",
+                        "title": "Aurinkopaneelit"
+                    }
                 },
                 "entities": {
                     "caption": "Kohteet",
@@ -1948,7 +2078,7 @@
                         "introduction2": "Kohderekisterin avulla voit yliajaa nimen, muuttaa sen ID-tunnusta tai poistaa sen Home Assistantista. Huomaa, että rekisterimerkinnän poistaminen ei poista kohdetta.",
                         "remove_selected": {
                             "button": "Poista valitut",
-                            "confirm_partly_text": "Voit poistaa vain {removable} valittujen {selected} entiteetin. Entiteetit voidaan poistaa vain, jos integrointi ei enää tarjoa entiteettejä. Joskus Home Assistant on käynnistettävä uudelleen, ennen kuin voit poistaa poistetun integroinnin entiteetit. Haluatko varmasti poistaa siirrettävät entiteetit?",
+                            "confirm_partly_text": "Voit poistaa vain {removable} valittujen {selected} entiteetin. Entiteetit voidaan poistaa vain, jos integraatio ei enää tarjoa entiteettejä. Joskus Home Assistant on käynnistettävä uudelleen, ennen kuin voit poistaa poistetun integroinnin entiteetit. Haluatko varmasti poistaa siirrettävät entiteetit?",
                             "confirm_partly_title": "Vain {number} valittua entiteettiä voidaan poistaa.",
                             "confirm_text": "Sinun tulisi poistaa ne Lovelace-käyttöliittymästä ja automaatioista, jos ne sisältävät näitä kohteita.",
                             "confirm_title": "Haluatko poistaa {number} kohdetta?"
@@ -1964,14 +2094,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Tyhjennä",
-                    "filtering_by": "Suodatus",
-                    "show": "Näytä"
-                },
-                "hassio": {
-                    "button": "Määrittele"
-                },
                 "header": "Säädä Home Assistantia",
                 "helpers": {
                     "caption": "Auttajat",
@@ -2021,16 +2143,11 @@
                     "server": "palvelin",
                     "setup_time": "Asennusaika",
                     "source": "Lähde:",
-                    "system_health_error": "Järjestelmän kunto-komponenttia ei ole ladattu. Lisää 'system_health:' kohteeseen configuration.yaml",
                     "system_health": {
                         "manage": "Hallitse",
                         "more_info": "lisätietoja"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Integraatiot",
-                    "missing_zha": "Etsitkö ZHA-asetuspaneelia? Se siirrettiin kohtaan ZHA {integrations_page}.",
-                    "missing_zwave": "Etsitkö Z-Wave-asetuspaneelia? Se siirrettiin Z-Wave-kohtaan {integrations_page}."
+                    },
+                    "system_health_error": "Järjestelmän kunto-komponenttia ei ole ladattu. Lisää 'system_health:' kohteeseen configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Lisää integraatio",
@@ -2044,7 +2161,6 @@
                         "delete_confirm": "Haluatko varmasti poistaa tämän integraation?",
                         "device_unavailable": "laite ei saatavissa",
                         "devices": "{count} {count, plural,\n  one {laite}\n  other {laitteet}\n}",
-                        "disable_restart_confirm": "Viimeistele tämän integraation käytöstä poisto käynnistämällä Home Assistant uudelleen",
                         "disable": {
                             "disable_confirm": "Haluatko varmasti poistaa tämän asetusten osan käytöstä? Sen laitteet ja entiteetit poistetaan käytöstä.",
                             "disabled": "Poistettu käytöstä",
@@ -2055,20 +2171,21 @@
                             },
                             "disabled_cause": "{cause} poistanut käytöstä"
                         },
+                        "disable_error": "Integraation ottaminen käyttöön tai poistaminen käytöstä epäonnistui",
+                        "disable_restart_confirm": "Viimeistele tämän integraation käytöstä poisto käynnistämällä Home Assistant uudelleen",
+                        "disabled_polling": "Päivitettyjen tietojen automaattinen kysely pois käytöstä",
                         "documentation": "Dokumentointi",
                         "enable_restart_confirm": "Viimeistele tämän integraation käyttöönotto käynnistämällä Home Assistant uudelleen",
-                        "entities": "{count} {count, plural,\n  one {kohde}\n  other {kohteet}\n}",
-                        "entity_unavailable": "kohde ei saatavilla",
+                        "entities": "{count} {count, plural,\n  one {kohde}\n  other {kohdetta}\n}",
+                        "entity_unavailable": "Kohde ei saatavilla",
                         "firmware": "Laiteohjelmisto: {version}",
                         "hub": "Yhdistetty kautta",
-                        "logs": "Lokit",
                         "manuf": "{manufacturer}",
                         "no_area": "Ei aluetta",
                         "not_loaded": "Ei ladattu",
-                        "options": "Asetukset",
                         "reload": "Lataa uudelleen",
                         "reload_confirm": "Integraatio ladattiin uudelleen",
-                        "reload_restart_confirm": "Viimeistele tämän integroinnin uudelleenlataaminen käynnistämällä Home Assistant uudelleen",
+                        "reload_restart_confirm": "Käynnistä Home Assistant uudelleen viimeistelläksesi tämän integraation uudelleenlataamisen",
                         "rename": "Nimeä uudelleen",
                         "restart_confirm": "Käynnistä Home Assistant uudellen viimeistelläksesi tämän integraation poistamisen",
                         "services": "{count} {count, plural,\n  one {palvelu}\n  other {palvelua}\n}",
@@ -2091,7 +2208,6 @@
                             "open_site": "Avaa verkkosivusto"
                         },
                         "finish": "Valmis",
-                        "loading_first_time": "Odota, kunnes integraatio on asennettu",
                         "next": "Seuraava",
                         "not_all_required_fields": "Täytä kaikki pakolliset kentät.",
                         "submit": "Lähetä"
@@ -2102,18 +2218,16 @@
                     "details": "Integroinnin yksityiskohdat",
                     "disable": {
                         "disabled_integrations": "{number} poistettu käytöstä",
-                        "hide_disabled": "Piilota käytöstä poistetut integraatiot",
                         "show": "Näytä",
                         "show_disabled": "Näytä käytöstä poistetut integraatiot"
                     },
                     "discovered": "Löydetty",
-                    "home_assistant_website": "Home Assistant -sivusto",
+                    "home_assistant_website": "Home Assistantin verkkosivulta",
                     "ignore": {
                         "confirm_delete_ignore": "Tämä saa integroinnin näkymään löydetyissä integroinneissa uudelleen, kun se löydetään. Tämä saattaa vaatia uudelleenkäynnistyksen tai kestää jonkin aikaa.",
                         "confirm_delete_ignore_title": "Lopeta integraation {name} ohittaminen?",
-                        "confirm_ignore": "Oletko varma, ettet halua määrittää tätä integrointia? Voit kumota tämän napsauttamalla oikeassa yläkulmassa olevasta valikosta \"Näytä ohitetut integroinnit\".",
+                        "confirm_ignore": "Haluatko varmasti jättää tämän integraation määrittämättä? Voit kumota tämän napsauttamalla oikean yläkulman valikosta \"Näytä ohitetut integraatiot\".",
                         "confirm_ignore_title": "Ohitetaanko kohteen {name} etsintä?",
-                        "hide_ignored": "Piilota ohitetut integraatiot",
                         "ignore": "Ohita",
                         "ignored": "Ohitettu",
                         "show_ignored": "Näytä ohitetut integraatiot",
@@ -2127,7 +2241,7 @@
                     "none_found": "Integraatioita ei löytynyt",
                     "none_found_detail": "Muokkaa haku ehtojasi",
                     "note_about_integrations": "Kaikkia integraatioita ei voi vielä määrittää käyttöliittymän kautta.",
-                    "note_about_website_reference": "Lisää saatavilla",
+                    "note_about_website_reference": "Lisää saatavilla ",
                     "reconfigure": "Määritä uudelleen",
                     "rename_dialog": "Muokkaa tämän määritysmerkinnän nimeä",
                     "rename_input_label": "Merkinnän nimi",
@@ -2230,7 +2344,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Määritä",
                     "description_listen": "Kuuntele aihetta",
                     "description_publish": "Julkaise paketti",
                     "listening_to": "Kuunnellaan",
@@ -2244,7 +2357,6 @@
                     "topic": "aihe"
                 },
                 "ozw": {
-                    "button": "Määrittele",
                     "common": {
                         "controller": "Ohjain",
                         "instance": "Instanssi",
@@ -2269,6 +2381,11 @@
                         "nodes": "Solmut",
                         "select_instance": "Valitse instanssi"
                     },
+                    "network": {
+                        "header": "Verkon hallinta",
+                        "introduction": "Hallitse verkon laajuisia toimintoja.",
+                        "node_count": "{count} solmua"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Kaikkia solmuja on kysytty",
@@ -2289,10 +2406,9 @@
                         "starting": "Käynnistetään",
                         "unknown": "Tuntematon"
                     },
-                    "network": {
-                        "header": "Verkon hallinta",
-                        "introduction": "Hallitse verkon laajuisia toimintoja.",
-                        "node_count": "{count} solmua"
+                    "node": {
+                        "button": "Solmun tiedot",
+                        "not_found": "Solmua ei löytynyt"
                     },
                     "node_config": {
                         "header": "Solmun määritys",
@@ -2322,10 +2438,6 @@
                         "versions": "Noudetaan tiedot laiteohjelmistosta ja komentoluokan versioista",
                         "wakeup": "Asetetaan tuki herätysjonoille ja viesteille"
                     },
-                    "node": {
-                        "button": "Solmun tiedot",
-                        "not_found": "Solmua ei löytynyt"
-                    },
                     "nodes_table": {
                         "failed": "Epäonnistui",
                         "id": "ID",
@@ -2438,7 +2550,7 @@
                     }
                 },
                 "script": {
-                    "caption": "Skripti",
+                    "caption": "Skriptit",
                     "description": "Luo ja muokkaa skriptejä",
                     "editor": {
                         "alias": "Nimi",
@@ -2458,20 +2570,22 @@
                             "queued": "Jonon pituus"
                         },
                         "modes": {
-                            "description": "Moodi hallitsee sitä, mitä tapahtuu, kun skripti käynnistetään, kun se edelleen toimii yhdestä tai useammasta aiemmasta kutsusta. Katso lisätietoja {documentation_link} .",
-                            "documentation": "skriptin dokumentaatio",
+                            "description": "Tila määrittää, mitä tapahtuu, kun skriptiä kutsutaan uudelleen edellisen kutsukerran ollessa vielä käynnissä. Lisätietoja {documentation_link}.",
+                            "documentation": "skriptien ohjeissa",
                             "label": "Tila",
                             "parallel": "Rinnakkain",
-                            "queued": "Jonossa",
-                            "restart": "Käynnistä uudelleen",
-                            "single": "Yksittäinen (oletus)"
+                            "queued": "Peräkkäin",
+                            "restart": "Aloita alusta",
+                            "single": "Yksi kerrallaan (oletus)"
                         },
-                        "save_script": "Tallenna komentosarja",
+                        "save_script": "Tallenna skripti",
                         "sequence": "Järjestys",
-                        "sequence_sentence": "Skriptin toimintojen järjestys."
+                        "sequence_sentence": "Skriptin toimintojen järjestys.",
+                        "show_trace": "Näytä jäljitys"
                     },
                     "picker": {
                         "add_script": "Lisää skripti",
+                        "dev_script": "Debuggaa skriptiä",
                         "duplicate": "Kopioi",
                         "duplicate_script": "Kopioi skripti",
                         "edit_script": "Muokkaa skriptiä",
@@ -2482,7 +2596,7 @@
                         "introduction": "Skriptieditorin avulla voit luoda ja muokata skriptejä. Seuraa alla olevaa linkkiä lukeaksesi ohjeet varmistaaksesi, että olet määrittänyt Home Assistant -sovelluksen oikein.",
                         "learn_more": "Lisätietoja skripteistä",
                         "no_scripts": "Emme löytäneet muokattavia skriptejä",
-                        "run_script": "Suorita komentosarja",
+                        "run_script": "Suorita skripti",
                         "show_info": "Näytä tietoja skriptistä"
                     }
                 },
@@ -2491,39 +2605,39 @@
                     "description": "Uudelleenkäynnistä ja sammuta Home Assistant -palvelin",
                     "section": {
                         "reloading": {
-                            "automation": "Lataa automaatiot uudelleen",
-                            "command_line": "Lataa komentorivientiteetiteetit uudelleen",
-                            "core": "Lataa ydin uudelleen",
-                            "filesize": "Lataa tiedostokokokohteet uudelleen",
-                            "filter": "Lataa suodatinentiteetiteetiteetit uudelleen",
-                            "generic": "Lataa yleiset IP-kamera-entiteetit uudelleen",
-                            "generic_thermostat": "Lataa yleiset termostaatit uudelleen",
-                            "group": "Lataa ryhmät uudelleen",
+                            "automation": "Automaatiot",
+                            "command_line": "Komentorivientiteetit",
+                            "core": "Sijainti & muokkaukset",
+                            "filesize": "Tiedostokokokohteet",
+                            "filter": "Suodatinentiteetit",
+                            "generic": "Yleiset IP-kameraentiteetit",
+                            "generic_thermostat": "Yleiset termostaattientiteetit",
+                            "group": "Ryhmät, ryhmäentiteetit ja ilmoituspalvelut",
                             "heading": "Asetusten uudelleenlataus",
-                            "history_stats": "Lataa historiatilastot-entiteetit uudelleen",
-                            "homekit": "Lataa HomeKit uudelleen",
-                            "input_boolean": "Lataa booleanit uudelleen",
-                            "input_datetime": "Lataa syöttöpäivämäärät uudelleen",
-                            "input_number": "Lataa syöttönumerot uudelleen",
-                            "input_select": "Lataa valinnat uudelleen",
-                            "input_text": "Lataa syöttötekstit uudelleen",
-                            "introduction": "Jotkut Home Assistantin osat voidaan ladata uudelleen ilman, että tarvitaan uudelleenkäynnistystä. Painamalla uudelleenlatausta yaml-tiedosto luetaan uudelleen.",
-                            "min_max": "Lataa min/max-kohteet uudelleen",
-                            "mqtt": "Lataa mqtt-entiteetit uudelleen",
-                            "person": "Lataa henkilöt uudelleen",
-                            "ping": "Lataa ping-binaarianturin entiteetit uudelleen",
-                            "reload": "Lataa uudelleen {domain}",
-                            "rest": "Uudelleenlataa rest-entiteetit ja ilmoita palveluiden kuuntelijoille",
-                            "rpi_gpio": "Lataa Raspberry Pi GPIO -entiteetit uudelleen",
-                            "scene": "Lataa tilanteet uudelleen",
-                            "script": "Lataa skriptit uudelleen",
-                            "smtp": "Lataa smtp-ilmoituspalvelut uudelleen",
-                            "statistics": "Lataa tilastoentiteetit uudelleen",
-                            "telegram": "Päivitä Telegram-ilmoituspalvelut",
-                            "template": "Malli entiteetit",
-                            "trend": "Lataa trendientiteetiteetit uudelleen",
-                            "universal": "Lataa universaali mediasoittimen entiteetit uudelleen",
-                            "zone": "Lataa alueet uudelleen"
+                            "history_stats": "Historiatilastoentiteetit",
+                            "homekit": "HomeKit",
+                            "input_boolean": "Boolean-syötteet",
+                            "input_datetime": "Päivämääräsyötteet",
+                            "input_number": "Numerosyötteet",
+                            "input_select": "Valintalaatikkosyötteet",
+                            "input_text": "Tekstisyötteet",
+                            "introduction": "Jotkut Home Assistantin osat voidaan ladata uudelleen ilman uudelleenkäynnistystä. Alla olevat valinnat lataavat YAML-asetustiedoston uudelleen.",
+                            "min_max": "Min/max-entiteetit",
+                            "mqtt": "Manuaalisesti määritetyt MQTT-entiteetit",
+                            "person": "Henkilöt",
+                            "ping": "Binääriset ping-sensorientiteetit",
+                            "reload": "{domain}",
+                            "rest": "REST-entiteetit ja ilmoituspalvelut",
+                            "rpi_gpio": "Raspberry Pi GPIO -entiteetit",
+                            "scene": "Tilanteet",
+                            "script": "Skriptit",
+                            "smtp": "SMTP-ilmoituspalvelut",
+                            "statistics": "Tilastoentiteetit",
+                            "telegram": "Telegram-ilmoituspalvelut",
+                            "template": "Mallientiteetit",
+                            "trend": "Trendientiteetit",
+                            "universal": "Yleiset mediasoitinentiteetit",
+                            "zone": "Alueet"
                         },
                         "server_management": {
                             "confirm_restart": "Haluatko varmasti käynnistää Home Assistantin uudelleen?",
@@ -2627,7 +2741,6 @@
                         "search_again": "Etsi uudestaan",
                         "spinner": "Etsitään ZHA Zigbee laitteita..."
                     },
-                    "button": "Määritä",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Valitun klusterin määritteet",
                         "get_zigbee_attribute": "Hae Zigbee-ominaisuus",
@@ -2736,51 +2849,7 @@
                     "introduction": "Vyöhykkeiden avulla voit määrittää alueita maan päällä. Kun henkilö on vyöhykkeellä, tila saa vyöhykkeen nimen. Vyöhykkeitä voidaan käyttää myös laukaisimina tai ehtoina automaatioissa.",
                     "no_zones_created_yet": "Näyttää siltä, että et ole vielä luonut vyöhykkeitä."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "view_device": "Näytä laite"
-                    },
-                    "button": "Määrittele",
-                    "common": {
-                        "close": "Sulje",
-                        "home_id": "Kodin ID",
-                        "network": "Verkko"
-                    },
-                    "dashboard": {
-                        "driver_version": "Ohjaimen versio",
-                        "dump_not_ready_confirm": "Lataa",
-                        "home_id": "Kodin ID",
-                        "server_version": "Palvelinversio"
-                    },
-                    "device_info": {
-                        "node_ready": "Solmu valmis",
-                        "zwave_info": "Z-Wave tiedot"
-                    },
-                    "navigation": {
-                        "logs": "Lokit",
-                        "network": "Verkko"
-                    },
-                    "network_status": {
-                        "connected": "Yhdistetty",
-                        "connecting": "Yhdistetään",
-                        "unknown": "Tuntematon"
-                    },
-                    "node_config": {
-                        "battery_device_notice": "Akkulaitteiden on oltava hereillä, jotta ne voivat päivittää konfiguraationsa. Katso laitteen käyttöoppaasta ohjeet laitteen herättämiseen.",
-                        "error_device_not_found": "Laitetta ei löydy.",
-                        "parameter_is_read_only": "Tämä parametri on vain luku -tyyppinen.",
-                        "zwave_js_device_database": "Z-Wave JS -laitetietokanta"
-                    },
-                    "node_status": {
-                        "alive": "Elossa",
-                        "asleep": "Unessa",
-                        "awake": "Hereillä",
-                        "dead": "Kuollut",
-                        "unknown": "Tuntematon"
-                    }
-                },
                 "zwave": {
-                    "button": "Määritä",
                     "common": {
                         "index": "Indeksi",
                         "instance": "Esiintymä",
@@ -2869,6 +2938,86 @@
                     "values": {
                         "header": "Solmujen arvot"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "inclusion_finished": "Solmu on lisätty.",
+                        "view_device": "Näytä laite"
+                    },
+                    "common": {
+                        "close": "Sulje",
+                        "home_id": "Kodin ID",
+                        "network": "Verkko",
+                        "reconfigure_server": "Määritä palvelin uudelleen",
+                        "source": "Lähde"
+                    },
+                    "dashboard": {
+                        "driver_version": "Ohjaimen versio",
+                        "dump_not_ready_confirm": "Lataa",
+                        "home_id": "Kodin ID",
+                        "server_version": "Palvelinversio"
+                    },
+                    "device_info": {
+                        "heal_node": "Paranna solmu",
+                        "node_ready": "Solmu valmis",
+                        "remove_failed": "Poista vikaantunut laite",
+                        "zwave_info": "Z-Wave tiedot"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Verkon parantaminen on peruutettu.",
+                        "healing_complete": "Verkon parantaminen on valmis.",
+                        "healing_failed": "Parantaminen epäonnistui. Lisätietoja voi olla lokeissa.",
+                        "in_progress": "Verkon parantaminen on käynnissä. Tämä vie jonkin aikaa.",
+                        "run_in_background": "Voit sulkea tämän valintaikkunan ja verkon parantaminen jatkuu taustalla.",
+                        "stop_heal": "Lopeta parantaminen"
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} on parantunut.",
+                        "healing_failed": "{device} ei voitu parantaa.",
+                        "healing_failed_check_logs": "Lisätietoja voi olla saatavilla lokitiedoissa.",
+                        "in_progress": "{device}: paraneminen on käynnissä.",
+                        "introduction": "Käske laitteen {device} päivittää reittinsä takaisin ohjaimeen. Tämä voi auttaa tietoliikenneongelmissa, jos olet äskettäin siirtänyt laitteen tai ohjaimen.",
+                        "start_heal": "Paranna laite",
+                        "title": "Paranna Z-Wave-laite",
+                        "traffic_warning": "Parantamisprosessi tuottaa suuren määrän liikennettä Z-Wave-verkkoon. Tämä voi aiheuttaa sen, että laitteet reagoivat hitaasti (tai eivät reagoi lainkaan), kun paraneminen on käynnissä."
+                    },
+                    "logs": {
+                        "log_level": "Lokitaso",
+                        "log_level_changed": "Lokitasoksi on muutettu: {level}",
+                        "subscribed_to_logs": "Z-Wave JS -lokiviestit tilattu...",
+                        "title": "Z-Wave JS -lokit"
+                    },
+                    "navigation": {
+                        "logs": "Lokit",
+                        "network": "Verkko"
+                    },
+                    "network_status": {
+                        "connected": "Yhdistetty",
+                        "connecting": "Yhdistetään",
+                        "unknown": "Tuntematon"
+                    },
+                    "node_config": {
+                        "battery_device_notice": "Akkulaitteiden on oltava hereillä, jotta ne voivat päivittää konfiguraationsa. Katso laitteen käyttöoppaasta ohjeet laitteen herättämiseen.",
+                        "error_device_not_found": "Laitetta ei löydy.",
+                        "parameter": "Parametri",
+                        "parameter_is_read_only": "Tämä parametri on vain luku -tyyppinen.",
+                        "zwave_js_device_database": "Z-Wave JS -laitetietokanta"
+                    },
+                    "node_status": {
+                        "alive": "Elossa",
+                        "asleep": "Unessa",
+                        "awake": "Hereillä",
+                        "dead": "Kuollut",
+                        "unknown": "Tuntematon"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Laitteen poisto on käynnissä.",
+                        "introduction": "Poista vikaantunut laite Z-Wave-verkosta. Käytä tätä, jos et voi normaalisti sulkea laitetta pois, koska se on rikki.",
+                        "removal_failed": "Laitetta ei voitu poistaa Z-Wave-verkostasi.",
+                        "removal_finished": "Solmu {id} on poistettu Z-Wave-verkostasi.",
+                        "remove_device": "Poista laite",
+                        "title": "Poista vikaantunut Z-Wave-laite"
+                    }
                 }
             },
             "custom": {
@@ -2946,29 +3095,13 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Mene takaisin",
-                "supervisor": {
-                    "ask": "Pyydä apua",
-                    "reboot": "Yritä uudelleenkäynnistää isäntä ",
-                    "system_health": "Tarkista järjestelmän kunto",
-                    "title": "Supervisor-paneelia ei voitu ladata!"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Viime viikolla",
-                    "this_week": "Tällä viikolla",
-                    "today": "Tänään",
-                    "yesterday": "Eilen"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Viime viikolla",
-                    "this_week": "Tällä viikolla",
-                    "today": "Tänään",
-                    "yesterday": "Eilen"
+            "energy": {
+                "charts": {
+                    "by_device": "Kulutus laitteittain"
+                },
+                "setup": {
+                    "back": "Takaisin",
+                    "next": "Seuraava"
                 }
             },
             "lovelace": {
@@ -2979,6 +3112,7 @@
                 },
                 "cards": {
                     "actions": {
+                        "action_confirmation": "Haluatko varmasti suorittaa toiminnon \"{action}\"?",
                         "no_service": "Suoritettavaa palvelua ei ole määritelty",
                         "no_url": "Avattavaa URL-osoitetta ei ole määritetty"
                     },
@@ -3071,7 +3205,6 @@
                         "entities": {
                             "description": "Kohde-kortti on yleisin korttityyppi. Se ryhmittelee kohteet yhteen luetteloiksi.",
                             "edit_special_row": "Näytä rivin tiedot klikkaamalla Muokkaa-painiketta",
-                            "entity_row_editor": "Entiteetti rivi editori",
                             "entity_row": {
                                 "attribute": "Määrite",
                                 "button": "Painike",
@@ -3083,6 +3216,7 @@
                                 "section": "Osio",
                                 "weblink": "Nettilinkki"
                             },
+                            "entity_row_editor": "Entiteetti rivi editori",
                             "name": "Kohteet",
                             "secondary_info_values": {
                                 "brightness": "Kirkkaus",
@@ -3181,6 +3315,7 @@
                             "name": "Valo"
                         },
                         "logbook": {
+                            "description": "Lokikirja-kortti näyttää listan entiteettien tapahtumista.",
                             "name": "Lokikirja"
                         },
                         "map": {
@@ -3294,13 +3429,16 @@
                         "add": "Lisää näkymä",
                         "delete": "Poista näkymä",
                         "edit": "Muokkaa näkymää",
-                        "header": "Näytä asetukset",
-                        "header_name": "{name} Näytä asetukset",
+                        "header": "Näkymän asetukset",
+                        "header_name": "Näkymän {name} asetukset",
                         "move_left": "Siirrä näkymää vasemmalle",
                         "move_right": "Siirrä näkymää oikealle",
                         "tab_badges": "Merkit",
                         "tab_settings": "Asetukset",
                         "tab_visibility": "Näkyvyys",
+                        "types": {
+                            "sidebar": "Sivupalkki"
+                        },
                         "visibility": {
                             "select_users": "Valitse ketkä käyttäjät näkevät tämän näkymän navigoinnissa"
                         }
@@ -3354,7 +3492,6 @@
                         "unsaved_changes": "Tallentamattomat muutokset"
                     },
                     "save_config": {
-                        "cancel": "Antaa olla",
                         "close": "Sulje",
                         "empty_config": "Aloita tyhjällä kojelaudalla",
                         "header": "Hallitse Lovelace käyttöliittymääsi",
@@ -3383,8 +3520,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Tämä renderöi ensimmäisen kortin täydellä leveydellä. Muita kortteja tässä näkymässä ei näytetä.",
-                            "title": "Paneelitila?",
                             "warning_multiple_cards": "Tämä näkymä sisältää useamman kuin yhden kortin, paneelinäkymä tukee vain yhtä korttia."
                         }
                     }
@@ -3434,7 +3569,8 @@
                 "playback_title": "Toista viesti"
             },
             "my": {
-                "documentation": "dokumentaatio"
+                "documentation": "dokumentaatio",
+                "error": "Tapahtui tuntematon virhe"
             },
             "page-authorize": {
                 "abort_intro": "Kirjautuminen on keskeytetty",
@@ -3602,10 +3738,17 @@
                 "intro": "Oletko valmis herättämään kotisi eloon, palauttamaan yksityisyytesi ja liittymään maailmanlaajuiseen nikkarien joukkoon?",
                 "next": "Seuraava",
                 "restore": {
+                    "addons": "Lisäosat",
+                    "confirm_password": "Vahvista tilannekuvan salasana",
                     "description": "Vaihtoehtoisesti voit palauttaa aiemmasta varmuuskopiosta.",
+                    "folders": "Kansiot",
                     "hide_log": "Piilota koko loki",
                     "in_progress": "Palautus käynnissä",
-                    "show_log": "Näytä koko loki"
+                    "password": "Salasana",
+                    "password_protection": "Salasanasuojaus",
+                    "select_type": "Valitse palautettavat tiedot",
+                    "show_log": "Näytä koko loki",
+                    "type": "Tyyppi"
                 },
                 "user": {
                     "create_account": "Luo tili",
@@ -3674,7 +3817,7 @@
                     "create_failed": "Käyttötunnussanoman luominen epäonnistui.",
                     "created": "Luotu {date}",
                     "delete_failed": "Käyttötunnussanoman poistaminen epäonnistui.",
-                    "description": "Luo pitkäikäisiä käyttöoikeustunnuksia, jotta komentosarjasi voivat vuorovaikuttaa Home Assistantin kanssa. Jokainen tunnus on voimassa 10 vuotta luomisesta. Seuraavat pitkäikäiset käyttöoikeustunnukset ovat tällä hetkellä käytössä.",
+                    "description": "Luo pitkäikäisiä käyttöoikeustunnuksia, jotta komentosarjasi voivat vuorovaikuttaa Home Assistantin kanssa. Tunnukset ovat voimassa 10 vuotta luonnista. Seuraavat pitkäikäiset käyttöoikeustunnukset ovat tällä hetkellä käytössä.",
                     "empty_state": "Sinulla ei ole vielä pitkäaikaisia käyttötunnussanomia",
                     "header": "Pitkäaikaiset käyttötunnussanomat",
                     "learn_auth_requests": "Opi tekemään tunnistautuneita kutsuja.",
@@ -3682,6 +3825,12 @@
                     "prompt_copy_token": "Kopioi käyttöoikeuskoodi. Sitä ei näytetä uudelleen.",
                     "prompt_name": "Nimi?"
                 },
+                "mfa": {
+                    "confirm_disable": "Haluatko varmasti poistaa {name}?",
+                    "disable": "Poista käytöstä",
+                    "enable": "Ota käyttöön",
+                    "header": "Monivaiheisen tunnistautumisen moduulit"
+                },
                 "mfa_setup": {
                     "close": "Sulje",
                     "step_done": "Asetus tehty {step}",
@@ -3689,17 +3838,16 @@
                     "title_aborted": "Keskeytetty",
                     "title_success": "Onnistui!"
                 },
-                "mfa": {
-                    "confirm_disable": "Haluatko varmasti poistaa {name}?",
-                    "disable": "Poista käytöstä",
-                    "enable": "Ota käyttöön",
-                    "header": "Monivaiheisen tunnistautumisen moduulit"
-                },
                 "number_format": {
+                    "description": "Valitse, miten luvut muotoillaan.",
                     "dropdown_label": "Numeromuoto",
                     "formats": {
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
                         "language": "Automaattinen (käytä kieliasetusta)",
-                        "none": "Ei mitään"
+                        "none": "Ei mitään",
+                        "space_comma": "1 234 567,89",
+                        "system": "Käytä järjestelmän asetusta"
                     },
                     "header": "Numeromuoto"
                 },
@@ -3744,6 +3892,17 @@
                     "primary_color": "Ensisijainen väri",
                     "reset": "Nollaa"
                 },
+                "time_format": {
+                    "description": "Valitse, miten kellonajat muotoillaan.",
+                    "dropdown_label": "Aikamuoto",
+                    "formats": {
+                        "12": "12-tuntinen (AM/PM)",
+                        "24": "24-tuntinen",
+                        "language": "Automaattinen (käytä kieliasetusta)",
+                        "system": "Käytä järjestelmän asetusta"
+                    },
+                    "header": "Aikamuoto"
+                },
                 "vibrate": {
                     "description": "Ota tämän laitteen värinä käyttöön tai poista se käytöstä, kun ohjaat laitteita.",
                     "header": "Värinä"
diff --git a/translations/frontend/fr.json b/translations/frontend/fr.json
index b0d41ac16e..d13d2519c4 100644
--- a/translations/frontend/fr.json
+++ b/translations/frontend/fr.json
@@ -17,6 +17,7 @@
         "calendar": "Calendrier",
         "config": "Configuration",
         "developer_tools": "Outils de développement",
+        "energy": "Énergie",
         "history": "Historique",
         "logbook": "Journal",
         "mailbox": "Boîtes aux lettres",
@@ -26,6 +27,14 @@
         "shopping_list": "Liste de courses",
         "states": "Aperçu"
     },
+    "state": {
+        "default": {
+            "off": "Off",
+            "on": "On",
+            "unavailable": "Indisponible",
+            "unknown": "Inconnu"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Absent"
         }
     },
-    "state": {
-        "default": {
-            "off": "Off",
-            "on": "On",
-            "unavailable": "Indisponible",
-            "unknown": "Inconnu"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Le module complémentaire n'est pas installé"
             }
         },
+        "backup": {
+            "addons": "Modules complémentaires",
+            "confirm_password": "Confirmez le mot de passe de l'instantané",
+            "could_not_create": "Impossible de créer un instantané",
+            "create": "Créer",
+            "create_blocked_not_running": "La création d’un instantané n’est pas possible en ce moment car le système est en état {state}.",
+            "created": "créé",
+            "delete_backup_confirm": "Supprimer",
+            "delete_selected": "Supprimer les instantanés sélectionnés",
+            "enter_password": "Veuillez entrer un mot de passe.",
+            "failed_to_delete": "Échec de la suppression du fichier: %@",
+            "folders": "Dossiers",
+            "name": "Nom",
+            "password": "Mot de passe",
+            "password_protection": "Protection par mot de passe",
+            "passwords_not_matching": "Les mots de passe ne correspondent pas",
+            "select_type": "Sélectionnez ce qu'il faut restaurer",
+            "selected": "{number} sélectionné",
+            "type": "Type"
+        },
         "common": {
             "cancel": "Annuler",
             "close": "Fermer",
@@ -366,9 +387,6 @@
                 "text": "Voulez-vous redémarrer le module complémentaire avec vos modifications?"
             },
             "update": {
-                "create_snapshot": "Créez un instantané de {name} avant de mettre à jour",
-                "snapshot": "Instantané",
-                "snapshotting": "Création d'un instantané de {name}",
                 "updating": "Mise à jour de {name} vers la version {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Tableau de bord",
-            "snapshots": "Instantanés",
             "store": "Boutique des modules complémentaires",
             "system": "Système"
         },
-        "snapshot": {
-            "addons": "Modules complémentaires",
-            "available_snapshots": "Instantanés disponibles",
-            "confirm_password": "Confirmez le mot de passe de l'instantané",
-            "could_not_create": "Impossible de créer un instantané",
-            "create": "Créer",
-            "create_blocked_not_running": "La création d’un instantané n’est pas possible en ce moment car le système est en état {state}.",
-            "create_snapshot": "Créer un instantané",
-            "created": "créé",
-            "delete_selected": "Supprimer les instantanés sélectionnés",
-            "delete_snapshot_confirm": "Supprimer",
-            "delete_snapshot_text": "Voulez-vous supprimer {number} {number, plural,\n  one {entité}\n  other {entités}\n} ?",
-            "delete_snapshot_title": "Supprimer l'instantané",
-            "description": "Les instantanés vous permettent de sauvegarder et de restaurer facilement toutes les données de votre instance Home Assistant.",
-            "enter_password": "Veuillez entrer un mot de passe.",
-            "failed_to_delete": "Échec de la suppression du fichier: %@",
-            "folder": {
-                "addons/local": "Modules complémentaires locaux",
-                "homeassistant": "Configuration Home Assistant",
-                "media": "Médias",
-                "share": "Partager",
-                "ssl": "SSL"
-            },
-            "folders": "Dossiers",
-            "full_snapshot": "Instantané complet",
-            "name": "Nom",
-            "no_snapshots": "Vous n'avez pas encore d'instantanés.",
-            "partial_snapshot": "Instantané partiel",
-            "password": "Mot de passe",
-            "password_protected": "protégé par mot de passe",
-            "password_protection": "Protection par mot de passe",
-            "passwords_not_matching": "Les mots de passe ne correspondent pas",
-            "security": "Sécurité",
-            "select_type": "Sélectionnez ce qu'il faut restaurer",
-            "selected": "{number} sélectionné",
-            "type": "Type",
-            "upload_snapshot": "Téléverser un instantané"
-        },
         "store": {
             "missing_addons": "Modules complémentaires manquants? Activer le mode avancé dans votre page de profil utilisateur",
             "no_results_found": "Aucun résultat trouvé dans {repository}.",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Date de fin",
+                "ranges": {
+                    "last_week": "La semaine dernière",
+                    "this_week": "Cette semaine",
+                    "today": "Aujourd'hui",
+                    "yesterday": "Hier"
+                },
                 "select": "Sélectionner",
                 "start_date": "Date de début"
             },
@@ -851,10 +836,10 @@
                 "documentation": "documentation",
                 "learn_adding_local_media": "En savoir plus sur l'ajout de médias dans la {documentation} .",
                 "local_media_files": "Placez vos fichiers vidéo, audio et image dans le répertoire multimédia pour pouvoir les parcourir et les lire dans le navigateur ou sur les lecteurs multimédias pris en charge.",
+                "media-player-browser": "Lecteur multimédia",
                 "media_browsing_error": "Erreur de navigation multimédia",
                 "media_not_supported": "Le navigateur Media Player ne prend pas en charge ce type de médias",
                 "media_player": "Lecteur multimédia",
-                "media-player-browser": "Lecteur multimédia",
                 "no_items": "Aucun éléments",
                 "no_local_media_found": "Aucun média local trouvé",
                 "no_media_folder": "Il semble que vous n’avez pas encore créé de répertoire multimédia.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Service"
             },
+            "statistic-picker": {
+                "learn_more": "En savoir plus sur les statistiques",
+                "missing_entity": "Pourquoi mon entité n'est-elle pas répertoriée ?",
+                "no_match": "Aucune statistique correspondante trouvée",
+                "no_statistics": "Vous n'avez pas de statistiques",
+                "statistic": "Statistique"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Chargement des statistiques...",
+                "no_statistics_found": "Aucune statistique trouvée.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "moyenne",
+                    "min": "min",
+                    "sum": "somme"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Choisissez la zone",
                 "add_device_id": "Choisissez un appareil",
@@ -945,7 +947,7 @@
                 "enable_new_entities_description": "Si désactivé, les nouvelles entités découvertes pour {integration} ne seront pas ajoutées automatiquement à Home Assistant.",
                 "enable_new_entities_label": "Activer les entités nouvellement ajoutées.",
                 "enable_polling_description": "Si Home Assistant doit interroger automatiquement les entités {integration} pour les mises à jour.",
-                "enable_polling_label": "Activez l'interrogation pour les mises à jour.",
+                "enable_polling_label": "Activer la récupération des nouvelles mises à jour.",
                 "restart_home_assistant": "Vous devez redémarrer Home Assistant pour que vos modifications soient prises en compte.",
                 "title": "Options système pour {integration}",
                 "update": "Mise à jour"
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Options"
                 },
+                "loading": {
+                    "loading_flow": "Veuillez patienter pendant l'initialisation {integration}",
+                    "loading_step": "Chargement de l'étape suivante pour {integration}"
+                },
                 "success": {
                     "description": "Options enregistrées avec succès."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Général",
                         "customize": "Customisations",
                         "devices": "Appareils",
+                        "energy": "Énergie",
                         "entities": "Entités",
                         "helpers": "Entrées",
                         "info": "Info",
                         "integrations": "Intégrations",
                         "logs": "Journaux",
                         "lovelace": "Tableaux de bord Lovelace",
-                        "navigate_to": "Naviguer vers {panel}",
                         "person": "Personnes",
                         "scene": "Scènes",
                         "script": "Scripts",
@@ -1360,7 +1366,6 @@
                             "introduction": "Les actions sont ce que Home Assistant fera quand une automatisation est déclenchée.",
                             "learn_more": "En savoir plus sur les actions",
                             "name": "Action",
-                            "type_select": "Type d'action",
                             "type": {
                                 "choose": {
                                     "add_option": "Ajouter une option",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Répéter",
                                     "sequence": "Actions",
-                                    "type_select": "Type de répétition",
                                     "type": {
                                         "count": {
                                             "label": "Nombre"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Tant que les conditions",
                                             "label": "Tant que"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Type de répétition"
                                 },
                                 "scene": {
                                     "label": "Activer la scène"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Template d'attente"
                                 }
                             },
+                            "type_select": "Type d'action",
                             "unsupported_action": "Pas d'interface utilisateur pour l'action : {action}"
                         },
                         "alias": "Nom",
@@ -1452,7 +1458,6 @@
                             "introduction": "Les conditions sont facultatives et empêcheront toute exécution ultérieure si toutes les conditions ne sont pas remplies.",
                             "learn_more": "En savoir plus sur les conditions",
                             "name": "Condition",
-                            "type_select": "Type de condition",
                             "type": {
                                 "and": {
                                     "label": "Et"
@@ -1513,12 +1518,18 @@
                                         "wed": "Mercredi"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "ID de déclencheur",
+                                    "label": "Déclencheur",
+                                    "no_triggers": "Aucun déclencheur disponible"
+                                },
                                 "zone": {
                                     "entity": "Entité avec localisation",
                                     "label": "Zone",
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Type de condition",
                             "unsupported_condition": "Pas d'interface utilisateur pour la condition : {condition}"
                         },
                         "copy_to_clipboard": "Copier dans le presse-papier",
@@ -1556,10 +1567,10 @@
                             "delete_confirm": "Voulez-vous effacer ?",
                             "duplicate": "Dupliquer",
                             "header": "Déclencheurs",
+                            "id": "ID de déclenchement (utilisé par la condition de déclenchement)",
                             "introduction": "Les déclencheurs sont ce qui lance le traitement d'une règle d'automatisation. Il est possible de spécifier plusieurs déclencheurs pour une même règle. Dès qu'un déclencheur est activé, Home Assistant validera les conditions, s'il y en a, et appellera l'action.",
                             "learn_more": "En savoir plus sur les déclencheurs",
                             "name": "Déclencheur",
-                            "type_select": "Type de déclencheur",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1625,18 +1636,18 @@
                                     "label": "Template",
                                     "value_template": "Contenu du template"
                                 },
-                                "time_pattern": {
-                                    "hours": "Heures",
-                                    "label": "Modèle de temps",
-                                    "minutes": "Minutes",
-                                    "seconds": "Secondes"
-                                },
                                 "time": {
                                     "at": "À",
                                     "label": "Heure",
                                     "type_input": "Valeur d'une entrée de date/heure",
                                     "type_value": "Temps fixe"
                                 },
+                                "time_pattern": {
+                                    "hours": "Heures",
+                                    "label": "Modèle de temps",
+                                    "minutes": "Minutes",
+                                    "seconds": "Secondes"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "ID Webhook"
@@ -1650,6 +1661,7 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Type de déclencheur",
                             "unsupported_platform": "Pas d'interface utilisateur pour la plateforme : {platform}"
                         },
                         "unsaved_confirm": "Vous avez des changements non enregistrés. Êtes-vous sûr de vouloir quitter?"
@@ -1782,6 +1794,7 @@
                             "instance_will_be_available": "Votre instance sera disponible sur",
                             "link_learn_how_it_works": "Apprenez comment ça marche",
                             "not_connected": "Non connecté",
+                            "reconnecting": "Reconnexion",
                             "remote_enabled": {
                                 "caption": "Se connecter automatiquement",
                                 "description": "Activez cette option pour vous assurer que votre instance de Home Assistant est toujours accessible à distance."
@@ -1812,9 +1825,9 @@
                             "loading": "Chargement ...",
                             "manage": "Gérer",
                             "no_hooks_yet": "Il semble que vous n'ayez pas encore de Webhooks. Commencez en configurer un ",
+                            "no_hooks_yet2": "ou en créant un",
                             "no_hooks_yet_link_automation": "automatisation webhook",
                             "no_hooks_yet_link_integration": "intégration basée sur un Webhook",
-                            "no_hooks_yet2": "ou en créant un",
                             "title": "Webhooks"
                         }
                     },
@@ -1929,41 +1942,13 @@
                     "description": "Unités de mesure, emplacement, fuseau horaire et autres paramètres généraux",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Avant d'activer cette fonction, prenez soin de visiter la page de documentation {link} afin de comprendre ce que vous envoyez et comment cela est conservé.",
-                                "header": "Analytique",
-                                "instance_id": "ID de l'instance: {huuid}",
-                                "introduction": "Partagez vos informations d'installation pour améliorer Home Assistant et nous aider à convaincre les fabricants d'ajouter des fonctionnalités de contrôle local et de confidentialité.",
-                                "learn_more": "En apprendre plus sur le traitement de vos données",
-                                "needs_base": "Vous devez activer l'analyse de base pour que cette option soit disponible",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID de l'instance, version et type d'installation.",
-                                        "title": "Analyse de base"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Partager les rapports d'accident et les informations de diagnostic",
-                                        "title": "Diagnostiques"
-                                    },
-                                    "statistics": {
-                                        "description": "Nombre total d’entités, d’utilisateurs et d’autres éléments utilisés.",
-                                        "title": "Statistiques d'utilisation"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Noms, versions et fonctionnalités.",
-                                        "title": "Intégrations et add-ons utilisés"
-                                    },
-                                    "usage": {
-                                        "description": "Noms et versions",
-                                        "title": "Intégrations utilisées"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Devise",
                                 "edit_requires_storage": "L'éditeur est désactivé car la configuration est stockée dans configuration.yaml.",
                                 "elevation": "Élévation",
                                 "elevation_meters": "mètres",
                                 "external_url": "URL externe",
+                                "find_currency_value": "Trouvez votre valeur",
                                 "imperial_example": "Fahrenheit, livres",
                                 "internal_url": "URL interne",
                                 "latitude": "Latitude",
@@ -2092,6 +2077,63 @@
                     "update": "Mettre à jour",
                     "update_device_error": "Échec de la mise à jour de l’appareil"
                 },
+                "energy": {
+                    "caption": "Énergie",
+                    "description": "Surveiller votre production et votre consommation d'énergie",
+                    "device_consumption": {
+                        "add_stat": "Choisir l’entité pour suivre l’énergie de",
+                        "dialog": {
+                            "selected_stat_intro": "Sélectionner l’entité qui représente la consommation d’énergie de l’appareil."
+                        },
+                        "learn_more": "Plus d’informations sur la façon de commencer.",
+                        "selected_stat": "Suivi de l'énergie pour",
+                        "sub": "Le suivi de la consommation d’énergie des appareils individuels permet à Home Assistant de décomposer votre consommation d’énergie par appareil.",
+                        "title": "Appareils individuels"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Utiliser une entité avec le prix actuel",
+                                "cost_entity_input": "Entité avec le prix actuel",
+                                "cost_number": "Utiliser un prix statique",
+                                "cost_number_input": "Prix par kWh",
+                                "cost_number_suffix": "{currency} /kWh",
+                                "cost_para": "Sélectionnez comment Home Assistant doit suivre les coûts de l'énergie consommée.",
+                                "cost_stat": "Utiliser une entité de suivi des coûts totaux",
+                                "cost_stat_input": "Coûts totaux Entité",
+                                "energy_stat": "Énergie consommée (kWh)",
+                                "header": "Configurer la consommation du réseau",
+                                "no_cost": "Ne pas suivre les coûts",
+                                "paragraph": "La consommation du réseau est l'énergie qui circule du réseau énergétique vers votre maison."
+                            },
+                            "to": {
+                                "cost_entity": "Utiliser une entité avec le taux actuel",
+                                "cost_entity_input": "Entité avec le taux actuel",
+                                "cost_number": "Utiliser un taux statique",
+                                "cost_number_input": "Tarif par kWh",
+                                "cost_number_suffix": "{currency} /kWh",
+                                "cost_para": "Récupérez-vous de l'argent lorsque vous restituez de l'énergie au réseau ?",
+                                "cost_stat": "Utiliser une entité qui suit le total de l'argent reçu",
+                                "cost_stat_input": "Entité de rémunération totale",
+                                "energy_stat": "Énergie restituée au réseau (kWh)",
+                                "header": "Configurer la production du réseau",
+                                "no_cost": "je ne récupère pas d'argent",
+                                "paragraph": "La production du réseau est l'énergie qui circule de vos panneaux solaires au réseau."
+                            }
+                        },
+                        "learn_more": "Plus d’informations sur la façon de commencer.",
+                        "sub": "Configurer la quantité d'énergie que vous consommez du réseau et, si vous produisez de l'énergie, redonnez au réseau. Cela permet à Home Assistant de suivre votre consommation d'énergie dans toute la maison.",
+                        "title": "Réseau électrique"
+                    },
+                    "solar": {
+                        "learn_more": "Plus d’informations sur la façon de commencer.",
+                        "stat_predicted_production": "Prévision de votre production d'énergie solaire",
+                        "stat_production": "Votre production d'énergie solaire",
+                        "stat_return_to_grid": "L'énergie solaire restituée au réseau",
+                        "sub": "Laissez Home Assistant surveiller vos panneaux solaires et vous donner un aperçu de leurs performances.",
+                        "title": "Panneaux solaires"
+                    }
+                },
                 "entities": {
                     "caption": "Entités",
                     "description": "Vue d'ensemble de toutes les entités connues.",
@@ -2142,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Effacer",
-                    "filtering_by": "Filtrage par",
-                    "show": "Montrer"
-                },
-                "hassio": {
-                    "button": "Configurer"
-                },
                 "header": "Configurer Home Assistant",
                 "helpers": {
                     "caption": "Entrées",
@@ -2199,16 +2233,11 @@
                     "server": "serveur",
                     "setup_time": "Temps de configuration",
                     "source": "Source:",
-                    "system_health_error": "Le composant System Health n'est pas chargé. Ajouter 'system_health:' à configuration.yaml",
                     "system_health": {
                         "manage": "Gérer",
                         "more_info": "plus d'infos"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "page d'intégration",
-                    "missing_zha": "Il manque le panneau de configuration de ZHA ? Il a été déplacé vers l'entrée ZHA sur la {integrations_page}.",
-                    "missing_zwave": "Il manque le panneau de configuration Z-Wave ? Il a été déplacé vers l'entrée Z-Wave sur la {integrations_page}."
+                    },
+                    "system_health_error": "Le composant System Health n'est pas chargé. Ajouter 'system_health:' à configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Ajouter l'intégration",
@@ -2223,8 +2252,6 @@
                         "depends_on_cloud": "Dépend du cloud",
                         "device_unavailable": "Appareil non disponible",
                         "devices": "{count} {count, plural,\n  one {appareil}\n  other {appareils}\n}",
-                        "disable_error": "Échec de l’activation ou de la désactivation de l’intégration",
-                        "disable_restart_confirm": "Redémarrez Home Assistant pour terminer la désactivation de cette intégration",
                         "disable": {
                             "disable_confirm": "Voulez-vous vraiment désactiver cette entrée de configuration? Ses appareils et entités seront désactivés.",
                             "disabled": "Désactivé",
@@ -2235,18 +2262,18 @@
                             },
                             "disabled_cause": "Désactivé par {cause}"
                         },
-                        "disabled_polling": "Francais",
+                        "disable_error": "Échec de l’activation ou de la désactivation de l’intégration",
+                        "disable_restart_confirm": "Redémarrez Home Assistant pour terminer la désactivation de cette intégration",
+                        "disabled_polling": "Interrogation automatique des données mises à jour désactivée",
                         "documentation": "Documentation",
                         "enable_restart_confirm": "Redémarrez Home Assistant pour terminer l'activation de cette intégration",
                         "entities": "{count} {count, plural,\n  one {entity}\n  other {entities}\n}",
                         "entity_unavailable": "Entité indisponible",
                         "firmware": "Firmware: {version}",
                         "hub": "Connecté via",
-                        "logs": "journaux",
                         "manuf": "par {manufacturer}",
                         "no_area": "Pas de zone",
                         "not_loaded": "Non chargé",
-                        "options": "Options",
                         "provided_by_custom_integration": "Fourni par une intégration personnalisée",
                         "reload": "Recharger",
                         "reload_confirm": "L'intégration a été rechargée",
@@ -2278,7 +2305,11 @@
                             "open_site": "Ouvrir le site"
                         },
                         "finish": "Terminer",
-                        "loading_first_time": "Veuillez patienter pendant que l'intégration est en cours d'installation",
+                        "loading": {
+                            "fallback_title": "l'intégration",
+                            "loading_flow": "Veuillez patienter pendant la configuration de {integration}",
+                            "loading_step": "Chargement de l'étape suivante pour {integration}"
+                        },
                         "next": "Suivant",
                         "not_all_required_fields": "Tous les champs obligatoires ne sont pas renseignés.",
                         "not_loaded": "Cette intégration ne peut être chargée, essayez de redémarrer Home Assistant",
@@ -2295,7 +2326,6 @@
                     "details": "Détails de l'intégration",
                     "disable": {
                         "disabled_integrations": "{number} désactivé",
-                        "hide_disabled": "Masquer les intégrations désactivées",
                         "show": "Montrer",
                         "show_disabled": "Afficher les intégrations désactivées"
                     },
@@ -2306,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Arrêter d'ignorer {name} ?",
                         "confirm_ignore": "Êtes-vous sûr de ne pas vouloir configurer cette intégration? Vous pouvez annuler cela en cliquant sur «Afficher les intégrations ignorées» dans le menu de débordement en haut à droite.",
                         "confirm_ignore_title": "Ignorer la découverte de {name} ?",
-                        "hide_ignored": "Masquer les intégrations ignorées",
                         "ignore": "Ignorer",
                         "ignored": "Ignoré",
                         "show_ignored": "Afficher les intégrations ignorées",
@@ -2426,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configurer",
                     "description_listen": "Écouter un sujet",
                     "description_publish": "Publier un paquet",
                     "listening_to": "Écouter",
@@ -2440,7 +2468,6 @@
                     "topic": "sujet"
                 },
                 "ozw": {
-                    "button": "Configurer",
                     "common": {
                         "controller": "Contrôleur",
                         "instance": "Instance",
@@ -2465,6 +2492,11 @@
                         "nodes": "Nœuds",
                         "select_instance": "Sélectionnez une instance"
                     },
+                    "network": {
+                        "header": "Gestion du réseau",
+                        "introduction": "Gérer les fonctions de niveau réseau.",
+                        "node_count": "{count} nœuds"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Tous les nœuds ont été interrogés",
@@ -2485,10 +2517,9 @@
                         "starting": "Démarrage",
                         "unknown": "Inconnu"
                     },
-                    "network": {
-                        "header": "Gestion du réseau",
-                        "introduction": "Gérer les fonctions de niveau réseau.",
-                        "node_count": "{count} nœuds"
+                    "node": {
+                        "button": "Détails du nœud",
+                        "not_found": "Nœud introuvable"
                     },
                     "node_config": {
                         "header": "Configuration du nœud",
@@ -2518,10 +2549,6 @@
                         "versions": "Obtention d'informations sur les versions des microprogrammes et des classes de commande",
                         "wakeup": "Configuration de la prise en charge des files d'attente et des messages de réveil"
                     },
-                    "node": {
-                        "button": "Détails du nœud",
-                        "not_found": "Nœud introuvable"
-                    },
                     "nodes_table": {
                         "failed": "Échec",
                         "id": "ID",
@@ -2619,7 +2646,7 @@
                         "delete_confirm": "Êtes-vous sûr de vouloir supprimer cette scène?",
                         "delete_scene": "Supprimer la scène",
                         "duplicate": "Dupliquer",
-                        "duplicate_scene": "Dupliquée la scène",
+                        "duplicate_scene": "Dupliquer la scène",
                         "edit_scene": "Éditer la scène",
                         "header": "Éditeur de scène",
                         "headers": {
@@ -2664,10 +2691,12 @@
                         },
                         "save_script": "Enregistrer le script",
                         "sequence": "Séquence",
-                        "sequence_sentence": "La séquence d'actions de ce script."
+                        "sequence_sentence": "La séquence d'actions de ce script.",
+                        "show_trace": "Afficher la trace"
                     },
                     "picker": {
                         "add_script": "Ajouter un  script",
+                        "dev_script": "Script de débogage",
                         "duplicate": "Dupliquer",
                         "duplicate_script": "Dupliquer le script",
                         "edit_script": "Éditer le script",
@@ -2824,7 +2853,6 @@
                         "search_again": "Rechercher à nouveau",
                         "spinner": "Recherche de périphériques ZHA Zigbee ..."
                     },
-                    "button": "Configurer",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attributs du cluster sélectionné",
                         "get_zigbee_attribute": "Obtenir l'attribut Zigbee",
@@ -2854,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Raccourcis",
-                        "update_button": "Configuration de mise à jour",
-                        "zha_options": {
-                            "default_light_transition": "Temps de transition de la lumière par défaut (en secondes)",
-                            "enable_identify_on_join": "Activer l'effet d'identification quand les appareils rejoignent le réseau",
-                            "title": "Options générales"
-                        }
+                        "update_button": "Configuration de mise à jour"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuration terminée",
@@ -2941,110 +2964,7 @@
                     "introduction": "Les zones vous permettent de spécifier certaines régions sur la terre. Lorsqu'une personne se trouve dans une zone, l'état prend le nom de la zone. Les zones peuvent également être utilisées comme déclencheur ou condition dans les configurations d'automatisation.",
                     "no_zones_created_yet": "Il semble que vous n'ayez pas encore créé de zones."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Annuler l'inclusion",
-                        "controller_in_inclusion_mode": "Votre contrôleur Z-Wave est maintenant en mode inclusion.",
-                        "follow_device_instructions": "Suivez les instructions fournies avec votre appareil pour déclencher l'appairage sur l'appareil.",
-                        "inclusion_failed": "Le nœud n'a pas pu être ajouté. Veuillez consulter les journaux pour plus d'informations.",
-                        "inclusion_finished": "Le nœud a été ajouté. Quelques minutes peuvent s'écouler avant que toutes les entités n'apparaissent, alors que nous terminons la mise en place du nœud en arrière-plan.",
-                        "interview_failed": "L'interrogation de l'appareil a échoué. Des informations additionnelles peuvent être disponibles dans les journaux.",
-                        "interview_started": "L'appareil est en cours d'interrogation. Cela peut prendre du temps.",
-                        "introduction": "Cet assistant vous guidera dans l'ajout d'un nœud à votre réseau Z-Wave.",
-                        "secure_inclusion_warning": "Les dispositifs sécurisés nécessitent une bande passante supplémentaire ; un trop grand nombre de dispositifs sécurisés peut ralentir votre réseau Z-Wave. Nous recommandons de n'utiliser l'inclusion sécurisée que pour les dispositifs qui en ont besoin, comme les serrures ou les ouvre-portes de garage.",
-                        "start_inclusion": "Commencer l'inclusion",
-                        "start_secure_inclusion": "Commencer l'inclusion sécurisée",
-                        "title": "Ajouter un nœud Z-Wave",
-                        "use_secure_inclusion": "Utiliser l'inclusion sécurisée",
-                        "view_device": "Afficher l'appareil"
-                    },
-                    "button": "Configurer",
-                    "common": {
-                        "add_node": "Ajouter un nœud",
-                        "close": "Fermer",
-                        "home_id": "ID de la maison",
-                        "network": "Réseau",
-                        "node_id": "ID du nœud",
-                        "reconfigure_server": "Reconfigurer le serveur",
-                        "remove_node": "Supprimer le nœud"
-                    },
-                    "dashboard": {
-                        "driver_version": "Version du pilote",
-                        "dump_dead_nodes_text": "Certains de vos nœuds n'ont pas répondu et sont supposés morts. Ils ne seront pas entièrement exportés.",
-                        "dump_dead_nodes_title": "Certains de vos nœuds sont morts",
-                        "dump_debug": "Téléchargez un vidage de votre réseau pour aider à diagnostiquer les problèmes",
-                        "dump_not_ready_confirm": "Télécharger",
-                        "dump_not_ready_text": "Si vous créez une exportation alors que tous les nœuds ne sont pas prêts, vous risquez de manquer les données nécessaires. Donnez à votre réseau le temps d'interroger tous les nœuds. Voulez-vous continuer le vidage?",
-                        "dump_not_ready_title": "Tous les nœuds ne sont pas encore prêts",
-                        "header": "Gérez votre réseau Z-Wave",
-                        "home_id": "ID de la maison",
-                        "introduction": "Gérez votre réseau Z-Wave et vos nœuds Z-Wave",
-                        "nodes_ready": "Les nœuds sont prêts",
-                        "server_version": "Version du serveur"
-                    },
-                    "device_info": {
-                        "device_config": "Configurer l'appareil",
-                        "node_ready": "Nœud prêt",
-                        "node_status": "État du nœud",
-                        "zwave_info": "Informations Z-Wave"
-                    },
-                    "logs": {
-                        "log_level": "Niveau du journal",
-                        "log_level_changed": "Niveau de journal modifié en : {level}",
-                        "subscribed_to_logs": "S'abonner aux messages du journal Z-Wave JS",
-                        "title": "Journaux Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "Journaux",
-                        "network": "Réseau"
-                    },
-                    "network_status": {
-                        "connected": "Connecté",
-                        "connecting": "Connexion",
-                        "unknown": "Inconnu"
-                    },
-                    "node_config": {
-                        "attribution": "Les paramètres et descriptions de configuration des appareils sont fournis par {device_database}",
-                        "battery_device_notice": "Les appareils à batterie doivent être réveillés pour mettre à jour leur configuration. Veuillez consulter le manuel de votre appareil pour savoir comment réveiller l'appareil.",
-                        "error_device_not_found": "Appareil non trouvé",
-                        "header": "Configuration du périphérique Z-Wave",
-                        "introduction": "Gérer et ajuster les paramètres de configuration spécifiques au périphérique (nœud) pour le périphérique sélectionné",
-                        "parameter_is_read_only": "Ce paramètre est en lecture seule.",
-                        "set_param_accepted": "Le paramètre a été mis à jour.",
-                        "set_param_error": "Une erreur s'est produite.",
-                        "set_param_queued": "La modification du paramètre a été mise en file d'attente et sera mise à jour lorsque l'appareil se réveillera.",
-                        "zwave_js_device_database": "Base de données de périphériques Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Actif",
-                        "asleep": "Endormi",
-                        "awake": "Éveillé",
-                        "dead": "Mort",
-                        "unknown": "Inconnu"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Vous allez avoir besoin de réveiller les appareils sur batterie avant de commencer le processus de réinterrogation. Consultez le manuel de l'appareil pour connaître la procédure.",
-                        "in_progress": "L'appareil est en cours d'interrogation. Cela peut prendre du temps.",
-                        "interview_complete": "Processus d'interrogation de l'appareil terminé.",
-                        "interview_failed": "L'interrogation de l'appareil a échoué. Des informations additionnelles peuvent être disponibles dans les journaux.",
-                        "introduction": "Réinterroger un appareil sur votre réseau Z-Wave. Utilisez cette fonctionnalité si votre appareil a des fonctionnalités manquantes ou incorrectes.",
-                        "run_in_background": "Vous pouvez fermer cette fenêtre pendant que le processus d'interrogation se poursuivra en arrière-plan.",
-                        "start_reinterview": "Démarrer le processus de réinterrogation",
-                        "title": "Réinterroger un appareil Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Annuler l'exclusion",
-                        "controller_in_exclusion_mode": "Votre contrôleur Z-Wave est maintenant en mode exclusion.",
-                        "exclusion_failed": "Le nœud n'a pas pu être supprimé. Veuillez consulter les journaux pour plus d'informations.",
-                        "exclusion_finished": "Le nœud {id} a été supprimé de votre réseau Z-Wave.",
-                        "follow_device_instructions": "Suivez les instructions fournies avec votre appareil pour déclencher une exclusion sur l'appareil.",
-                        "introduction": "Supprimez un nœud de votre réseau Z-Wave et supprimez l’appareil et les entités associés de Home Assistant.",
-                        "start_exclusion": "Commencer l'exclusion",
-                        "title": "Supprimer un nœud Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Configurer",
                     "common": {
                         "index": "Index",
                         "instance": "Instance",
@@ -3133,6 +3053,144 @@
                     "values": {
                         "header": "Valeurs des nœuds"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Annuler l'inclusion",
+                        "controller_in_inclusion_mode": "Votre contrôleur Z-Wave est maintenant en mode inclusion.",
+                        "follow_device_instructions": "Suivez les instructions fournies avec votre appareil pour déclencher l'appairage sur l'appareil.",
+                        "inclusion_failed": "Le nœud n'a pas pu être ajouté. Veuillez consulter les journaux pour plus d'informations.",
+                        "inclusion_finished": "Le nœud a été ajouté. Quelques minutes peuvent s'écouler avant que toutes les entités n'apparaissent, alors que nous terminons la mise en place du nœud en arrière-plan.",
+                        "interview_failed": "L'interrogation de l'appareil a échoué. Des informations additionnelles peuvent être disponibles dans les journaux.",
+                        "interview_started": "L'appareil est en cours d'interrogation. Cela peut prendre du temps.",
+                        "introduction": "Cet assistant vous guidera dans l'ajout d'un nœud à votre réseau Z-Wave.",
+                        "secure_inclusion_warning": "Les dispositifs sécurisés nécessitent une bande passante supplémentaire ; un trop grand nombre de dispositifs sécurisés peut ralentir votre réseau Z-Wave. Nous recommandons de n'utiliser l'inclusion sécurisée que pour les dispositifs qui en ont besoin, comme les serrures ou les ouvre-portes de garage.",
+                        "start_inclusion": "Commencer l'inclusion",
+                        "start_secure_inclusion": "Commencer l'inclusion sécurisée",
+                        "title": "Ajouter un nœud Z-Wave",
+                        "use_secure_inclusion": "Utiliser l'inclusion sécurisée",
+                        "view_device": "Afficher l'appareil"
+                    },
+                    "common": {
+                        "add_node": "Ajouter un nœud",
+                        "close": "Fermer",
+                        "heal_network": "Réseau de guérison",
+                        "home_id": "ID de la maison",
+                        "network": "Réseau",
+                        "node_id": "ID du nœud",
+                        "reconfigure_server": "Reconfigurer le serveur",
+                        "remove_node": "Supprimer le nœud",
+                        "source": "source"
+                    },
+                    "dashboard": {
+                        "driver_version": "Version du pilote",
+                        "dump_dead_nodes_text": "Certains de vos nœuds n'ont pas répondu et sont supposés morts. Ils ne seront pas entièrement exportés.",
+                        "dump_dead_nodes_title": "Certains de vos nœuds sont morts",
+                        "dump_debug": "Téléchargez un vidage de votre réseau pour aider à diagnostiquer les problèmes",
+                        "dump_not_ready_confirm": "Télécharger",
+                        "dump_not_ready_text": "Si vous créez une exportation alors que tous les nœuds ne sont pas prêts, vous risquez de manquer les données nécessaires. Donnez à votre réseau le temps d'interroger tous les nœuds. Voulez-vous continuer le vidage?",
+                        "dump_not_ready_title": "Tous les nœuds ne sont pas encore prêts",
+                        "header": "Gérez votre réseau Z-Wave",
+                        "home_id": "ID de la maison",
+                        "introduction": "Gérez votre réseau Z-Wave et vos nœuds Z-Wave",
+                        "nodes_ready": "Les nœuds sont prêts",
+                        "server_version": "Version du serveur"
+                    },
+                    "device_info": {
+                        "device_config": "Configurer l'appareil",
+                        "heal_node": "Guérir le nœud",
+                        "node_ready": "Nœud prêt",
+                        "node_status": "État du nœud",
+                        "reinterview_device": "Réinterviewer l'appareil",
+                        "remove_failed": "Supprimer le périphérique défaillant",
+                        "zwave_info": "Informations Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "La guérison du réseau a été annulée.",
+                        "healing_complete": "La guérison du réseau est terminée.",
+                        "healing_failed": "La guérison a échoué. Des informations supplémentaires peuvent être disponibles dans les journaux.",
+                        "in_progress": "La guérison du réseau est en cours. Cela prendra un certain temps.",
+                        "introduction": "Démarrez un traitement de réseau sur votre réseau Z-Wave. Une réparation du réseau obligera tous les appareils à recalculer leurs itinéraires vers le contrôleur et est recommandé si vous avez récemment déplacé des appareils ou votre contrôleur.",
+                        "run_in_background": "Vous pouvez fermer cette boîte de dialogue et la guérison du réseau se poursuivra en arrière-plan.",
+                        "start_heal": "Commencer à guérir",
+                        "stop_heal": "Arrêter de guérir",
+                        "title": "Guérissez votre réseau Z-Wave",
+                        "traffic_warning": "Le processus de guérison génère une grande quantité de trafic sur le réseau Z-Wave. Cela peut entraîner une réponse lente (ou pas du tout) des appareils pendant la guérison."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} a été guéri.",
+                        "healing_failed": "{device} n'a pas pu être réparé.",
+                        "healing_failed_check_logs": "Des informations supplémentaires peuvent être disponibles dans les journaux.",
+                        "in_progress": "La guérison de {device} est en cours.",
+                        "introduction": "Dites à {device} de mettre à jour ses routes vers le contrôleur. Cela peut aider à résoudre les problèmes de communication si vous avez récemment déplacé l'appareil ou votre contrôleur.",
+                        "network_heal_in_progress": "Une guérison du réseau Z-Wave est déjà en cours. Veuillez attendre la fin avant de réparer un appareil individuel.",
+                        "start_heal": "Dispositif de guérison",
+                        "title": "Guérir un appareil Z-Wave",
+                        "traffic_warning": "Le processus de guérison génère une grande quantité de trafic sur le réseau Z-Wave. Cela peut entraîner une réponse lente (ou pas du tout) des appareils pendant la guérison."
+                    },
+                    "logs": {
+                        "log_level": "Niveau du journal",
+                        "log_level_changed": "Niveau de journal modifié en : {level}",
+                        "subscribed_to_logs": "S'abonner aux messages du journal Z-Wave JS",
+                        "title": "Journaux Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Journaux",
+                        "network": "Réseau"
+                    },
+                    "network_status": {
+                        "connected": "Connecté",
+                        "connecting": "Connexion",
+                        "unknown": "Inconnu"
+                    },
+                    "node_config": {
+                        "attribution": "Les paramètres et descriptions de configuration des appareils sont fournis par {device_database}",
+                        "battery_device_notice": "Les appareils à batterie doivent être réveillés pour mettre à jour leur configuration. Veuillez consulter le manuel de votre appareil pour savoir comment réveiller l'appareil.",
+                        "error_device_not_found": "Appareil non trouvé",
+                        "header": "Configuration du périphérique Z-Wave",
+                        "introduction": "Gérer et ajuster les paramètres de configuration spécifiques au périphérique (nœud) pour le périphérique sélectionné",
+                        "parameter": "Paramètre",
+                        "parameter_is_read_only": "Ce paramètre est en lecture seule.",
+                        "set_param_accepted": "Le paramètre a été mis à jour.",
+                        "set_param_error": "Une erreur s'est produite.",
+                        "set_param_queued": "La modification du paramètre a été mise en file d'attente et sera mise à jour lorsque l'appareil se réveillera.",
+                        "zwave_js_device_database": "Base de données de périphériques Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Actif",
+                        "asleep": "Endormi",
+                        "awake": "Éveillé",
+                        "dead": "Mort",
+                        "unknown": "Inconnu"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Vous allez avoir besoin de réveiller les appareils sur batterie avant de commencer le processus de réinterrogation. Consultez le manuel de l'appareil pour connaître la procédure.",
+                        "in_progress": "L'appareil est en cours d'interrogation. Cela peut prendre du temps.",
+                        "interview_complete": "Processus d'interrogation de l'appareil terminé.",
+                        "interview_failed": "L'interrogation de l'appareil a échoué. Des informations additionnelles peuvent être disponibles dans les journaux.",
+                        "introduction": "Réinterroger un appareil sur votre réseau Z-Wave. Utilisez cette fonctionnalité si votre appareil a des fonctionnalités manquantes ou incorrectes.",
+                        "run_in_background": "Vous pouvez fermer cette fenêtre pendant que le processus d'interrogation se poursuivra en arrière-plan.",
+                        "start_reinterview": "Démarrer le processus de réinterrogation",
+                        "title": "Réinterroger un appareil Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "La suppression de l'appareil est en cours.",
+                        "introduction": "Supprimez un appareil défaillant de votre réseau Z-Wave. Utilisez-le si vous ne parvenez pas à exclure un périphérique normalement car il est défectueux.",
+                        "removal_failed": "L'appareil n'a pas pu être supprimé de votre réseau Z-Wave.",
+                        "removal_finished": "Le nœud {id} a été supprimé de votre réseau Z-Wave.",
+                        "remove_device": "Supprimer l’appareil",
+                        "title": "Supprimer un périphérique Z-Wave défaillant"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Annuler l'exclusion",
+                        "controller_in_exclusion_mode": "Votre contrôleur Z-Wave est maintenant en mode exclusion.",
+                        "exclusion_failed": "Le nœud n'a pas pu être supprimé. Veuillez consulter les journaux pour plus d'informations.",
+                        "exclusion_finished": "Le nœud {id} a été supprimé de votre réseau Z-Wave.",
+                        "follow_device_instructions": "Suivez les instructions fournies avec votre appareil pour déclencher une exclusion sur l'appareil.",
+                        "introduction": "Supprimez un nœud de votre réseau Z-Wave et supprimez l’appareil et les entités associés de Home Assistant.",
+                        "start_exclusion": "Commencer l'exclusion",
+                        "title": "Supprimer un nœud Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3215,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Retour en arrière",
-                "supervisor": {
-                    "ask": "Demandez de l’aide",
-                    "observer": "Vérifiez l'observateur",
-                    "reboot": "Essayez un redémarrage de l’hôte",
-                    "system_health": "Vérifier la santé du système",
-                    "title": "Impossible de charger le panneau du Superviseur!",
-                    "wait": "Si vous venez de commencer, assurez-vous d’avoir donné au Superviseur suffisamment de temps pour démarrer."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "La semaine dernière",
-                    "this_week": "Cette semaine",
-                    "today": "Aujourd'hui",
-                    "yesterday": "Hier"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "La semaine dernière",
-                    "this_week": "Cette semaine",
-                    "today": "Aujourd'hui",
-                    "yesterday": "Hier"
+            "energy": {
+                "charts": {
+                    "by_device": "Consommation par appareil",
+                    "solar": "Solaire",
+                    "stat_house_energy_meter": "Consommation totale d'énergie"
+                },
+                "setup": {
+                    "back": "Retour",
+                    "done": "Montrez-moi mon tableau de bord énergétique !",
+                    "next": "Suivant"
                 }
             },
             "lovelace": {
@@ -3353,7 +3396,6 @@
                         "entities": {
                             "description": "La carte Entités est le type de carte le plus courant. Il regroupe les éléments dans des listes.",
                             "edit_special_row": "Affichez les détails de cette ligne en cliquant sur le bouton Modifier",
-                            "entity_row_editor": "Modifier à l'aide de l'éditeur de code",
                             "entity_row": {
                                 "attribute": "Attribut",
                                 "button": "Bouton",
@@ -3365,6 +3407,7 @@
                                 "section": "Section",
                                 "weblink": "Lien Web"
                             },
+                            "entity_row_editor": "Modifier à l'aide de l'éditeur de code",
                             "name": "Entités",
                             "secondary_info_values": {
                                 "brightness": "Luminosité",
@@ -3391,6 +3434,7 @@
                         "gauge": {
                             "description": "La carte Jauge est une carte de base qui permet de voir visuellement les données des capteurs.",
                             "name": "Jauge",
+                            "needle_gauge": "Afficher comme jauge ?",
                             "severity": {
                                 "define": "Définir la sévérité ?",
                                 "green": "Vert",
@@ -3403,6 +3447,7 @@
                             "attribute": "Attribut",
                             "camera_image": "Entité caméra",
                             "camera_view": "Vue de la caméra",
+                            "days_to_show": "Jours à afficher",
                             "double_tap_action": "Double appui",
                             "entities": "Entités",
                             "entity": "Entité",
@@ -3516,6 +3561,10 @@
                             "integration_not_loaded": "Cette carte nécessite la mise en place de l'intégration `shopping_list`.",
                             "name": "Liste de courses"
                         },
+                        "statistics-graph": {
+                            "description": "La carte Graphique des statistiques vous permet d'afficher un graphique des statistiques pour chacune des entités répertoriées.",
+                            "name": "Graphique de statistiques"
+                        },
                         "thermostat": {
                             "description": "La carte Thermostat permet de contrôler votre entité de chauffage. Permettant de changer la température et le mode de l'entité.",
                             "name": "Thermostat"
@@ -3585,6 +3634,11 @@
                         "tab_badges": "Badges",
                         "tab_settings": "Paramètres",
                         "tab_visibility": "Visibilité",
+                        "type": "Type de vue",
+                        "types": {
+                            "panel": "Panneau (1 carte)",
+                            "sidebar": "Barre latérale"
+                        },
                         "visibility": {
                             "select_users": "Sélectionnez les utilisateurs qui devraient voir cette vue dans la navigation"
                         }
@@ -3639,7 +3693,6 @@
                         "unsaved_changes": "Modifications non enregistrées"
                     },
                     "save_config": {
-                        "cancel": "Annuler",
                         "close": "Fermer",
                         "empty_config": "Commencer par un tableau de bord vide",
                         "header": "Prenez le contrôle de votre Interface Lovelace",
@@ -3668,8 +3721,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Cela affiche la première carte en pleine largeur; les autres cartes de cette vue ne seront pas affichées.",
-                            "title": "Mode panneau?",
                             "warning_multiple_cards": "Cette vue contient plusieurs carte, mais un panneau d'affichage ne peut montrer que 1 carte."
                         }
                     }
@@ -3872,8 +3923,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Suivant",
-                    "intro": "Partagez les analyses de votre instance. Ces données seront accessibles au public à l' {link}"
+                    "finish": "Suivant"
                 },
                 "core-config": {
                     "button_detect": "Détecter",
@@ -3897,15 +3947,13 @@
                     "confirm_password": "Confirmez le mot de passe de l'instantané",
                     "description": "Vous pouvez également restaurer à partir d'un instantané précédent.",
                     "folders": "Dossiers",
-                    "full_snapshot": "Instantané complet",
                     "hide_log": "Masquer le journal",
                     "in_progress": "Restauration en cours",
-                    "partial_snapshot": "Instantané partiel",
-                    "password": "Mot de passe de l'instantané",
+                    "password": "Mot de passe",
                     "password_protection": "Protection par mot de passe",
-                    "select_type": "Sélectionnez les éléments à restaurer",
+                    "select_type": "Sélectionnez ce qu'il faut restaurer",
                     "show_log": "Afficher le journal",
-                    "type": "Type d'instantané"
+                    "type": "Type"
                 },
                 "user": {
                     "create_account": "Créer un compte",
@@ -3982,6 +4030,12 @@
                     "prompt_copy_token": "Copiez votre jeton d'accès. Il ne sera plus affiché à nouveau.",
                     "prompt_name": "Donnez un nom au jeton"
                 },
+                "mfa": {
+                    "confirm_disable": "Êtes-vous sûr de vouloir désactiver {name} ?",
+                    "disable": "Désactiver",
+                    "enable": "Activer",
+                    "header": "Modules d'authentification multi-facteurs"
+                },
                 "mfa_setup": {
                     "close": "Fermer",
                     "step_done": "Configuration terminée pour {step}",
@@ -3989,12 +4043,6 @@
                     "title_aborted": "Abandonné",
                     "title_success": "Succès !"
                 },
-                "mfa": {
-                    "confirm_disable": "Êtes-vous sûr de vouloir désactiver {name} ?",
-                    "disable": "Désactiver",
-                    "enable": "Activer",
-                    "header": "Modules d'authentification multi-facteurs"
-                },
                 "number_format": {
                     "description": "Définir le formatage des nombres",
                     "dropdown_label": "Format de nombre",
diff --git a/translations/frontend/fy.json b/translations/frontend/fy.json
index f179ab6ac8..c12d92bab3 100644
--- a/translations/frontend/fy.json
+++ b/translations/frontend/fy.json
@@ -1,4 +1,12 @@
 {
+    "config_entry": {
+        "disabled_by": {
+            "user": "Brûker"
+        }
+    },
+    "groups": {
+        "system-users": "Brûkers"
+    },
     "panel": {
         "config": "Konfiguraasje",
         "history": "Skiednis",
@@ -7,6 +15,14 @@
         "map": "Kaart",
         "shopping_list": "Boadskiplist"
     },
+    "state": {
+        "default": {
+            "off": "Út",
+            "on": "Oan",
+            "unavailable": "Net beskikber",
+            "unknown": "Ûnbekend"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -29,19 +45,44 @@
             "home": "Thús"
         }
     },
-    "state": {
-        "default": {
-            "off": "Út",
-            "on": "Oan",
-            "unavailable": "Net beskikber",
-            "unknown": "Ûnbekend"
-        }
-    },
     "supervisor": {
+        "addon": {
+            "dashboard": {
+                "capability": {
+                    "label": {
+                        "docker": "docker"
+                    }
+                },
+                "install": "ynstallearje",
+                "start": "start",
+                "stop": "stop"
+            },
+            "panel": {
+                "info": "Ynfo"
+            }
+        },
+        "backup": {
+            "create": "Meitsje",
+            "created": "Makke",
+            "delete_backup_confirm": "ferwiderje",
+            "failed_to_delete": "Ferwiderje is mislearre",
+            "selected": "{number} selekteare"
+        },
         "common": {
-            "close": "Slute"
+            "close": "Slute",
+            "no": "Nee",
+            "refresh": "Ferfarskje",
+            "restart": "Opnij starte",
+            "restart_name": "{Name} opnij starte",
+            "yes": "Ja"
         },
         "dialog": {
+            "network": {
+                "open": "Iepenje"
+            },
+            "registries": {
+                "username": "Brûkersnamme"
+            },
             "repositories": {
                 "add": "Tafoegje"
             },
@@ -50,24 +91,19 @@
                 "text": "Wolle jo de add-on opnij starte mei jo feroaringen?"
             },
             "update": {
-                "create_snapshot": "Meitsje in momintopname fan {name} foardat jo bywurkje",
-                "snapshot": "Momintopname",
-                "snapshotting": "Momintopname oanmeitsjen fan {name}",
                 "updating": "{name} bywurkje nei ferzje {version}"
             }
         },
         "my": {
             "error_addon_not_found": "Add-on net fûn"
         },
-        "snapshot": {
-            "created": "Makke",
-            "delete_snapshot_confirm": "ferwiderje",
-            "failed_to_delete": "Ferwiderje is mislearre",
-            "selected": "{number} selekteare"
-        },
         "system": {
+            "host": {
+                "change": "Feroarje"
+            },
             "supervisor": {
-                "search": "Sykje"
+                "search": "Sykje",
+                "warning": "Warskoging"
             }
         }
     },
@@ -121,12 +157,30 @@
                     "name": "Namme"
                 }
             },
+            "blueprint-picker": {
+                "add_user": "Brûker tafoegje"
+            },
+            "calendar": {
+                "today": "Hjoed"
+            },
             "data-table": {
                 "clear": "Opklearje"
             },
+            "date-range-picker": {
+                "ranges": {
+                    "last_week": "Foarige wike",
+                    "this_week": "Dizze wike",
+                    "today": "Hjoed",
+                    "yesterday": "Juster"
+                }
+            },
             "device-picker": {
                 "device": "Apparaat",
                 "toggle": "Skeakelje"
+            },
+            "user-picker": {
+                "add_user": "Brûker tafoegje",
+                "no_user": "Gjin brûker"
             }
         },
         "dialogs": {
@@ -135,6 +189,9 @@
             },
             "quick-bar": {
                 "commands": {
+                    "navigation": {
+                        "users": "Brûkers"
+                    },
                     "types": {
                         "navigation": "Navigearje",
                         "server_control": "Server"
@@ -223,12 +280,18 @@
                 },
                 "blueprint": {
                     "overview": {
+                        "headers": {
+                            "name": "Namme"
+                        },
                         "share_blueprint": "Diel blaudruk"
                     }
                 },
                 "cloud": {
                     "account": {
-                        "connecting": "Ferbine ..."
+                        "connecting": "Ferbine ...",
+                        "tts": {
+                            "try": "bisykje"
+                        }
                     },
                     "alexa": {
                         "title": "Alexa"
@@ -241,7 +304,10 @@
                     "data_table": {
                         "device": "Apparaat"
                     },
-                    "device_not_found": "Apparaat net fûn."
+                    "device_not_found": "Apparaat net fûn.",
+                    "disabled_by": {
+                        "user": "Gebrûker"
+                    }
                 },
                 "helpers": {
                     "types": {
@@ -254,7 +320,12 @@
                 },
                 "integrations": {
                     "config_entry": {
-                        "configure": "Ynstelle"
+                        "configure": "Ynstelle",
+                        "disable": {
+                            "disabled_by": {
+                                "user": "Gebrûker"
+                            }
+                        }
                     },
                     "disable": {
                         "show": "Toan"
@@ -303,12 +374,18 @@
                     }
                 },
                 "users": {
+                    "add_user": {
+                        "caption": "Brûker tafoegje"
+                    },
                     "editor": {
-                        "password_changed": "It wachtwurd is feroare!"
+                        "password_changed": "It wachtwurd is feroare!",
+                        "username": "Brûkersnamme"
                     },
                     "picker": {
                         "headers": {
-                            "name": "Namme"
+                            "is_owner": "Eigner",
+                            "name": "Namme",
+                            "username": "Brûkersnamme"
                         }
                     }
                 },
@@ -330,13 +407,6 @@
                     }
                 }
             },
-            "error": {
-                "supervisor": {
-                    "ask": "Om help freegje",
-                    "system_health": "Kontrolearje systeem sûnens",
-                    "title": "Koe it paniel Supervisor net lade!"
-                }
-            },
             "lovelace": {
                 "cards": {
                     "starting": {
diff --git a/translations/frontend/gl.json b/translations/frontend/gl.json
index 74b762b8e3..48096ff72d 100644
--- a/translations/frontend/gl.json
+++ b/translations/frontend/gl.json
@@ -164,6 +164,18 @@
                 "not_installed": "O complemento non está instalado"
             }
         },
+        "backup": {
+            "addons": "Complementos",
+            "could_not_create": "Non se puido crear unha instantánea",
+            "create": "Crear",
+            "create_blocked_not_running": "Non é posible crear unha instantánea neste momento porque o sistema está {state} .",
+            "enter_password": "Insira un contrasinal.",
+            "folders": "Carpetas",
+            "name": "Nome",
+            "password": "Contrasinal",
+            "password_protection": "Protección por contrasinal",
+            "type": "Tipo"
+        },
         "common": {
             "cancel": "Cancelar",
             "close": "Pechar",
@@ -255,9 +267,6 @@
                 "text": "¿Queres reiniciar o complemento cos teus cambios?"
             },
             "update": {
-                "create_snapshot": "Crea unha instantánea de {name} antes de actualizar",
-                "snapshot": "Instantánea",
-                "snapshotting": "Creando instantánea de {name}",
                 "updating": "Actualizando {name} á versión {version}"
             }
         },
@@ -269,38 +278,9 @@
         },
         "panel": {
             "dashboard": "Panel de control",
-            "snapshots": "Instantáneas",
             "store": "Tenda de complementos",
             "system": "Sistema"
         },
-        "snapshot": {
-            "addons": "Complementos",
-            "available_snapshots": "Instantáneas dispoñibles",
-            "could_not_create": "Non se puido crear unha instantánea",
-            "create": "Crear",
-            "create_blocked_not_running": "Non é posible crear unha instantánea neste momento porque o sistema está {state} .",
-            "create_snapshot": "Crear instantánea",
-            "description": "As instantáneas permiten facer copias de seguridade e restaurar facilmente todos os datos da súa instancia de Home Assistant.",
-            "enter_password": "Insira un contrasinal.",
-            "folder": {
-                "addons/local": "Complementos locais",
-                "homeassistant": "Configuración de Home Assistant",
-                "media": "Medios",
-                "share": "Compartir",
-                "ssl": "SSL"
-            },
-            "folders": "Carpetas",
-            "full_snapshot": "Instantánea completa",
-            "name": "Nome",
-            "no_snapshots": "Aínda non tes instantáneas.",
-            "partial_snapshot": "Instantánea parcial",
-            "password": "Contrasinal",
-            "password_protected": "Protexido por contrasinal",
-            "password_protection": "Protección por contrasinal",
-            "security": "Seguridade",
-            "type": "Tipo",
-            "upload_snapshot": "Subir instantánea"
-        },
         "store": {
             "missing_addons": "Faltan complementos? Activa o modo avanzado na páxina do teu perfil de usuario",
             "no_results_found": "Non se atoparon resultados en {repository} .",
@@ -488,6 +468,9 @@
                 "required": "Este campo é necesario",
                 "service_data": "Datos do servizo",
                 "target": "Obxectivos"
+            },
+            "statistic-picker": {
+                "learn_more": "Leer mas sobre estatísticas"
             }
         },
         "dialogs": {
@@ -618,42 +601,6 @@
                         "email_address": "Enderezo electrónico"
                     }
                 },
-                "core": {
-                    "section": {
-                        "core": {
-                            "analytics": {
-                                "documentation": "Antes de habilitalo, asegúrese de visitar a páxina de documentación de análise {link} para comprender o que está a enviar e como se almacena.",
-                                "header": "Analítica",
-                                "instance_id": "ID de instancia: {huuid}",
-                                "introduction": "Comparte analítica desde a túa instancia. Estes datos estarán dispoñibles publicamente en {link}",
-                                "learn_more": "Máis información sobre como se procesarán os teus datos.",
-                                "needs_base": "Debe habilitar a analítica base para que esta opción estea dispoñible",
-                                "preference": {
-                                    "base": {
-                                        "description": "Isto inclúe o ID de instancia, a versión e o tipo de instalación",
-                                        "title": "Analítica básica"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Comparte informes de fallos e información de diagnóstico",
-                                        "title": "Diagnóstico"
-                                    },
-                                    "statistics": {
-                                        "description": "Isto inclúe un reconto de elementos na súa instalación, para ver unha lista completa consulta a documentación",
-                                        "title": "Estatísticas de uso"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Isto inclúe os nomes e as capacidades das súas integracións e complementos",
-                                        "title": "Integracións e complementos usados"
-                                    },
-                                    "usage": {
-                                        "description": "Isto inclúe os nomes das túas integracións",
-                                        "title": "Integracións usadas"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
                 "devices": {
                     "confirm_disable_config_entry": "Non hai máis dispositivos para a entrada de configuración {entry_name} . Queres deshabilitar a entrada de configuración?",
                     "enabled_description": "Os dispositivos desactivados non se amosarán e as entidades que pertencen ao dispositivo desactivaranse e non se engadirán ao Asistente doméstico.",
@@ -664,6 +611,11 @@
                         }
                     }
                 },
+                "energy": {
+                    "solar": {
+                        "sub": "Permita a Home Assistant monitorear sus paneles solares y obtener "
+                    }
+                },
                 "entities": {
                     "picker": {
                         "filter": {
@@ -674,15 +626,8 @@
                         }
                     }
                 },
-                "filtering": {
-                    "show": "Amosar"
-                },
-                "hassio": {
-                    "button": "Configurar"
-                },
                 "integrations": {
                     "config_entry": {
-                        "disable_restart_confirm": "Reinicie o Home Assistant para rematar de desactivar esta integración",
                         "disable": {
                             "disable_confirm": "Seguro que queres desactivar esta entrada de configuración? Os seus dispositivos e entidades estarán desactivados.",
                             "disabled": "Desactivado",
@@ -693,8 +638,8 @@
                             },
                             "disabled_cause": "Desactivado por {cause}"
                         },
+                        "disable_restart_confirm": "Reinicie o Home Assistant para rematar de desactivar esta integración",
                         "enable_restart_confirm": "Reinicie o Home Assistant para rematar de habilitar esta integración",
-                        "logs": "rexistros",
                         "not_loaded": "Non cargado, comproba o {logs_link}"
                     },
                     "config_flow": {
@@ -709,7 +654,6 @@
                     "confirm_new": "¿Queres configurar {integration} ?",
                     "disable": {
                         "disabled_integrations": "{number} desactivado",
-                        "hide_disabled": "Ocultar integracións desactivadas",
                         "show": "Amosar",
                         "show_disabled": "Amosar as integracións desactivadas"
                     },
@@ -785,6 +729,17 @@
                         "refresh_topology": "Actualizar topoloxía"
                     }
                 },
+                "zwave": {
+                    "migration": {
+                        "ozw": {
+                            "header": "Migrar a OpenZWave",
+                            "introduction": "Este asistente axudarache a migrar da integración herdada de Z-Wave á integración OpenZWave que está actualmente en versión beta."
+                        }
+                    },
+                    "ozw_log": {
+                        "introduction": "Ver o rexistro. 0 é o mínimo (carga todo o rexistro) e 1000 é o máximo. Load amosará un rexistro estático e a cola actualizarase automaticamente co último número de liñas especificado no rexistro."
+                    }
+                },
                 "zwave_js": {
                     "device_info": {
                         "device_config": "Configurar dispositivo"
@@ -798,17 +753,6 @@
                         "parameter_is_read_only": "Este parámetro é de só lectura.",
                         "zwave_js_device_database": "Base de datos de dispositivos Z-Wave JS"
                     }
-                },
-                "zwave": {
-                    "migration": {
-                        "ozw": {
-                            "header": "Migrar a OpenZWave",
-                            "introduction": "Este asistente axudarache a migrar da integración herdada de Z-Wave á integración OpenZWave que está actualmente en versión beta."
-                        }
-                    },
-                    "ozw_log": {
-                        "introduction": "Ver o rexistro. 0 é o mínimo (carga todo o rexistro) e 1000 é o máximo. Load amosará un rexistro estático e a cola actualizarase automaticamente co último número de liñas especificado no rexistro."
-                    }
                 }
             },
             "developer-tools": {
@@ -830,17 +774,6 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Retornar",
-                "supervisor": {
-                    "ask": "Pide axuda",
-                    "observer": "Comprobe o observador",
-                    "reboot": "Tenta reiniciar o host",
-                    "system_health": "Comprobe a saúde do sistema",
-                    "title": "Non se puido cargar o panel de supervisores.",
-                    "wait": "Se estás principiando, asegúrate de terlle dado ao supervisor o tempo suficiente para comezar."
-                }
-            },
             "lovelace": {
                 "cards": {
                     "confirm_delete": "Seguro que queres eliminar esta tarxeta?",
@@ -1000,7 +933,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Amosar a primeira tarxeta en ancho completo. Non se amosarán outras tarxetas nesta vista, nin insignias.",
                             "warning_multiple_cards": "Esta vista contén máis dunha tarxeta, pero unha vista de panel só pode amosar 1 tarxeta."
                         }
                     }
@@ -1023,8 +955,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Seguinte",
-                    "intro": "Comparte análises desde a túa instancia. Estes datos estarán dispoñibles publicamente en {link}"
+                    "finish": "Seguinte"
                 },
                 "core-config": {
                     "intro_location": "Gustaríanos saber onde vives. Esta información axudará a amosar información e configurar automatismos baseados no sol. Estes datos nunca se comparten fóra da túa rede."
@@ -1032,7 +963,12 @@
                 "finish": "Rematar",
                 "next": "Seguinte",
                 "restore": {
-                    "show_log": "Amosar rexistro completo"
+                    "addons": "Complementos",
+                    "folders": "Carpetas",
+                    "password": "Contrasinal",
+                    "password_protection": "Protección por contrasinal",
+                    "show_log": "Amosar rexistro completo",
+                    "type": "Tipo"
                 }
             },
             "profile": {
diff --git a/translations/frontend/gsw.json b/translations/frontend/gsw.json
index 9ccc313ca6..26cab5cfec 100644
--- a/translations/frontend/gsw.json
+++ b/translations/frontend/gsw.json
@@ -10,6 +10,14 @@
         "shopping_list": "Ichoufsliste",
         "states": "Übersicht"
     },
+    "state": {
+        "default": {
+            "off": "Aus",
+            "on": "An",
+            "unavailable": "Nid verfüägbar",
+            "unknown": "Unbekannt"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -43,14 +51,6 @@
             "home": "Dahei"
         }
     },
-    "state": {
-        "default": {
-            "off": "Aus",
-            "on": "An",
-            "unavailable": "Nid verfüägbar",
-            "unknown": "Unbekannt"
-        }
-    },
     "ui": {
         "card": {
             "alarm_control_panel": {
@@ -144,6 +144,14 @@
             "refresh": "Neu laden"
         },
         "components": {
+            "date-range-picker": {
+                "ranges": {
+                    "last_week": "Letschti Wuche",
+                    "this_week": "Die Wuche",
+                    "today": "Hüt",
+                    "yesterday": "Geschder"
+                }
+            },
             "device-picker": {
                 "clear": "Lösche"
             },
@@ -157,6 +165,13 @@
             },
             "service-picker": {
                 "service": "Service"
+            },
+            "statistic-picker": {
+                "learn_more": "Meh über Statistike lehre",
+                "missing_entity": "Wieso isch mini Entity nit ufglischdet?",
+                "no_match": "Kei passendi Statistik gfunde",
+                "no_statistics": "Du hesch keini Statistike",
+                "statistic": "Statistik"
             }
         },
         "login-form": {
@@ -257,10 +272,24 @@
                         }
                     }
                 },
+                "core": {
+                    "section": {
+                        "core": {
+                            "core_config": {
+                                "currency": "Währig"
+                            }
+                        }
+                    }
+                },
                 "devices": {
                     "device_info": "Geräteinformationen",
                     "scripts": "Scripts"
                 },
+                "energy": {
+                    "device_consumption": {
+                        "title": "Einzelne Devices"
+                    }
+                },
                 "integrations": {
                     "caption": "Integratione",
                     "config_entry": {
diff --git a/translations/frontend/he.json b/translations/frontend/he.json
index 7d0a6ee401..4a5f0a884d 100644
--- a/translations/frontend/he.json
+++ b/translations/frontend/he.json
@@ -17,6 +17,7 @@
         "calendar": "לוח שנה",
         "config": "תצורה",
         "developer_tools": "כלים למפתחים",
+        "energy": "אנרגיה",
         "history": "היסטוריה",
         "logbook": "יומן רישום",
         "mailbox": "תיבת דואר",
@@ -26,6 +27,14 @@
         "shopping_list": "רשימת קניות",
         "states": "סקירה כללית"
     },
+    "state": {
+        "default": {
+            "off": "מופסק",
+            "on": "מופעל",
+            "unavailable": "לא זמין",
+            "unknown": "לא ידוע"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "לא בבית"
         }
     },
-    "state": {
-        "default": {
-            "off": "מופסק",
-            "on": "מופעל",
-            "unavailable": "לא זמין",
-            "unknown": "לא ידוע"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -119,7 +120,7 @@
                 },
                 "no_configuration": "הרחבה זו אינה חושפת תצורה עבורך כדי להתעסק עם...",
                 "options": {
-                    "edit_in_ui": "ערוך בממשק המשתמש",
+                    "edit_in_ui": "עריכה בממשק המשתמש",
                     "edit_in_yaml": "עריכה ב-YAML",
                     "header": "אפשרויות",
                     "invalid_yaml": "YAML לא חוקי",
@@ -267,6 +268,26 @@
                 "not_installed": "ההרחבה אינה מותקנת"
             }
         },
+        "backup": {
+            "addons": "תוספים",
+            "confirm_password": "אישור סיסמת גיבוי",
+            "could_not_create": "לא ניתן ליצור גיבוי",
+            "create": "צור",
+            "create_blocked_not_running": "יצירת גיבוי אינה אפשרית כרגע מכיוון שהמערכת במצב {state} .",
+            "created": "נוצר",
+            "delete_backup_confirm": "מחיקה",
+            "delete_selected": "מחק גיבויים שנבחרו",
+            "enter_password": "נא הזן סיסמה.",
+            "failed_to_delete": "המחיקה נכשלה",
+            "folders": "תיקיות",
+            "name": "שם נקודת גיבוי",
+            "password": "סיסמה",
+            "password_protection": "הגנה באמצעות סיסמה",
+            "passwords_not_matching": "הסיסמאות אינן תואמות",
+            "select_type": "בחר מה לשחזר",
+            "selected": "{number} נבחרו",
+            "type": "סוג נקודת גיבוי"
+        },
         "common": {
             "cancel": "ביטול",
             "close": "סגור",
@@ -351,14 +372,14 @@
                 "no_registries": "לא הוגדרו מאגרים",
                 "password": "סיסמה",
                 "registry": "מאגר",
-                "remove": "הסר",
+                "remove": "הסרה",
                 "title_add": "הוסף רישום מכולה חדשה",
                 "title_manage": "ניהול מאגרי מכולות",
                 "username": "שם משתמש"
             },
             "repositories": {
-                "add": "הוסף",
-                "remove": "הסר",
+                "add": "הוספה",
+                "remove": "הסרה",
                 "title": "נהל את מאגרי ההרחבות"
             },
             "restart_addon": {
@@ -366,9 +387,6 @@
                 "text": "האם ברצונך להפעיל מחדש את ההרחבה עם השינויים שביצעת?"
             },
             "update": {
-                "create_snapshot": "צור נקודת גיבוי עבור {name} לפני העדכון",
-                "snapshot": "נקודת גיבוי",
-                "snapshotting": "יוצר נקודת גיבוי עבור {name}",
                 "updating": "מעדכן את {name} לגרסה {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "לוח בקרה",
-            "snapshots": "גיבויים",
             "store": "חנות הרחבות",
             "system": "מערכת"
         },
-        "snapshot": {
-            "addons": "תוספים",
-            "available_snapshots": "גיבויים זמינים",
-            "confirm_password": "אישור סיסמת גיבוי",
-            "could_not_create": "לא ניתן ליצור גיבוי",
-            "create": "צור",
-            "create_blocked_not_running": "יצירת גיבוי אינה אפשרית כרגע מכיוון שהמערכת במצב {state} .",
-            "create_snapshot": "צור גיבוי",
-            "created": "נוצר",
-            "delete_selected": "מחק גיבויים שנבחרו",
-            "delete_snapshot_confirm": "מחיקה",
-            "delete_snapshot_text": "האם אתה רוצה למחוק {number} {number, plural,\n  one {גיבוי}\n  other {גיבויים}\n}?",
-            "delete_snapshot_title": "מחק גיבוי",
-            "description": "גיבויים מאפשרים לך לגבות ולשחזר בקלות את כל הנתונים של Home Assistant.",
-            "enter_password": "נא הזן סיסמה.",
-            "failed_to_delete": "המחיקה נכשלה",
-            "folder": {
-                "addons/local": "תוספות מקומיות",
-                "homeassistant": "תצורת Home Assistant",
-                "media": "תוכן",
-                "share": "שיתוף",
-                "ssl": "SSL"
-            },
-            "folders": "תיקיות",
-            "full_snapshot": "גיבוי מלא",
-            "name": "שם נקודת גיבוי",
-            "no_snapshots": "אין לך גיבויים כרגע.",
-            "partial_snapshot": "גיבוי חלקי",
-            "password": "סיסמה",
-            "password_protected": "מוגן באמצעות סיסמה",
-            "password_protection": "הגנה באמצעות סיסמה",
-            "passwords_not_matching": "הסיסמאות אינן תואמות",
-            "security": "אבטחה",
-            "select_type": "בחר מה לשחזר",
-            "selected": "{number} נבחרו",
-            "type": "סוג נקודת גיבוי",
-            "upload_snapshot": "טען גיבוי"
-        },
         "store": {
             "missing_addons": "חסרות הרחבות? אפשר מצב מתקדם בדף פרופיל המשתמש שלך",
             "no_results_found": "לא נמצאו תוצאות ב-{repository}.",
@@ -445,7 +424,7 @@
                 "docker_version": "גרסת Docker",
                 "emmc_lifetime_used": "eMMC Lifetime בשימוש",
                 "failed_to_get_hardware_list": "קבלת רשימת החומרה נכשלה",
-                "failed_to_import_from_usb": "ייבוא מ- USB נכשל",
+                "failed_to_import_from_usb": "ייבוא מ-USB נכשל",
                 "failed_to_reboot": "אתחול המארח נכשל",
                 "failed_to_set_hostname": "הגדרת שם המארח נכשלה",
                 "failed_to_shutdown": "כיבוי המארח נכשל",
@@ -486,7 +465,7 @@
                 "share_diagonstics_title": "עזור לשפר את Home Assistant",
                 "unhealthy_description": "הפעלת התקנה לא בריאה תגרום לבעיות. להלן רשימת הבעיות שנמצאו בהתקנה שלך, לחץ על הקישורים כדי ללמוד כיצד תוכל לפתור את הבעיות.",
                 "unhealthy_reason": {
-                    "docker": "סביבת ה- Docker אינה פועלת כראוי",
+                    "docker": "סביבת ה-Docker אינה פועלת כראוי",
                     "privileged": "אין הרשאות למפקח",
                     "setup": "הגדרת המפקח נכשלה",
                     "supervisor": "המפקח לא הצליח להתעדכן",
@@ -509,7 +488,7 @@
                     "systemd": "Systemd"
                 },
                 "unsupported_title": "אתה מפעיל התקנה שאינה נתמכת",
-                "update_supervisor": "עדכן את ה המפקח",
+                "update_supervisor": "עדכון המפקח",
                 "warning": "אזהרה"
             }
         }
@@ -540,11 +519,11 @@
             "climate": {
                 "aux_heat": "מסייע חום",
                 "away_mode": "מצב לא בבית",
-                "cooling": "{שם} קירור",
-                "current_temperature": "{שם} טמפרטורה נוכחית",
+                "cooling": "{name} קירור",
+                "current_temperature": "{name} טמפרטורה נוכחית",
                 "currently": "כעת",
                 "fan_mode": "מצב מאורר",
-                "heating": "{שם} חימום",
+                "heating": "{name} חימום",
                 "high": "גבוה",
                 "low": "נמוך",
                 "on_off": "הפעלה / כיבוי",
@@ -558,8 +537,8 @@
             },
             "counter": {
                 "actions": {
-                    "decrement": "הורד",
-                    "increment": "הוסף",
+                    "decrement": "הקטנה",
+                    "increment": "הגדלה",
                     "reset": "איפוס"
                 }
             },
@@ -579,7 +558,7 @@
                 "humidity": "יעד לחות",
                 "mode": "מצב",
                 "on_entity": "{name} דולק",
-                "target_humidity_entity": "{שם} לחות יעד"
+                "target_humidity_entity": "{name} לחות היעד"
             },
             "light": {
                 "brightness": "בהירות",
@@ -657,7 +636,7 @@
                 "cardinal_direction": {
                     "e": "מזרח",
                     "ene": "צפון מזרח",
-                    "ese": " דרום מזרח",
+                    "ese": "דרום מזרח",
                     "n": "צפון",
                     "ne": "צפון מזרח",
                     "nne": "צפון מזרח",
@@ -700,7 +679,7 @@
             "overflow_menu": "תפריט גולש",
             "previous": "הקודם",
             "refresh": "רענן",
-            "remove": "הסר",
+            "remove": "הסרה",
             "rename": "שנה שם",
             "save": "שמור",
             "skip": "דלג",
@@ -760,12 +739,18 @@
             },
             "date-range-picker": {
                 "end_date": "תאריך סיום",
+                "ranges": {
+                    "last_week": "בשבוע שעבר",
+                    "this_week": "השבוע",
+                    "today": "היום",
+                    "yesterday": "אתמול"
+                },
                 "select": "בחר",
                 "start_date": "תאריך התחלה"
             },
             "device-picker": {
                 "clear": "נקה",
-                "device": "מכשיר",
+                "device": "התקן",
                 "no_area": "אין אזור",
                 "no_devices": "אין לך מכשירים",
                 "no_match": "לא נמצאו מכשירים תואמים",
@@ -798,7 +783,7 @@
                     "changed_to_state": "שונה ל- {state}",
                     "cleared_device_class": "נוקה (לא זוהה {device_class} )",
                     "detected_device_class": "זוהה {device_class}",
-                    "is_closing": "נסגר",
+                    "is_closing": "סגור",
                     "is_opening": "נפתח",
                     "rose": "זרחה",
                     "set": "שקעה",
@@ -851,10 +836,10 @@
                 "documentation": "תיעוד",
                 "learn_adding_local_media": "למד עוד אודות הוספת מדיה ב-{documentation}.",
                 "local_media_files": "מקם את קבצי הווידאו, השמע והתמונה בספריית המדיה כדי שתוכל לעיין בהם ולהשמיע אותם בדפדפן או בנגני מדיה נתמכים.",
+                "media-player-browser": "סייר נגן המדיה",
                 "media_browsing_error": "שגיאת בסיור המדיה",
                 "media_not_supported": "נגן המדיה של הדפדפן אינו תומך בסוג מדיה זה",
                 "media_player": "נגן מדיה",
-                "media-player-browser": "סייר נגן המדיה",
                 "no_items": "אין פריטים",
                 "no_local_media_found": "לא נמצאה מדיה מקומית",
                 "no_media_folder": "נראה שעדיין לא יצרת ספריית מדיה.",
@@ -879,7 +864,7 @@
                 "filtered_by_entity": "ישות: {entity_name}"
             },
             "related-items": {
-                "area": "אֵזוֹר",
+                "area": "איזור",
                 "automation": "חלק מהאוטומציות הבאות",
                 "device": "מכשיר",
                 "entity": "ישויות קשורות",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "שירות"
             },
+            "statistic-picker": {
+                "learn_more": "למידע נוסף על סטטיסטיקות",
+                "missing_entity": "מדוע הישות שלי אינה מופיעה ברשימה?",
+                "no_match": "לא נמצאו סטטיסטיקות תואמות",
+                "no_statistics": "אין לך סטטיסטיקות.",
+                "statistic": "סטטיסטיקות"
+            },
+            "statistics_charts": {
+                "loading_statistics": "טוען סטטיסטיקה...",
+                "no_statistics_found": "לא נמצאו נתונים סטטיסטיים.",
+                "statistic_types": {
+                    "max": "מקסימום",
+                    "mean": "מתכוון",
+                    "min": "דקות",
+                    "sum": "סכום"
+                }
+            },
             "target-picker": {
                 "add_area_id": "בחר אזור",
                 "add_device_id": "בחר מכשיר",
@@ -935,7 +937,7 @@
                 "remove_entity_id": "הסר ישות"
             },
             "user-picker": {
-                "add_user": "הוסף משתמש",
+                "add_user": "הוספת משתמש",
                 "no_user": "אין משתמש",
                 "remove_user": "הסר משתמש"
             }
@@ -966,9 +968,9 @@
                     "confirm_delete": "האם אתה בטוח שברצונך למחוק רשומה זו?",
                     "delete": "מחק",
                     "device_disabled": "המכשיר של ישות זו מושבת.",
-                    "enabled_cause": "מושבת עקב {סיבה}.",
+                    "enabled_cause": "מושבת עקב {cause}.",
                     "enabled_delay_confirm": "הישויות המופעלות יתווספו ל-Home Assistant בעוד {delay} שניות",
-                    "enabled_description": "ישויות מושבתות לא יתווספו ל Home Assistant.",
+                    "enabled_description": "ישויות מושבתות לא יתווספו ל-Home Assistant.",
                     "enabled_label": "הפוך ישות לזמינה",
                     "enabled_restart_confirm": "הפעל מחדש את Assistant Home כדי להפוך את היישויות לזמינות",
                     "entity_id": "מזהה ישות",
@@ -1016,7 +1018,7 @@
                     "max": "ערך מקסימאלי",
                     "min": "ערך מינימלי",
                     "mode": "מצב תצוגה",
-                    "slider": "סליידר",
+                    "slider": "מחוון",
                     "step": "גודל צעד",
                     "unit_of_measurement": "יחידת מידה"
                 },
@@ -1065,11 +1067,11 @@
                     "activity": "פעילות נוכחית"
                 },
                 "restored": {
-                    "confirm_remove_text": "האם אתה בטוח שברצונך להסיר ישות זו?",
+                    "confirm_remove_text": "האם בוודאות ברצונך להסיר ישות זו?",
                     "confirm_remove_title": "להסיר את הישות?",
-                    "not_provided": "ישות זו אינה זמינה כרגע והיא בת לאינטגרציה או מכשיר שהוסרו, השתנו או לא מתפקדים.",
+                    "not_provided": "ישות זו אינה זמינה כעת והיא יתומה משילוב או התקן שהוסרו, שונו או לא מתפקדים.",
                     "remove_action": "הסר יישות",
-                    "remove_intro": "אם הישות כבר אינה בשימוש, תוכלו לנקות אותה על ידי הסרתה."
+                    "remove_intro": "אם הישות כבר אינה בשימוש, ניתן לנקות אותה על ידי הסרתה."
                 },
                 "script": {
                     "last_action": "פעולה אחרונה",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "אפשרויות"
                 },
+                "loading": {
+                    "loading_flow": "יש להמתין בזמן שמתבצע אתחול עבור אפשרויות {integration}",
+                    "loading_step": "טוען את השלב הבא עבור {integration}"
+                },
                 "success": {
                     "description": "האפשרויות נשמרו בהצלחה."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "כללי",
                         "customize": "התאמות אישיות",
                         "devices": "התקנים",
+                        "energy": "אנרגיה",
                         "entities": "ישויות",
                         "helpers": "מסייעים",
                         "info": "מידע",
                         "integrations": "שילובים",
                         "logs": "יומנים",
                         "lovelace": "לוחות הבקרה של Lovelace",
-                        "navigate_to": "נווט אל {panel}",
                         "person": "אנשים",
                         "scene": "סצנות",
                         "script": "סקריפטים",
@@ -1215,9 +1221,9 @@
                 "power_source": "מקור כוח",
                 "quirk": "מוזרות",
                 "services": {
-                    "reconfigure": "הגדר מחדש את המכשיר ה- ZHA (ריפוי מכשיר). השתמש בזה אם אתה נתקל בבעיות במכשיר. אם המכשיר המדובר הוא מכשיר המונע על ידי סוללה, אנא וודא שהוא דלוק ומקבל פקודות בעת השימוש בשירות זה.",
+                    "reconfigure": "הגדרה מחדש של התקן ZHA (ריפוי מכשיר). השתמש בזה אם אתה נתקל בבעיות בהתקן. אם התקן המדובר הוא התקן המונע על ידי סוללה, ילש וודא שהוא פועל ומקבל פקודות בעת השימוש בשירות זה.",
                     "remove": "הסר מכשיר מרשת ה-Zigbee",
-                    "updateDeviceName": "הגדר שם מותאם אישית עבור מכשיר זה במאגר ההתקנים.",
+                    "updateDeviceName": "הגדרת שם מותאם אישית עבור התקן זה במאגר ההתקנים.",
                     "zigbee_information": "הצגת מידע Zigbee עבור ההתקן."
                 },
                 "unknown": "לא ידוע",
@@ -1231,7 +1237,7 @@
                 "bind_header": "קישור",
                 "button_hide": "הסתר פרטים",
                 "button_show": "הצג פרטים",
-                "cluster_header": "אֶשׁכּוֹל",
+                "cluster_header": "אשכול",
                 "configuration_complete": "קביעת התצורה הושלמה",
                 "configuration_failed": "קביעת התצורה מחדש של ההתקן נכשלה. ייתכן שמידע נוסף יהיה זמין ביומני הרישום.",
                 "configuring_alt": "הגדרת תצורה",
@@ -1289,8 +1295,8 @@
             "dismiss": "בטל",
             "integration_starting": "מפעיל את {integration} , לא הכל יהיה זמין עד לסיום.",
             "service_call_failed": "נכשלה הקריאה לשירות {service} .",
-            "started": "Home Assistant עלה!",
-            "starting": "Home Assistant בעלייה, ייתכן שלא הכל יהיה זמין עד שהעליה תסתיים",
+            "started": "Home Assistant אותחל!",
+            "starting": "Home Assistant באיתחול, לא הכל יהיה זמין עד שהאתחול תסתיים",
             "triggered": "הופעל {name}",
             "wrapping_up_startup": "סיום העליה, לא הכל יהיה זמין עד לסיום."
         },
@@ -1309,7 +1315,7 @@
                     },
                     "delete": {
                         "confirmation_text": "כל ההתקנים באזור זה לא יהיו מוקצים.",
-                        "confirmation_title": "האם אתה בטוח שברצונך למחוק אזור זה?"
+                        "confirmation_title": "האם בוודאות ברצונך למחוק אזור זה?"
                     },
                     "description": "קיבוץ התקנים וישויות לאזורים",
                     "editor": {
@@ -1360,7 +1366,6 @@
                             "introduction": "הפעולות הן מה שHome Assistant יעשה כאשר אוטומציה מופעלת.",
                             "learn_more": "למד עוד על פעולות",
                             "name": "פעולה",
-                            "type_select": "סוג פעולה",
                             "type": {
                                 "choose": {
                                     "add_option": "הוסף אפשרות",
@@ -1391,7 +1396,7 @@
                                         "title": "כותרת",
                                         "value": "ערך"
                                     },
-                                    "label": "מכשיר"
+                                    "label": "התקן"
                                 },
                                 "event": {
                                     "event": "אירוע:",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "חזור",
                                     "sequence": "פעולות",
-                                    "type_select": "סוג חזרה",
                                     "type": {
                                         "count": {
                                             "label": "ספירה"
@@ -1414,7 +1418,8 @@
                                             "conditions": "תנאיי כאשר",
                                             "label": "כל עוד"
                                         }
-                                    }
+                                    },
+                                    "type_select": "סוג חזרה"
                                 },
                                 "scene": {
                                     "label": "הפעל סצנה"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "תבנית זמן"
                                 }
                             },
+                            "type_select": "סוג פעולה",
                             "unsupported_action": "אין תמיכה בעורך חזותי לפעולה: {action}"
                         },
                         "alias": "שם",
@@ -1452,7 +1458,6 @@
                             "introduction": "התנאים הם אופציונליים וימנעו מהאוטומציה לפעול אלא אם כן כל התנאים מתקיימים.",
                             "learn_more": "למד עוד על תנאים",
                             "name": "תנאים",
-                            "type_select": "סוג תנאי",
                             "type": {
                                 "and": {
                                     "label": "וגם"
@@ -1466,7 +1471,7 @@
                                         "hvac_mode": "מצב HVAC",
                                         "preset_mode": "מצב מוגדר מראש"
                                     },
-                                    "label": "מכשיר"
+                                    "label": "התקן"
                                 },
                                 "not": {
                                     "label": "לא"
@@ -1524,6 +1529,7 @@
                                     "zone": "אזור"
                                 }
                             },
+                            "type_select": "סוג תנאי",
                             "unsupported_condition": "אין תמיכה בעורך חזותי בתנאי: {condition}"
                         },
                         "copy_to_clipboard": "העתק ללוח",
@@ -1537,7 +1543,7 @@
                         "enable_disable": "הפעל / השבת אוטומציה",
                         "introduction": "השתמש באוטומציות כדי לעורר את ביתך לחיים.",
                         "load_error_not_editable": "רק אוטומציה ב automations.yaml ניתנים לעריכה.",
-                        "load_error_unknown": "שגיאה בטעינת האוטומציה ( {err_no} ).",
+                        "load_error_unknown": "שגיאה בטעינת אוטומציה ({err_no}).",
                         "max": {
                             "parallel": "המספר המרבי של ריצות מקבילות",
                             "queued": "אורך התור"
@@ -1565,7 +1571,6 @@
                             "introduction": "טריגרים הם מה שמתחיל כל אוטומציה. ניתן לציין מספר טריגרים עבור אותו כלל. לאחר הפעלת טריגר, Home Assistant יאמת את התנאים, אם ישנם, ויפעיל את הפעולה.",
                             "learn_more": "למד עוד על טריגרים",
                             "name": "טריגר",
-                            "type_select": "סוג מפעיל",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1574,12 +1579,12 @@
                                         "for": "משך",
                                         "zone": "אזור"
                                     },
-                                    "label": "מכשיר",
+                                    "label": "התקן",
                                     "trigger": "טריגר"
                                 },
                                 "event": {
-                                    "context_user_pick": "בחר משתמש",
-                                    "context_user_picked": "אירוע שיגור של משתמש",
+                                    "context_user_pick": "בחירת משתמש",
+                                    "context_user_picked": "שיגור אירוע של משתמש",
                                     "context_users": "הגבל לאירועים שהופעלו על ידי",
                                     "event_data": "נתוני אירוע",
                                     "event_type": "סוג אירוע",
@@ -1625,24 +1630,24 @@
                                     "sunset": "שקיעה"
                                 },
                                 "tag": {
-                                    "label": "תג "
+                                    "label": "תג"
                                 },
                                 "template": {
                                     "label": "תבנית",
                                     "value_template": "ערך תבנית"
                                 },
-                                "time_pattern": {
-                                    "hours": "שעות",
-                                    "label": "תבנית זמן",
-                                    "minutes": "דקות",
-                                    "seconds": "שניות"
-                                },
                                 "time": {
                                     "at": "בזמן",
                                     "label": "זמן",
                                     "type_input": "הערך של עוזר תאריך/שעה",
                                     "type_value": "זמן קבוע"
                                 },
+                                "time_pattern": {
+                                    "hours": "שעות",
+                                    "label": "תבנית זמן",
+                                    "minutes": "דקות",
+                                    "seconds": "שניות"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1656,6 +1661,7 @@
                                     "zone": "אזור"
                                 }
                             },
+                            "type_select": "סוג מפעיל",
                             "unsupported_platform": "אין תמיכה בעורך חזותי עבור פלטפורמה: {platform}"
                         },
                         "unsaved_confirm": "יש לך שינויים שלא נשמרו. אתה בטוח שאתה רוצה לעזוב?"
@@ -1663,7 +1669,7 @@
                     "picker": {
                         "add_automation": "הוסף אוטומציה",
                         "delete_automation": "מחק אוטומציה",
-                        "delete_confirm": "האם אתה בטוח שברצונך למחוק אוטומציה זו?",
+                        "delete_confirm": "האם בוודאות ברצונך למחוק אוטומציה זו?",
                         "dev_automation": "דבג אוטומציה",
                         "dev_only_editable": "רק אוטומציות שהוקצה להן מזהה ייחודי ניתנות לדיבוג.",
                         "duplicate": "שכפל",
@@ -1692,7 +1698,7 @@
                             "error_unsupported": "לא יכולנו ליצור אוטומציה לזה (עדיין?).",
                             "for_example": "לדוגמה:",
                             "header": "צור אוטומציה חדשה",
-                            "introduction": "הקלד להלן את מה שאוטומציה זו צריכה לעשות, וננסה להמיר אותה לאוטומציה של Home Assistant.",
+                            "introduction": "יש להקליד להלן את מה שאוטומציה זו צריכה לעשות, וננסה להמיר אותה לאוטומציה של Home Assistant.",
                             "language_note": "הערה: רק אנגלית נתמכת לעת עתה."
                         }
                     }
@@ -1706,10 +1712,10 @@
                         "import_btn": "תצוגה מקדימה של שרטוט",
                         "import_header": "שרטוט \"{name}\"",
                         "import_introduction_link": "באפשרותך לייבא שרטוטים של משתמשים אחרים מ- Github ומ {community_link}. הזן את כתובת ה- URL של השרטוט.",
-                        "importing": "טוען שרטוט ...",
+                        "importing": "טוען שרטוט...",
                         "raw_blueprint": "תוכן שרטוט",
                         "save_btn": "יבוא שרטוט",
-                        "saving": "מייבא תכנית שרטוט ...",
+                        "saving": "מייבא תכנית שרטוט...",
                         "unsupported_blueprint": "שרטוט זה לא נתמך",
                         "url": "כתובת URL של השרטוט"
                     },
@@ -1738,8 +1744,8 @@
                     "account": {
                         "alexa": {
                             "config_documentation": "תיעוד תצורה",
-                            "disable": "השבתה",
-                            "enable": "אפשור",
+                            "disable": "מושבת",
+                            "enable": "מאופשר",
                             "enable_ha_skill": "הפעל את מיומנות Home Assistant עבור אלקסה",
                             "enable_state_reporting": "הפוך דיווח מצב לזמין",
                             "info": "עם האינטגרציה של Alexa עבור Home Assistant Cloud, תוכל לשלוט בכל מכשירי Home Assistant שלך באמצעות כל מכשיר המותאם לשימוש ב-Alexa.",
@@ -1762,7 +1768,7 @@
                             "enter_pin_error": "אין אפשרות לאחסן PIN:",
                             "enter_pin_hint": "הזן קוד PIN לשימוש בהתקני אבטחה",
                             "enter_pin_info": "נא הזן מספר זיהוי אישי (PIN) כדי לקיים אינטראקציה עם התקני אבטחה. מכשירי אבטחה הם דלתות, דלתות מוסך ומנעולים. תתבקש לומר/להזין מספר זיהוי אישי זה בעת אינטראקציה עם מכשירים כאלה באמצעות Google Assistant.",
-                            "info": "עם שילוב מסייע Google עבור ענן Home Assistant תוכל לשלוט בכל מכשירי Home Assistant שלך באמצעות כל מכשיר המקושר למסייע של Google.",
+                            "info": "עם שילוב מסייע Google עבור ענן Home Assistant ניתן לשלוט בכל התקני Home Assistant שלך באמצעות כל התקן המקושר למסייע של Google.",
                             "info_state_reporting": "אם תפעיל דיווח מצב, Home Assistant ישלח את כל שינויי המצבים של ישויות חשופות ל-Google. זה מאפשר לך תמיד לראות את המצבים האחרונים באפליקציה של גוגל.",
                             "manage_entities": "נהל ישויות",
                             "not_configured_text": "לפני שתוכל להשתמש ב- Google Assistant, עליך להפעיל את Home Assistant Cloud skill עבור Google Assistant באפליקציית Google Home.",
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "המופע שלך יהיה זמין ב",
                             "link_learn_how_it_works": "למד כיצד זה עובד",
                             "not_connected": "לא מחובר",
+                            "reconnecting": "מתחבר מחדש",
                             "remote_enabled": {
                                 "caption": "התחבר אוטומטית",
                                 "description": "אפשר אפשרות זו כדי לוודא שמופע ה-Home Assistant שלך תמיד נגיש מרחוק."
@@ -1817,10 +1824,10 @@
                             "link_learn_more": "למד עוד אודות יצירת אוטומציות המונעות על-ידי webhook.",
                             "loading": "טוען...",
                             "manage": "ניהול",
-                            "no_hooks_yet": "נראה שעדיין אין לך אף webhook. התחל על ידי קביעת התצורה של ",
+                            "no_hooks_yet": "נראה שעדיין אין לך webhooks. תחילת העבודה על ידי קביעת תצורה של ",
+                            "no_hooks_yet2": " או על ידי יצירת ",
                             "no_hooks_yet_link_automation": "אוטומצית webhook",
                             "no_hooks_yet_link_integration": "אינטגרציה מבוססת webhook",
-                            "no_hooks_yet2": " או על-ידי יצירת ",
                             "title": "Webhooks"
                         }
                     },
@@ -1850,11 +1857,11 @@
                     "dialog_cloudhook": {
                         "available_at": "ה-webhook זמין בכתובת הבאה:",
                         "close": "סגור",
-                        "confirm_disable": "אתה בטוח שאתה רוצה להשבית את ה webhook?",
+                        "confirm_disable": "אתה בןןדאות ברצונך להשבית את ה-webhook?",
                         "copied_to_clipboard": "הועתק ללוח",
                         "info_disable_webhook": "אם אינך מעוניין עוד להשתמש ב-webhook זה, באפשרותך",
                         "link_disable_webhook": "השבת אותו",
-                        "managed_by_integration": "webhook זה מנוהל על ידי אינטגרציה ואי אפשר להשבית אותו.",
+                        "managed_by_integration": "webhook זה מנוהל על ידי שילוב ולא ניתן להשבית.",
                         "view_documentation": "הצג תיעוד",
                         "webhook_for": "Webhook עבור {name}"
                     },
@@ -1897,7 +1904,7 @@
                         "password": "סיסמה",
                         "password_error_msg": "סיסמאות הן לפחות 8 תווים",
                         "sign_in": "היכנס",
-                        "start_trial": "התחל את תקופת הניסיון בחינם למשך חודש",
+                        "start_trial": "התחלת תקופת ניסיון בחינם למשך חודש",
                         "title": "כניסה לענן",
                         "trial_info": "אין צורך באמצעי תשלום"
                     },
@@ -1935,41 +1942,13 @@
                     "description": "מערכת היחידה, מיקום, אזור זמן ופרמטרים כלליים אחרים",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "לפני שתאפשר זאת וודא שאתה מבקר בדף תיעוד המידע {link} כדי להבין מה אתה שולח ואיך זה נשמר.",
-                                "header": "ניתוח",
-                                "instance_id": "מזהה מופע: {huuid}",
-                                "introduction": "שתף את פרטי ההתקנה שלך כדי לעזור לשפר את Home Assistant ולעזור לנו לשכנע יצרנים להוסיף שליטה מקומית ותכונות ממוקדות לפרטיות.",
-                                "learn_more": "כיצד אנו מעבדים את הנתונים שלך",
-                                "needs_base": "עליך לאפשר ניתוח בסיס כדי שאפשרות זו תהיה זמינה",
-                                "preference": {
-                                    "base": {
-                                        "description": "מזהה מופע, גרסה וסוג התקנה.",
-                                        "title": "ניתוח בסיסי"
-                                    },
-                                    "diagnostics": {
-                                        "description": "שתף דוחות קריסה כאשר מתרחשות שגיאות בלתי צפויות.",
-                                        "title": "אבחון"
-                                    },
-                                    "statistics": {
-                                        "description": "סך הכל ישויות בשימוש, משתמשים ואלמנטים אחרים.",
-                                        "title": "סטטיסטיקות שימוש"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "שמות, גרסאות ויכולות.",
-                                        "title": "שילובים ותוספות שבשימוש"
-                                    },
-                                    "usage": {
-                                        "description": "מידע אודות שמות וגרסאות",
-                                        "title": "אינטגרציות שבשימוש"
-                                    }
-                                }
-                            },
                             "core_config": {
-                                "edit_requires_storage": "העורך מושבת משום שהתצורה מאוחסנת ב- configuration.yaml.",
+                                "currency": "מטבע",
+                                "edit_requires_storage": "העורך מושבת משום שהתצורה מאוחסנת ב-configuration.yaml.",
                                 "elevation": "גובה",
                                 "elevation_meters": "מטר",
                                 "external_url": "כתובת URL חיצונית",
+                                "find_currency_value": "מצא את הערך שלך",
                                 "imperial_example": "פרנהייט, פאונד",
                                 "internal_url": "כתובת URL פנימית",
                                 "latitude": "קו רוחב",
@@ -1988,10 +1967,10 @@
                     }
                 },
                 "customize": {
-                    "attributes_customize": "התכונות הבאות מוגדרות כבר ב- customize.yaml",
+                    "attributes_customize": "התכונות הבאות מוגדרות כבר ב-customize.yaml",
                     "attributes_not_set": "התכונות הבאות לא הוגדרו. הגדר אותם אם תרצה.",
-                    "attributes_outside": "התכונות הבאות מותאמות אישית מחוץ ל- customize.yaml",
-                    "attributes_override": "אתה יכול לדרוס אותן אם תרצה.",
+                    "attributes_outside": "התכונות הבאות מותאמות אישית מחוץ ל-customize.yaml",
+                    "attributes_override": "ניתן לדרוס אותם כמובן.",
                     "attributes_set": "התכונות הבאות של הישות מוגדרות באופן תכנותי.",
                     "caption": "התאמות אישיות",
                     "description": "התאם אישית את הישויות שלך",
@@ -2004,7 +1983,7 @@
                     },
                     "warning": {
                         "include_link": "את customize.yaml באופן תקין",
-                        "include_sentence": "נראה כי ה- configuration.yaml שלך אינו כולל",
+                        "include_sentence": "נראה כי configuration.yaml אינו תקין",
                         "not_applied": "שינויים שבוצעו כאן כתובים בו, אך לא יחולו לאחר טעינה מחדש של תצורה אלא אם הכלל נמצא במקומו."
                     }
                 },
@@ -2025,9 +2004,9 @@
                         "create": "צור אוטומציה עם המכשיר",
                         "create_disable": "non posso creare automazioni condispositivi disabilitati",
                         "no_automations": "אין אוטומציות",
-                        "no_device_automations": "אין אוטומציות זמינות עבור מכשיר זה.",
+                        "no_device_automations": "אין אוטומציות זמינות עבור התקן זה.",
                         "triggers": {
-                            "caption": "עשה משהו כש ...",
+                            "caption": "תעשה משהו כש...",
                             "no_triggers": "אין טריגרים",
                             "unknown_trigger": "טריגר לא ידוע"
                         },
@@ -2042,7 +2021,7 @@
                     "data_table": {
                         "area": "אזור",
                         "battery": "סוללה",
-                        "device": "מכשיר",
+                        "device": "התקן",
                         "integration": "אינטגרציה",
                         "manufacturer": "יצרן",
                         "model": "מודל",
@@ -2051,7 +2030,7 @@
                     "delete": "מחיקה",
                     "description": "ניהול התקנים שתצורתם נקבעה",
                     "device_info": "פרטי התקן",
-                    "device_not_found": "המכשיר לא נמצא.",
+                    "device_not_found": "ההתקן לא נמצא.",
                     "disabled": "מושבת",
                     "disabled_by": {
                         "config_entry": "ערך תצורה",
@@ -2062,10 +2041,10 @@
                     "enabled_description": "מכשירים מושבתים לא יוצגו והישויות השייכות למכשיר יושבתו ולא יתווספו ל- Home Assistant.",
                     "enabled_label": "הפעל מכשיר",
                     "entities": {
-                        "add_entities_lovelace": "הוסף לממשק Lovelace",
-                        "disabled_entities": "+{count} {count, plural,\n  one {disabled entity}\n  other {disabled entities}\n}",
+                        "add_entities_lovelace": "הוספה לממשק Lovelace",
+                        "disabled_entities": "+{count} {count, plural,\n  one {ישות לא זמינה}\n  other {ישויות לא זמינות}\n}",
                         "entities": "ישויות",
-                        "hide_disabled": "הסתר מושבתים",
+                        "hide_disabled": "הסתרת מושבתים",
                         "none": "למכשיר זה אין ישויות"
                     },
                     "name": "שם",
@@ -2080,7 +2059,7 @@
                         "search": "חפש מכשירים"
                     },
                     "scene": {
-                        "create": "צור סצינה עם המכשיר",
+                        "create": "צור סצנה עם ההתקן",
                         "create_disable": "לא ניתן ליצור סצנה עם מכשיר מושבת",
                         "no_scenes": "אין סצנות",
                         "scenes": "סצנות"
@@ -2094,17 +2073,74 @@
                     },
                     "scripts": "סקריפטים",
                     "unknown_error": "שגיאה לא ידועה",
-                    "unnamed_device": "מכשיר ללא שם",
+                    "unnamed_device": "התקן ללא שם",
                     "update": "עדכון",
                     "update_device_error": "עדכון ההתקן נכשל"
                 },
+                "energy": {
+                    "caption": "אנרגיה",
+                    "description": "ניטור ייצור האנרגיה וצריכת האנרגיה שלך",
+                    "device_consumption": {
+                        "add_stat": "בחירת ישות למעקב אחר אנרגיה של",
+                        "dialog": {
+                            "selected_stat_intro": "יש לבחור את הישות המייצגת את צריכת האנרגיה של ההתקן."
+                        },
+                        "learn_more": "מידע נוסף כיצד להתחיל.",
+                        "selected_stat": "מעקב אחר אנרגיה עבור",
+                        "sub": "מעקב אחר צריכת האנרגיה של התקנים בודדים מאפשר ל-Home Assistant לפרק את צריכת האנרגיה שלך באמצעות התקן.",
+                        "title": "התקנים בודדים"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "שימוש בישות עם מחיר נוכחי",
+                                "cost_entity_input": "ישות עם המחיר הנוכחי",
+                                "cost_number": "שימוש במחיר סטטי",
+                                "cost_number_input": "מחיר לקוט\"ש",
+                                "cost_number_suffix": "{currency}/קוט\"ש",
+                                "cost_para": "בחר כיצד Home Assistant צריך לעקוב אחר העלויות של האנרגיה הנצרכת.",
+                                "cost_stat": "שימוש בישות העוקבת אחר העלויות הכוללות",
+                                "cost_stat_input": "סך כל ישות העלויות",
+                                "energy_stat": "אנרגיה נצרכת (קוט\"ש)",
+                                "header": "קביעת תצורה של צריכת רשת",
+                                "no_cost": "אל תעקוב אחר עלויות",
+                                "paragraph": "צריכת רשת היא האנרגיה הזורמת מרשת האנרגיה לביתך."
+                            },
+                            "to": {
+                                "cost_entity": "שימוש בישות עם תעריף נוכחי",
+                                "cost_entity_input": "ישות עם התעריף הנוכחי",
+                                "cost_number": "שימוש בקצב סטטי",
+                                "cost_number_input": "תעריף לקוט\"ש",
+                                "cost_number_suffix": "{currency}/קוט\"ש",
+                                "cost_para": "האם מחזירים לך כסף כאשר חוזרת אנרגיה לרשת?",
+                                "cost_stat": "שימוש בישות העוקבת אחר סך כל הכסף שהתקבל",
+                                "cost_stat_input": "סך כל ישות הפיצויים",
+                                "energy_stat": "אנרגיה שהוחזרה לרשת (קוט\"ש)",
+                                "header": "קביעת תצורה של ייצור רשת",
+                                "no_cost": "לא מחזירים לי כסף",
+                                "paragraph": "ייצור רשת הוא האנרגיה הזורמת מהלוחות הסולאריים שלך לרשת."
+                            }
+                        },
+                        "learn_more": "מידע נוסף כיצד להתחיל.",
+                        "sub": "הגדרת כמות האנרגיה הנצרכת מהרשת, וואם יש ייצור אנרגיה, להחזיר לרשת. הדבר מאפשר ל-Home Assistant לעקוב אחר כל צריכת האנרגיה הביתית שלך.",
+                        "title": "רשת חשמל"
+                    },
+                    "solar": {
+                        "learn_more": "מידע נוסף כיצד להתחיל.",
+                        "stat_predicted_production": "חיזוי ייצור האנרגיה הסולארית שלך",
+                        "stat_production": "ייצור האנרגיה הסולארית שלך",
+                        "stat_return_to_grid": "אנרגיה סולארית חזרה לרשת",
+                        "sub": "לתת ל-Home Assistant לפקח על הפאנלים הסולאריים שלך ולתת לך תובנות על הביצועים שלהם.",
+                        "title": "פאנלים סולאריים"
+                    }
+                },
                 "entities": {
                     "caption": "ישויות",
                     "description": "ניהול ישויות מוכרות",
                     "picker": {
                         "disable_selected": {
                             "button": "השבת מסומנים",
-                            "confirm_text": "ישויות מושבתות לא יתווספו ל Home Assistant.",
+                            "confirm_text": "ישויות מושבתות לא יתווספו ל-Home Assistant.",
                             "confirm_title": "האם אתה רוצה להשבית את ה{number} {number, plural,\n  one {ישות}\n  other {ישויות}\n}?"
                         },
                         "enable_selected": {
@@ -2116,13 +2152,13 @@
                             "filter": "סנן",
                             "hidden_entities": "{number} hidden {number, plural,\n  one {ישות}\n  other {ישויות}\n}",
                             "show_all": "הצג הכל",
-                            "show_disabled": "הצג ישויות מושבתות",
+                            "show_disabled": "הצגת ישויות מושבתות",
                             "show_readonly": "הצג ישויות לקריאה בלבד",
                             "show_unavailable": "הצג ישויות לא זמינות"
                         },
                         "header": "ישויות",
                         "headers": {
-                            "area": "אֵזוֹר",
+                            "area": "איזור",
                             "entity_id": "מזהה ישות",
                             "integration": "אינטגרציה",
                             "name": "שם",
@@ -2134,7 +2170,7 @@
                             "button": "הסר את המסומנים",
                             "confirm_partly_text": "אתה יכול להסיר רק את {removable} מהישויות שנבחרו {selected}. ניתן להסיר ישויות רק כאשר האינטגרציה כבר לא מספקת את הישויות. לפעמים אתה צריך להפעיל מחדש את עוזר הבית לפני שתוכל להסיר את הישויות של אינטגרציה שהוסרה. האם אתה בטוח שברצונך להסיר את הישויות הניתנות להסרה?",
                             "confirm_partly_title": "רק {number} {number, plural,\n  one {ישות שנבחרה}\n  other {ישויות שנבחרו}\n} ניתן להסיר.",
-                            "confirm_text": "עליך להסיר אותם מתצורת ה- Lovelace ומהאוטומציות שלך אם הם מכילים ישויות אלה.",
+                            "confirm_text": "יש להסיר אותם מתצורת ה-Lovelace ומהאוטומציות שלך אם הם מכילים ישויות אלה.",
                             "confirm_title": "האם ברצונך להסיר את ה{number} {number, plural,\n  one {ישות}\n  other {ישויות}\n}?"
                         },
                         "search": "חיפוש ישויות",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "נקה",
-                    "filtering_by": "סינון לפי",
-                    "show": "הצג"
-                },
-                "hassio": {
-                    "button": "הגדר"
-                },
                 "header": "הגדר את Home Assistant",
                 "helpers": {
                     "caption": "מסייעים",
@@ -2194,43 +2222,36 @@
                     "description": "גרסה, תקינות המערכת וקישורים לתיעוד",
                     "developed_by": "פותח על ידי חבורה של אנשים מדהימים.",
                     "documentation": "תיעוד",
-                    "frontend": "frontend-ui",
+                    "frontend": "חזית ממשק משתמש",
                     "frontend_version": "גרסת ממשק המשתמש: {version} - {type}",
                     "home_assistant_logo": "לוגו Home Assistant",
                     "icons_by": "סמלים מאת",
                     "integrations": "אינטגרציות",
                     "issues": "בעיות",
                     "license": "פורסם תחת רישיון Apache 2.0",
-                    "path_configuration": "נתיב ל - configuration.yaml: {path}",
+                    "path_configuration": "נתיב אל configuration.yaml: {path}",
                     "server": "שרת",
                     "setup_time": "זמן התקנה",
                     "source": "מקור:",
-                    "system_health_error": "רכיב בריאות המערכת לא נטען. הוסף את 'system_health:' ל- configuration.yaml",
                     "system_health": {
                         "manage": "נהל",
                         "more_info": "מידע נוסף"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "עמוד שילובים",
-                    "missing_zha": "חסר את לוח התצורה של ZHA? הוא הועבר לכניסה של ZHA בדף {integrations_page} .",
-                    "missing_zwave": "חסר את לוח התצורה של Z-Wave? הוא הועבר לכניסה של Z-Wave בכרטיסייה {integrations_page} ."
+                    },
+                    "system_health_error": "רכיב בריאות המערכת לא נטען. הוסף את 'system_health:' ל- configuration.yaml"
                 },
                 "integrations": {
-                    "add_integration": "הוסף שילוב",
-                    "attention": "דרושה תשומת לב",
+                    "add_integration": "הוספת שילוב",
+                    "attention": "נדרשת תשומת לב",
                     "caption": "שילובים",
                     "config_entry": {
                         "area": "ב-{area}",
                         "check_the_logs": "בדוק את היומנים",
                         "configure": "הגדר",
                         "delete": "מחק",
-                        "delete_confirm": "האם אתה בטוח שברצונך למחוק שילוב זה?",
+                        "delete_confirm": "האם בוודאות ברצונך למחוק שילוב זה?",
                         "depends_on_cloud": "תלוי בענן",
                         "device_unavailable": "ההתקן אינו זמין",
                         "devices": "{count} {count, plural,\n  one {device}\n  other {devices}\n}",
-                        "disable_error": "ההפעלה או השבתה של השילוב נכשלה",
-                        "disable_restart_confirm": "הפעל מחדש את Assistant Home כדי לסיים את השבתת השילוב הזה",
                         "disable": {
                             "disable_confirm": "האם אתה בטוח שברצונך להשבית את רשומת התצורה הזו? המכשירים והישויות שלו יושבתו.",
                             "disabled": "מושבת",
@@ -2241,6 +2262,8 @@
                             },
                             "disabled_cause": "מושבת על ידי {cause}"
                         },
+                        "disable_error": "ההפעלה או השבתה של השילוב נכשלה",
+                        "disable_restart_confirm": "הפעל מחדש את Assistant Home כדי לסיים את השבתת השילוב הזה",
                         "disabled_polling": "תשאול אוטומטי עבור עדכוני נתונים אינו זמין",
                         "documentation": "תיעוד",
                         "enable_restart_confirm": "הפעל מחדש את Assistant Home כדי לסיים את הפעלת השילוב הזה",
@@ -2248,11 +2271,9 @@
                         "entity_unavailable": "הישות אינה זמינה",
                         "firmware": "קושחה: {version}",
                         "hub": "מחובר באמצעות",
-                        "logs": "יומן אירועים",
                         "manuf": "על ידי {manufacturer}",
                         "no_area": "ללא אזור",
                         "not_loaded": "לא נטען",
-                        "options": "אפשרויות",
                         "provided_by_custom_integration": "מסופק על ידי אינטגרציה מותאמת אישית",
                         "reload": "טען מחדש",
                         "reload_confirm": "השילוב נטען מחדש",
@@ -2284,7 +2305,11 @@
                             "open_site": "פתח אתר"
                         },
                         "finish": "סיום",
-                        "loading_first_time": "אנא המתן בזמן שהאינטגרציה מותקנת",
+                        "loading": {
+                            "fallback_title": "השילוב",
+                            "loading_flow": "יש להמתין בזמן שההגדרה של {integration} מתבצעת",
+                            "loading_step": "טוען את השלב הבא עבור {integration}"
+                        },
                         "next": "הבא",
                         "not_all_required_fields": "לא כל שדות החובה מולאו.",
                         "not_loaded": "לא ניתן היה לטעון את השילוב, נסה להפעיל מחדש את Home Assistant.",
@@ -2301,7 +2326,6 @@
                     "details": "פרטי השילוב",
                     "disable": {
                         "disabled_integrations": "{number} מושבת",
-                        "hide_disabled": "הסתר שילובים מושבתים",
                         "show": "הצג",
                         "show_disabled": "הצג שילובים מושבתים"
                     },
@@ -2310,17 +2334,16 @@
                     "ignore": {
                         "confirm_delete_ignore": "פעולה זו תגרום לשילוב להופיע בשילובים שהתגלו שוב כאשר היא תתגלה. ייתכן שתידרש הפעלה מחדש או להמתין כדי שזה יקרה.",
                         "confirm_delete_ignore_title": "הפסק להתעלם מ-{name}?",
-                        "confirm_ignore": "האם אתה בטוח שאתה לא רוצה להגדיר שילוב זה? אתה יכול לבטל את זה על ידי לחיצה על 'הצג שילובים שמתעלמים מהן' בתפריט שמשמאל למעלה.",
-                        "confirm_ignore_title": "התעלם מגילוי {name}?",
-                        "hide_ignored": "הסתר שילובים שמתעלמים מהן",
+                        "confirm_ignore": "האם בוודאות הינך רוצה להגדיר שילוב זה? ניתן לבטל את זה על ידי לחיצה על 'הצגת שילובים שמתעלמים מהן' בתפריט שמשמאל למעלה.",
+                        "confirm_ignore_title": "להתעלם מגילוי {name}?",
                         "ignore": "התעלם",
                         "ignored": "מתעלם",
-                        "show_ignored": "הצג שילובים שמתעלמים מהן",
+                        "show_ignored": "הצגת שילובים שמתעלמים מהן",
                         "stop_ignore": "הפסק להתעלם"
                     },
                     "integration": "שילוב",
                     "integration_not_found": "השילוב לא נמצא.",
-                    "new": "הגדר שילוב",
+                    "new": "הגדרת שילוב חדש",
                     "no_integrations": "נראה שעדיין לא הוגדרו שילובים. לחץ על הכפתור למטה כדי להוסיף את השילוב הראשון שלך!",
                     "none": "כלום אינו הוגדר עדיין",
                     "none_found": "לא נמצאו אינטגרציות",
@@ -2341,11 +2364,11 @@
                     "details": "פרטי יומן האירועים ({level})",
                     "error_from_custom_integration": "מקור השגיאה הזו הוא אינטגרציה מותאמת אישית.",
                     "level": {
-                        "critical": "CRITICAL",
-                        "debug": "DEBUG",
-                        "error": "ERROR",
-                        "info": "INFO",
-                        "warning": "WARNING"
+                        "critical": "קריטי",
+                        "debug": "איתור באגים",
+                        "error": "שגיאה",
+                        "info": "מידע",
+                        "warning": "אזהרה"
                     },
                     "load_full_log": "טען את הלוג המלא של Home Assistant",
                     "loading_log": "טוען יומן שגיאות...",
@@ -2364,7 +2387,7 @@
                             "storage": "ממשק המשתמש נשלט",
                             "yaml": "קובץ YAML"
                         },
-                        "confirm_delete": "האם אתה בטוח שברצונך למחוק את לוח הבקרה הזה?",
+                        "confirm_delete": "האם בוודאות ברצונך למחוק את לוח הבקרה הזה?",
                         "default_dashboard": "זהו לוח הבקרה ברירת המחדל",
                         "detail": {
                             "create": "צור",
@@ -2373,9 +2396,9 @@
                             "edit_dashboard": "ערוך לוח בקרה",
                             "icon": "סמל",
                             "new_dashboard": "הוסף לוח בקרה חדש",
-                            "remove_default": "הסר כברירת מחדל במכשיר זה",
+                            "remove_default": "הסרה כברירת מחדל בהתקן זה",
                             "require_admin": "מנהל בלבד",
-                            "set_default": "הגדר כברירת מחדל במכשיר זה",
+                            "set_default": "קביעה כברירת מחדל בהתקן זה",
                             "show_sidebar": "הצג בסרגל הצד",
                             "title": "כותרת",
                             "title_required": "הכותרת נדרשת.",
@@ -2400,7 +2423,7 @@
                     "resources": {
                         "cant_edit_yaml": "אתה משתמש ב- Lovelace במצב YAML, לכן אינך יכול לנהל את המשאבים שלך דרך ממשק המשתמש. נהל אותם ב- configuration.yaml.",
                         "caption": "משאבים",
-                        "confirm_delete": "האם אתה בטוח שברצונך למחוק את המשאב הזה?",
+                        "confirm_delete": "האם בוודאות ברצונך למחוק משאב זה?",
                         "detail": {
                             "create": "צור",
                             "delete": "מחק",
@@ -2422,17 +2445,16 @@
                             "no_resources": "אין משאבים"
                         },
                         "refresh_body": "עליך לרענן את הדף כדי להשלים את ההסרה. האם ברצונך לרענן כעת?",
-                        "refresh_header": "האם אתה רוצה לרענן?",
+                        "refresh_header": "האם ברצונך לרענן?",
                         "types": {
                             "css": "Stylesheet",
                             "html": "HTML (הוצא משימוש)",
                             "js": "קובץ JavaScript (הוצא משימוש)",
-                            "module": "JavaScript Module"
+                            "module": "מודול JavaScript"
                         }
                     }
                 },
                 "mqtt": {
-                    "button": "הגדר",
                     "description_listen": "האזנה לנושא",
                     "description_publish": "פרסם חבילה",
                     "listening_to": "האזנה ל",
@@ -2446,7 +2468,6 @@
                     "topic": "נושא"
                 },
                 "ozw": {
-                    "button": "הגדר",
                     "common": {
                         "controller": "בקר",
                         "instance": "מופע",
@@ -2471,6 +2492,11 @@
                         "nodes": "צמתים",
                         "select_instance": "בחר מופע"
                     },
+                    "network": {
+                        "header": "ניהול רשת",
+                        "introduction": "נהל פונקציות ברחבי הרשת.",
+                        "node_count": "{count} צמתים"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "כל הצמתים נחקרו",
@@ -2491,10 +2517,9 @@
                         "starting": "מתחיל",
                         "unknown": "לא ידוע"
                     },
-                    "network": {
-                        "header": "ניהול רשת",
-                        "introduction": "נהל פונקציות ברחבי הרשת.",
-                        "node_count": "{count} צמתים"
+                    "node": {
+                        "button": "פרטי צומת",
+                        "not_found": "הצומת לא נמצא"
                     },
                     "node_config": {
                         "header": "תצורת צומת",
@@ -2524,10 +2549,6 @@
                         "versions": "מקבל מידע אודות גירסאות קושחה ומחלקות פקודות",
                         "wakeup": "הגדרת תמיכה בתורים והודעות השכמה"
                     },
-                    "node": {
-                        "button": "פרטי צומת",
-                        "not_found": "הצומת לא נמצא"
-                    },
                     "nodes_table": {
                         "failed": "נכשל",
                         "id": "מזהה",
@@ -2599,18 +2620,18 @@
                     "editor": {
                         "default_name": "סצינה חדשה",
                         "devices": {
-                            "add": "הוסף מכשיר",
-                            "delete": "מחיקת מכשיר",
+                            "add": "הוספת התקן",
+                            "delete": "מחיקת התקן",
                             "header": "התקנים",
                             "introduction": "הוסף את ההתקנים שברצונך שייכללו בסצינה. הגדר את כל ההתקנים למצב הרצוי עבור סצינה זו."
                         },
                         "entities": {
                             "add": "הוסף ישות",
                             "delete": "מחק ישות",
-                            "device_entities": "אם תוסיף ישות השייכת למכשיר, המכשיר יתווסף.",
+                            "device_entities": "אם תוסיף ישות השייכת להתקן, ההתקן יתווסף.",
                             "header": "ישויות",
                             "introduction": "ניתן להגדיר כאן ישויות שאינן שייכות להתקן.",
-                            "without_device": "ישויות ללא מכשיר"
+                            "without_device": "ישויות ללא התקן"
                         },
                         "icon": "סמל",
                         "introduction": "השתמש בסצנות כדי להחיות את ביתך.",
@@ -2645,7 +2666,7 @@
                     "editor": {
                         "alias": "שם",
                         "default_name": "סקריפט חדש",
-                        "delete_confirm": "האם אתה בטוח שברצונך למחוק את הסקריפט הזה?",
+                        "delete_confirm": "האם בוודאות ברצונך למחוק סקריפט זה?",
                         "delete_script": "מחק סקריפט",
                         "header": "סקריפט: {name}",
                         "icon": "סמל",
@@ -2663,7 +2684,7 @@
                             "description": "המצב שולט במה שקורה כאשר רץ סקריפט בזמן שהוא עדיין רץ מהרצה קודמת אחת או יותר. עיין ב-{documentation_link} למידע נוסף.",
                             "documentation": "תיעוד סקריפט",
                             "label": "מצב",
-                            "parallel": "מַקְבִּיל",
+                            "parallel": "מקביל",
                             "queued": "בתור",
                             "restart": "הפעלה מחדש",
                             "single": "יחיד (ברירת מחדל)"
@@ -2711,7 +2732,7 @@
                             "input_number": "קלט מספרים",
                             "input_select": "קלט בחירה",
                             "input_text": "קלט טקסט",
-                            "introduction": "חלקים מסוימים של Home Assistant יכולים להטען מחדש ללא צורך בהפעלה מחדש.\nטעינה מחדש תשנה את התצורה הנוכחית ותטען תצורה חדשה.",
+                            "introduction": "חלקים מסוימים של Homr Assistant יכולים לטעון מחדש ללא צורך בהפעלה מחדש. לחיצה על אחת מהאפשרויות שלהלן תבטל את טעינת תצורת YAML הנוכחית שלהם ותטען את התצורה החדשה.",
                             "min_max": "ישויות מינימום/מקסימום",
                             "mqtt": "ישויות MQTT שתצורתן נקבעה באופן ידני",
                             "person": "אנשים",
@@ -2803,7 +2824,7 @@
                         "new_password": "סיסמה חדשה",
                         "owner": "בעלים",
                         "password_changed": "הסיסמה שונתה בהצלחה",
-                        "system_generated": "המערכת נוצרה",
+                        "system_generated": "נוצר על ידי המערכת",
                         "system_generated_users_not_editable": "לא ניתן לעדכן משתמשים שנוצרו על ידי המערכת.",
                         "system_generated_users_not_removable": "לא ניתן להסיר משתמשים שנוצרו על ידי המערכת.",
                         "unnamed_user": "משתמש ללא שם",
@@ -2817,7 +2838,7 @@
                             "is_active": "פעיל",
                             "is_owner": "בעלים",
                             "name": "שם תצוגה",
-                            "system": "המערכת נוצרה",
+                            "system": "נוצר על ידי המערכת",
                             "username": "שם משתמש"
                         }
                     },
@@ -2832,7 +2853,6 @@
                         "search_again": "חפש שוב",
                         "spinner": "מחפש מכשירי ZHA Zigbee..."
                     },
-                    "button": "הגדר",
                     "cluster_attributes": {
                         "attributes_of_cluster": "תכונות של האשכול שנבחר",
                         "get_zigbee_attribute": "קבל שדה Zigbee",
@@ -2862,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "קיצורי דרך",
-                        "update_button": "עדכן תצורה",
-                        "zha_options": {
-                            "default_light_transition": "זמן מעבר ברירת מחדל של האור (שניות)",
-                            "enable_identify_on_join": "אפשר אפקט זיהוי כאשר מכשירים מצטרפים לרשת",
-                            "title": "אפשרויות גלובליות"
-                        }
+                        "update_button": "עדכן תצורה"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "קביעת התצורה הושלמה",
@@ -2949,123 +2964,7 @@
                     "introduction": "אזורים מאפשרים לך לציין אזורים מסוימים בכדור הארץ. כאשר אדם נמצא באזור, הסטטוס יקח את השם מהאזור. אזורים יכולים לשמש גם כטריגר או תנאי בתוך הגדרות אוטומציה.",
                     "no_zones_created_yet": "נראה שעדיין לא יצרת אזורים."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "בטל הכללה",
-                        "controller_in_inclusion_mode": "בקר Z-Wave נמצא כעת במצב הכללה.",
-                        "follow_device_instructions": "בצע את ההוראות המצורפת להתקן כדי להפעיל את השיוך בהתקן.",
-                        "inclusion_failed": "לא היתה אפשרות להוסיף את הצומת. יש לבדוק את יומני הרישום לקבלת מידע נוסף.",
-                        "inclusion_finished": "הצומת נוסף.",
-                        "interview_failed": "ראיון ההתקן נכשל. ייתכן שמידע נוסף יהיה זמין ביומני הרישום.",
-                        "interview_started": "המתקן מתראיין. פעולה זו עשויה להימשך זמן מה.",
-                        "introduction": "אשף זה ינחה אותך לאורך הוספת צומת לרשת Z-Wave שלך.",
-                        "secure_inclusion_warning": "התקנים מאובטחים דורשים רוחב פס נוסף; התקנים מאובטחים רבים מדי יכולים להאט את רשת Z-Wave שלך. אנו ממליצים להשתמש בהכללה מאובטחת רק עבור מכשירים הדורשים זאת, כגון מנעולים או פותחני דלתות מוסך.",
-                        "start_inclusion": "התחל הכללה",
-                        "start_secure_inclusion": "התחל הכללה מאובטחת",
-                        "title": "הוסף צומת Z-Wave",
-                        "use_secure_inclusion": "השתמש בהכללה מאובטחת",
-                        "view_device": "הצג התקן"
-                    },
-                    "button": "הגדר",
-                    "common": {
-                        "add_node": "הוסף צומת",
-                        "close": "סגור",
-                        "heal_network": "ריפוי רשת",
-                        "home_id": "מזהה בית",
-                        "network": "רשת",
-                        "node_id": "מזהה צומת",
-                        "reconfigure_server": "קביעת תצורה מחדש של שרת",
-                        "remove_node": "הסר צומת"
-                    },
-                    "dashboard": {
-                        "driver_version": "גירסת מנהל התקן",
-                        "dump_dead_nodes_text": "חלק מהצמתים שלך לא הגיבו ונחשבים מתים. אלה לא ייוצאו לחלוטין.",
-                        "dump_dead_nodes_title": "חלק מהצמתים שלך מתים",
-                        "dump_debug": "הורד תמונת מצב של הרשת שלך כדי לעזור באבחון בעיות",
-                        "dump_not_ready_confirm": "הורדה",
-                        "dump_not_ready_text": "אם אתה יוצר ייצוא בזמן שלא כל הצמתים מוכנים, אתה עלול לפספס את הנתונים הדרושים. תן לרשת שלך זמן לשאילת כל הצמתים. האם אתה רוצה להמשיך?",
-                        "dump_not_ready_title": "עדיין לא כל הצמתים מוכנים",
-                        "header": "נהל את רשת Z-Wave שלך",
-                        "home_id": "מזהה בית",
-                        "introduction": "ניהול את רשת Z-Wave וצמתי Z-Wave",
-                        "nodes_ready": "צמתים מוכנים",
-                        "server_version": "גירסת שרת"
-                    },
-                    "device_info": {
-                        "device_config": "הגדר את המכשיר",
-                        "node_ready": "הצומת מוכן",
-                        "node_status": "מצב הצומת",
-                        "zwave_info": "מידע Z-Wave"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "ריפוי הרשת בוטל.",
-                        "healing_complete": "ריפוי הרשת הושלם.",
-                        "healing_failed": "הריפוי נכשל. מידע נוסף עשוי להיות זמין ביומנים.",
-                        "in_progress": "ריפוי הרשת בעיצומו. זה ייקח קצת זמן.",
-                        "introduction": "התחל ריפוי רשת ברשת Z-Wave שלך. ריפוי רשת יגרום לכל ההתקנים לחשב מחדש את הנתיבים שלהם בחזרה לבקר ומומלץ אם העברת לאחרונה התקנים או הבקר שלך.",
-                        "run_in_background": "באפשרותך לסגור תיבת דו שיח זו וריפוי הרשת ימשיך ברקע.",
-                        "start_heal": "התחל ריפוי",
-                        "stop_heal": "הפסק ריפוי",
-                        "title": "רפא את רשת Z-Wave שלך",
-                        "traffic_warning": "תהליך הריפוי מייצר כמות גדולה של תעבורה ברשת Z-Wave. הדבר עלול לגרום להתקנים להגיב באיטיות (או בכלל לא) בזמן שהריפוי מתבצע."
-                    },
-                    "logs": {
-                        "log_level": "רמת יומן",
-                        "log_level_changed": "רמת היומן שונתה ל: {level}",
-                        "subscribed_to_logs": "הרשם כמנוי להודעות יומן Z-Wave JS ...",
-                        "title": "יומני Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "יומנים",
-                        "network": "רשת"
-                    },
-                    "network_status": {
-                        "connected": "מחובר",
-                        "connecting": "מתחבר",
-                        "unknown": "לא ידוע"
-                    },
-                    "node_config": {
-                        "attribution": "פרמטרים ותיאורי תצורת המכשיר מסופקים על ידי {device_database}",
-                        "battery_device_notice": "התקני סוללה חייבים להיות ערים כדי לעדכן את תצורתם. נא עיין במדריך למשתמש לקבלת הוראות כיצד להעיר את ההתקן.",
-                        "error_device_not_found": "ההתקן לא נמצא",
-                        "header": "תצורת מכשיר Z-Wave",
-                        "introduction": "נהל והתאם פרמטרי תצורה ספציפיים למכשיר (צומת) עבור ההתקן שנבחר",
-                        "parameter_is_read_only": "פרמטר זה מוגדר לקריאה בלבד.",
-                        "set_param_accepted": "הפרמטר עודכן.",
-                        "set_param_error": "אירעה שגיאה.",
-                        "set_param_queued": "שינוי הפרמטר נכנס לתור ויעודכן כאשר ההתקן יתעורר.",
-                        "zwave_js_device_database": "מאגר התקני Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "חי",
-                        "asleep": "ישן",
-                        "awake": "ער",
-                        "dead": "מת",
-                        "unknown": "לא ידוע"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "יהיה עליך להעיר התקנים המופעלים באמצעות סוללה לפני שתתחיל בראיון מחדש. עיין במדריך למשתמש של המכשיר לקבלת הוראות להעיר את ההתקן.",
-                        "in_progress": "המכשיר מתראיין. זה עלול לקחת זמן מה.",
-                        "interview_complete": "ראיון ההתקן הושלם.",
-                        "interview_failed": "ראיון המכשיר נכשל. מידע נוסף עשוי להיות זמין ביומנים.",
-                        "introduction": "ראיינו מחדש מכשיר ברשת Z-Wave שלכם. השתמש בתכונה זו אם הפונקציונליות של ההתקן שלך חסרה או שגויה.",
-                        "run_in_background": "ניתן לסגור תיבת דו-שיח זו והראיון יימשך ברקע.",
-                        "start_reinterview": "מתחיל ראיון מחדש",
-                        "title": "ראיון מחדש של התקן Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "בטל אי הכללה",
-                        "controller_in_exclusion_mode": "בקר Z-Wave שלך נמצא כעת במצב אי הכללה.",
-                        "exclusion_failed": "לא היתה אפשרות להסיר את הצומת. יש לבדוק את יומני הרישום לקבלת מידע נוסף.",
-                        "exclusion_finished": "צומת {id} הוסר מרשת Z-Wave שלך.",
-                        "follow_device_instructions": "בצעו את ההוראות המצורף להתקן כדי להפעיל אי הכללה בהתקן.",
-                        "introduction": "הסר צומת מרשת Z-Wave שלך והסר את ההתקן והישויות המשויכים מ-Home Assistant.",
-                        "start_exclusion": "התחל אי הכללה",
-                        "title": "הסר צומת Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "הגדר",
                     "common": {
                         "index": "אינדקס",
                         "instance": "מופע",
@@ -3096,29 +2995,29 @@
                     "node_config": {
                         "config_parameter": "פרמטר תצורה",
                         "config_value": "ערך תצורה",
-                        "false": "False",
+                        "false": "שקר",
                         "header": "אפשרויות תצורת צומת",
                         "seconds": "שניות",
                         "set_config_parameter": "הגדרת פרמטר תצורה",
                         "set_wakeup": "הגדרת מרווח זמן להתעוררות",
-                        "true": "True"
+                        "true": "אמת"
                     },
                     "node_management": {
                         "add_to_group": "הוסף לקבוצה",
-                        "entities": "ישויות היחידה",
+                        "entities": "ישויות של צומת זה",
                         "entity_info": "מידע על הישות",
-                        "exclude_entity": "אל תכלול ישות זו ב Home Assistant",
+                        "exclude_entity": "לא לכלול ישות זו ב-Home Assistant",
                         "group": "קבוצה",
-                        "header": "ניהול יחידות Z-Wave",
-                        "introduction": "הפעל פקודות Z-Wave המשפיעות על יחידה בודדת. בחר יחידה כדי לראות רשימה של פקודות זמינות.",
+                        "header": "ניהול צמתי Z-Wave",
+                        "introduction": "הפעלת פקודות Z-Wave המשפיעות על צומת יחיד. יש לבחור צומת כדי לראות רשימה של פקודות זמינות.",
                         "max_associations": "כמות קישורים מקסימלי:",
-                        "node_group_associations": "קישורי קבוצת היחידה",
-                        "node_protection": "הגנת יחידה",
-                        "node_to_control": "יחידה לניהול",
-                        "nodes": "יחידות",
-                        "nodes_hint": "בחר יחידה כדי להציג אפשרויות ליחידה",
+                        "node_group_associations": "שיוכי קבוצות צמתים",
+                        "node_protection": "הגנת צומת",
+                        "node_to_control": "צומת לשליטה",
+                        "nodes": "צמתים",
+                        "nodes_hint": "יש לבחור צומת כדי להציג אפשרויות לפי צומת",
                         "nodes_in_group": "צמתים אחרים בקבוצה זו:",
-                        "pooling_intensity": "עוצמת דגימה",
+                        "pooling_intensity": "עוצמת תשאול",
                         "protection": "הגנה",
                         "remove_broadcast": "הסר שידור רחב",
                         "remove_from_group": "הסר מהקבוצה",
@@ -3126,7 +3025,7 @@
                     },
                     "ozw_log": {
                         "header": "יומן OZW",
-                        "introduction": "צפה ביומן. 0 הוא המינימום (טוען יומן שלם) ו -1000 הוא המקסימום. הטעינה תציג יומן סטטי והסוף יתעדכן אוטומטית במספר האחרון שצוין של שורות היומן.",
+                        "introduction": "הצגת יומן הרישום. 0 הוא המינימום (טוען יומן שלם) ו-1000 הוא המקסימום. הטעינה תציג יומן רישום סטטי והסוף יתעדכן אוטומטית עם מספר השורות האחרון שצוין ביומן הרישום.",
                         "last_log_lines": "מספר שורות יומן אחרונות",
                         "load": "לִטעוֹן",
                         "tail": "סוף"
@@ -3137,7 +3036,7 @@
                         "cancel_command": "ביטול פקודה",
                         "heal_network": "ריפוי רשת",
                         "heal_node": "תיקון יחידה",
-                        "node_info": "מידע על היחידה",
+                        "node_info": "מידע על צומת",
                         "print_node": "הדפסת יחידה",
                         "refresh_entity": "רענן ישות",
                         "refresh_node": "רענן יחידה",
@@ -3154,6 +3053,144 @@
                     "values": {
                         "header": "ערכים"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "בטל הכללה",
+                        "controller_in_inclusion_mode": "בקר Z-Wave נמצא כעת במצב הכללה.",
+                        "follow_device_instructions": "בצע את ההוראות המצורפת להתקן כדי להפעיל את השיוך בהתקן.",
+                        "inclusion_failed": "לא היתה אפשרות להוסיף את הצומת. יש לבדוק את יומני הרישום לקבלת מידע נוסף.",
+                        "inclusion_finished": "הצומת נוסף.",
+                        "interview_failed": "ראיון ההתקן נכשל. ייתכן שמידע נוסף יהיה זמין ביומני הרישום.",
+                        "interview_started": "המתקן מתראיין. פעולה זו עשויה להימשך זמן מה.",
+                        "introduction": "אשף זה ינחה אותך לאורך הוספת צומת לרשת Z-Wave שלך.",
+                        "secure_inclusion_warning": "התקנים מאובטחים דורשים רוחב פס נוסף; התקנים מאובטחים רבים מדי יכולים להאט את רשת Z-Wave שלך. אנו ממליצים להשתמש בהכללה מאובטחת רק עבור מכשירים הדורשים זאת, כגון מנעולים או פותחני דלתות מוסך.",
+                        "start_inclusion": "התחל הכללה",
+                        "start_secure_inclusion": "התחל הכללה מאובטחת",
+                        "title": "הוסף צומת Z-Wave",
+                        "use_secure_inclusion": "השתמש בהכללה מאובטחת",
+                        "view_device": "הצג התקן"
+                    },
+                    "common": {
+                        "add_node": "הוסף צומת",
+                        "close": "סגור",
+                        "heal_network": "ריפוי רשת",
+                        "home_id": "מזהה בית",
+                        "network": "רשת",
+                        "node_id": "מזהה צומת",
+                        "reconfigure_server": "קביעת תצורה מחדש של שרת",
+                        "remove_node": "הסר צומת",
+                        "source": "מקור"
+                    },
+                    "dashboard": {
+                        "driver_version": "גירסת מנהל התקן",
+                        "dump_dead_nodes_text": "חלק מהצמתים שלך לא הגיבו ונחשבים מתים. אלה לא ייוצאו לחלוטין.",
+                        "dump_dead_nodes_title": "חלק מהצמתים שלך מתים",
+                        "dump_debug": "הורד תמונת מצב של הרשת שלך כדי לעזור באבחון בעיות",
+                        "dump_not_ready_confirm": "הורדה",
+                        "dump_not_ready_text": "אם אתה יוצר ייצוא בזמן שלא כל הצמתים מוכנים, אתה עלול לפספס את הנתונים הדרושים. תן לרשת שלך זמן לשאילת כל הצמתים. האם אתה רוצה להמשיך?",
+                        "dump_not_ready_title": "עדיין לא כל הצמתים מוכנים",
+                        "header": "נהל את רשת Z-Wave שלך",
+                        "home_id": "מזהה בית",
+                        "introduction": "ניהול את רשת Z-Wave וצמתי Z-Wave",
+                        "nodes_ready": "צמתים מוכנים",
+                        "server_version": "גירסת שרת"
+                    },
+                    "device_info": {
+                        "device_config": "הגדר את המכשיר",
+                        "heal_node": "ריפוי צומת",
+                        "node_ready": "הצומת מוכן",
+                        "node_status": "מצב הצומת",
+                        "reinterview_device": "מראיין את ההתקן מחדש",
+                        "remove_failed": "הסרת התקן שנכשל",
+                        "zwave_info": "מידע Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "ריפוי הרשת בוטל.",
+                        "healing_complete": "ריפוי הרשת הושלם.",
+                        "healing_failed": "הריפוי נכשל. מידע נוסף עשוי להיות זמין ביומנים.",
+                        "in_progress": "ריפוי הרשת בעיצומו. זה ייקח קצת זמן.",
+                        "introduction": "התחל ריפוי רשת ברשת Z-Wave שלך. ריפוי רשת יגרום לכל ההתקנים לחשב מחדש את הנתיבים שלהם בחזרה לבקר ומומלץ אם העברת לאחרונה התקנים או הבקר שלך.",
+                        "run_in_background": "באפשרותך לסגור תיבת דו שיח זו וריפוי הרשת ימשיך ברקע.",
+                        "start_heal": "התחל ריפוי",
+                        "stop_heal": "הפסק ריפוי",
+                        "title": "רפא את רשת Z-Wave שלך",
+                        "traffic_warning": "תהליך הריפוי מייצר כמות גדולה של תעבורה ברשת Z-Wave. הדבר עלול לגרום להתקנים להגיב באיטיות (או בכלל לא) בזמן שהריפוי מתבצע."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} נרפא.",
+                        "healing_failed": "לא היתה אפשרות לרפא את {device}.",
+                        "healing_failed_check_logs": "ייתכן שמידע נוסף יהיה זמין ביומני הרישום.",
+                        "in_progress": "ריפוי {device} מתבצע כעת.",
+                        "introduction": "אמור {device} לעדכן את נתיביו בחזרה לבקר. הדבר יכול לסייע בבעיות תקשורת אם העברת לאחרונה את ההתקן או את הבקר שלך.",
+                        "network_heal_in_progress": "רשת Z-Wave כבר מתבצעת. נא להמתין לסיום ההתקן לפני ריפוי התקן בודד.",
+                        "start_heal": "ריפוי התקן",
+                        "title": "ריפוי התקן Z-Wave",
+                        "traffic_warning": "תהליך הריפוי מייצר כמות גדולה של תעבורה ברשת Z-Wave. הדבר עלול לגרום להתקנים להגיב באיטיות (או בכלל לא) בזמן שההחלמה מתבצעת."
+                    },
+                    "logs": {
+                        "log_level": "רמת יומן",
+                        "log_level_changed": "רמת היומן שונתה ל: {level}",
+                        "subscribed_to_logs": "הרשם כמנוי להודעות יומן Z-Wave JS ...",
+                        "title": "יומני Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "יומנים",
+                        "network": "רשת"
+                    },
+                    "network_status": {
+                        "connected": "מחובר",
+                        "connecting": "מתחבר",
+                        "unknown": "לא ידוע"
+                    },
+                    "node_config": {
+                        "attribution": "פרמטרים ותיאורי תצורת המכשיר מסופקים על ידי {device_database}",
+                        "battery_device_notice": "התקני סוללה חייבים להיות ערים כדי לעדכן את תצורתם. נא עיין במדריך למשתמש לקבלת הוראות כיצד להעיר את ההתקן.",
+                        "error_device_not_found": "ההתקן לא נמצא",
+                        "header": "תצורת מכשיר Z-Wave",
+                        "introduction": "נהל והתאם פרמטרי תצורה ספציפיים למכשיר (צומת) עבור ההתקן שנבחר",
+                        "parameter": "פרמטר",
+                        "parameter_is_read_only": "פרמטר זה מוגדר לקריאה בלבד.",
+                        "set_param_accepted": "הפרמטר עודכן.",
+                        "set_param_error": "אירעה שגיאה.",
+                        "set_param_queued": "שינוי הפרמטר נכנס לתור ויעודכן כאשר ההתקן יתעורר.",
+                        "zwave_js_device_database": "מאגר התקני Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "חי",
+                        "asleep": "ישן",
+                        "awake": "ער",
+                        "dead": "מת",
+                        "unknown": "לא ידוע"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "יהיה עליך להעיר התקנים המופעלים באמצעות סוללה לפני שתתחיל בראיון מחדש. עיין במדריך למשתמש של המכשיר לקבלת הוראות להעיר את ההתקן.",
+                        "in_progress": "המכשיר מתראיין. זה עלול לקחת זמן מה.",
+                        "interview_complete": "ראיון ההתקן הושלם.",
+                        "interview_failed": "ראיון המכשיר נכשל. מידע נוסף עשוי להיות זמין ביומנים.",
+                        "introduction": "ראיינו מחדש מכשיר ברשת Z-Wave שלכם. השתמש בתכונה זו אם הפונקציונליות של ההתקן שלך חסרה או שגויה.",
+                        "run_in_background": "ניתן לסגור תיבת דו-שיח זו והראיון יימשך ברקע.",
+                        "start_reinterview": "מתחיל ראיון מחדש",
+                        "title": "ראיון מחדש של התקן Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "הסרת ההתקן מתבצעת כעת.",
+                        "introduction": "הסרת התקן שנכשל מרשת Z-Wave. יש להשתמש באפשרות זו אם אין באפשרותך להחריג התקן כרגיל מכיוון שהוא מקולקל.",
+                        "removal_failed": "לא היתה אפשרות להסיר את ההתקן מרשת Z-Wave שלך.",
+                        "removal_finished": "הצומת {id} הוסר מרשת Z-Wave שלך.",
+                        "remove_device": "הסרת התקן",
+                        "title": "הסרת התקן Z-Wave שנכשל"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "בטל אי הכללה",
+                        "controller_in_exclusion_mode": "בקר Z-Wave שלך נמצא כעת במצב אי הכללה.",
+                        "exclusion_failed": "לא היתה אפשרות להסיר את הצומת. יש לבדוק את יומני הרישום לקבלת מידע נוסף.",
+                        "exclusion_finished": "צומת {id} הוסר מרשת Z-Wave שלך.",
+                        "follow_device_instructions": "בצעו את ההוראות המצורף להתקן כדי להפעיל אי הכללה בהתקן.",
+                        "introduction": "הסר צומת מרשת Z-Wave שלך והסר את ההתקן והישויות המשויכים מ-Home Assistant.",
+                        "start_exclusion": "התחל אי הכללה",
+                        "title": "הסר צומת Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3168,7 +3205,7 @@
                     "events": {
                         "alert_event_type": "סוג האירוע הוא שדה חובה",
                         "available_events": "אירועים זמינים",
-                        "count_listeners": "({count} מאזינים)",
+                        "count_listeners": " ({count} מאזינים)",
                         "data": "נתוני אירוע (YAML, אופציונלי)",
                         "description": "יריית אירוע במערכת",
                         "documentation": "תיעוד אירועים",
@@ -3220,47 +3257,32 @@
                     },
                     "templates": {
                         "all_listeners": "תבנית זו מאזינה לכל האירועים שהשתנו על ידי המצב.",
-                        "description": "Templates are rendered using the Jinja2 template engine with some Home Assistant specific extensions.",
+                        "description": "תבניות מעובדות באמצעות מנגנון התבניות Jinja2 עם כמה הרחבות ספציפיות של Home Assistant.",
                         "domain": "תחום",
-                        "editor": "Template editor",
+                        "editor": "עורך תבניות",
                         "entity": "ישות",
-                        "jinja_documentation": "Jinja2 template documentation",
+                        "jinja_documentation": "תיעוד תבנית Jinja2",
                         "listeners": "תבנית זו מאזינה לאירועים הבאים שהשתנו במצב:",
                         "no_listeners": "תבנית זו אינה מאזינה לאירועים כלשהם ולא תתעדכן באופן אוטומטי.",
                         "reset": "איפוס לתבנית הדגמה",
                         "result_type": "סוג תוצאה",
-                        "template_extensions": "Home Assistant template extensions",
+                        "template_extensions": "הרחבות תבנית של Home Assistant",
                         "time": "תבנית זו מתעדכנת בתחילת כל דקה.",
                         "title": "תבניות",
-                        "unknown_error_template": "Unknown error rendering template"
+                        "unknown_error_template": "תבנית עיבוד שגיאות לא ידועה"
                     }
                 }
             },
-            "error": {
-                "go_back": "חזור",
-                "supervisor": {
-                    "ask": "בקש עזרה",
-                    "observer": "בדוק את הצופה",
-                    "reboot": "נסה אתחול מחדש של המחשב המארח",
-                    "system_health": "בדוק את בריאות המערכת",
-                    "title": "לא היתה אפשרות לטעון את לוח המפקח!",
-                    "wait": "אם רק התחלת, ודא שנתת למפקח מספיק זמן להתחיל."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "שבוע שעבר",
-                    "this_week": "השבוע",
-                    "today": "היום",
-                    "yesterday": "אתמול"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "שבוע שעבר",
-                    "this_week": "השבוע",
-                    "today": "היום",
-                    "yesterday": "אתמול"
+            "energy": {
+                "charts": {
+                    "by_device": "צריכה לפי מכשיר",
+                    "solar": "שמשי",
+                    "stat_house_energy_meter": "צריכת אנרגיה כוללת"
+                },
+                "setup": {
+                    "back": "חזור",
+                    "done": "הצג לי את לוח המחוונים לאנרגיה שלי!",
+                    "next": "הבא"
                 }
             },
             "lovelace": {
@@ -3271,16 +3293,16 @@
                 },
                 "cards": {
                     "actions": {
-                        "action_confirmation": "האם אתה בטוח שברצונך להריץ את \"{action}\"?",
+                        "action_confirmation": "האם בוודאות ברצונך להריץ את \"{action}\"?",
                         "no_entity_more_info": "לא סופקה ישות עבור תיבת דו שיח של מידע נוסף",
                         "no_entity_toggle": "אין ישות שניתנה להחלפה",
                         "no_navigation_path": "לא צוין נתיב ניווט",
                         "no_service": "לא צוין שירות להרצה",
                         "no_url": "לא צוין כתובת אתר לפתיחה"
                     },
-                    "confirm_delete": "האם אתה בטוח שברצונך למחוק את הכרטיס הזה?",
+                    "confirm_delete": "האם בוודאות ברצונך למחוק את הכרטיס הזה?",
                     "empty_state": {
-                        "go_to_integrations_page": "עבור לדף השילובים.",
+                        "go_to_integrations_page": "יש לעבור לדף השילובים.",
                         "no_devices": "דף זה מאפשר לך לשלוט במכשירים שלך, אולם נראה שעדיין לא הגדרת התקנים. עבור לדף שילובים כדי להתחיל.",
                         "title": "ברוך הבא הביתה"
                     },
@@ -3294,7 +3316,7 @@
                         "navigate_to": "נווט אל {location}",
                         "tap": "הקש:",
                         "toggle": "החלף מצב {name}",
-                        "url": "פתח חלון ל- {url_path}"
+                        "url": "פתח חלון אל {url_path}"
                     },
                     "safe-mode": {
                         "description": "Home Assistant נתקל בבעיות בעת טעינת התצורה שלך וכעת הוא פועל במצב בטוח. עיין ביומן השגיאות כדי לראות מה השתבש.",
@@ -3308,7 +3330,7 @@
                         "reorder_items": "סדר מחדש פריטים"
                     },
                     "starting": {
-                        "description": "Home Assistant בעלייה. אנא המתן..."
+                        "description": "Home Assistant מאתחל. נא להמתין..."
                     }
                 },
                 "changed_toast": {
@@ -3342,7 +3364,7 @@
                         },
                         "button": {
                             "default_action_help": "פעולת ברירת המחדל תלויה ביכולות הישות, היא תוחלף או שתוצג תיבת הדו שיח של מידע נוסף.",
-                            "description": "כרטיס ה־Button מאפשר להוסיף כפתורים לביצוע משימות.",
+                            "description": "כרטיס 'לחצן' מאפשר לך להוסיף לחצנים לביצוע משימות.",
                             "name": "כפתור"
                         },
                         "calendar": {
@@ -3374,7 +3396,6 @@
                         "entities": {
                             "description": "כרטיס היישויות הוא סוג הכרטיס הנפוץ ביותר. הוא מקבץ ישויות יחד לרשימות.",
                             "edit_special_row": "הצג את הפרטים של שורה זו על ידי לחיצה על לחצן העריכה",
-                            "entity_row_editor": "עורך שורת ישות",
                             "entity_row": {
                                 "attribute": "שדה",
                                 "button": "כפתור",
@@ -3386,6 +3407,7 @@
                                 "section": "מקטע",
                                 "weblink": "קישור"
                             },
+                            "entity_row_editor": "עורך שורת ישות",
                             "name": "ישויות",
                             "secondary_info_values": {
                                 "brightness": "בהירות",
@@ -3402,8 +3424,8 @@
                             "toggle": "החלף מצב ישויות."
                         },
                         "entity-filter": {
-                            "description": "כרטיס ה־Entity Filter מאפשר לך להגדיר רשימה של ישויות שאתה רוצה לעקוב אחריהן רק במצב מסוים.",
-                            "name": "Entity Filter"
+                            "description": "הכרטיס 'מסנן ישויות' מאפשר לך להגדיר רשימת ישויות שברצונך לעקוב אחריהן רק במצב מסוים.",
+                            "name": "מסנן ישויות"
                         },
                         "entity": {
                             "description": "כרטיס היישות מעניק לך סקירה מהירה של מצב היישות שלך.",
@@ -3411,7 +3433,8 @@
                         },
                         "gauge": {
                             "description": "כרטיס ה Gauge הוא כרטיס בסיסי המאפשר לראות חזותית נתוני חיישן.",
-                            "name": "Gauge",
+                            "name": "מד",
+                            "needle_gauge": "להציג כמחוון מחט?",
                             "severity": {
                                 "define": "הגדר חומרה?",
                                 "green": "ירוק",
@@ -3424,13 +3447,14 @@
                             "attribute": "שדה",
                             "camera_image": "ישות מצלמה",
                             "camera_view": "תצוגת מצלמה",
+                            "days_to_show": "ימים להצגה",
                             "double_tap_action": "פעולת הקשה כפולה",
                             "entities": "ישויות",
                             "entity": "ישות",
                             "hold_action": "פעולת החזקה",
                             "hours_to_show": "שעות להצגה",
                             "icon": "סמל",
-                            "icon_height": "גובה אייקון",
+                            "icon_height": "גובה סמליל",
                             "image": "נתיב תמונה",
                             "manual": "ידני",
                             "manual_description": "צריך להוסיף כרטיס מותאם אישית או רק רוצה לכתוב באופן ידני את YAML?",
@@ -3455,7 +3479,7 @@
                         "glance": {
                             "columns": "עמודות",
                             "description": "כרטיס ה־Glance שימושי עבור קיבוץ מספר חיישנים לסקירה קומפקטית.",
-                            "name": "Glance"
+                            "name": "מבט מהיר"
                         },
                         "grid": {
                             "columns": "עמודות",
@@ -3499,7 +3523,7 @@
                         "markdown": {
                             "content": "תוכן",
                             "description": "כרטיס ה- Markdown משמש להצגת ה- Markdown.",
-                            "name": "Markdown"
+                            "name": "סימון כלפי מטה"
                         },
                         "media-control": {
                             "description": "כרטיס בקרת המדיה משמש להצגת ישויות נגני מדיה בממשק עם פקדים קלים לשימוש.",
@@ -3507,15 +3531,15 @@
                         },
                         "picture-elements": {
                             "description": "כרטיס Picture Elements הוא אחד מסוגי הכרטיסים המגוונים ביותר. הכרטיסים מאפשרים למקם סמלים או טקסט ואפילו שירותים! על תמונה המבוססת על קואורדינטות.",
-                            "name": "Picture Elements"
+                            "name": "רכיבי תמונה"
                         },
                         "picture-entity": {
                             "description": "כרטיס Picture Entity מציג יישות בצורה של תמונה. במקום תמונות מכתובת URL, זה יכול גם להציג את התמונה של ישויות מצלמה.",
-                            "name": "Picture Entity"
+                            "name": "ישות תמונה"
                         },
                         "picture-glance": {
                             "description": "הכרטיס מבט מהיר על תמונה מציג תמונה ואת מצבי הישות המתאימים כסמל. הישויות בצד ימין מאפשרות פעולות דו מצביות, אחרות מציגות את תיבת הדו שיח של מידע נוסף.",
-                            "name": "Picture Glance",
+                            "name": "מבט מהיר על תמונה",
                             "state_entity": "ישות מצב"
                         },
                         "picture": {
@@ -3537,6 +3561,10 @@
                             "integration_not_loaded": "כרטיס זה דורש את הגדרת האינטגרציה 'shopping_list'.",
                             "name": "רשימת קניות"
                         },
+                        "statistics-graph": {
+                            "description": "כרטיס גרף סטטיסטיקה מאפשר לך להציג גרף של הסטטיסטיקה עבור כל אחת מהישויות המפורטות.",
+                            "name": "גרף סטטיסטיקה"
+                        },
                         "thermostat": {
                             "description": "כרטיס וסת החום נותן שליטה על ישות האקלים שלך. מאפשר לך לשנות את הטמפרטורה ואת המצב של הישות.",
                             "name": "וסת חום"
@@ -3592,7 +3620,7 @@
                     "edit_lovelace": {
                         "edit_title": "ערוך כותרת",
                         "explanation": "כותרת זו מוצגת מעל לכל התצוגות שלך בממשק המשתמש של Lovelace.",
-                        "header": "כותרת ממשק ה- Lovelace שלך",
+                        "header": "כותרת ממשק המשתמש של Lovelace",
                         "title": "כותרת"
                     },
                     "edit_view": {
@@ -3606,6 +3634,12 @@
                         "tab_badges": "תגים",
                         "tab_settings": "הגדרות",
                         "tab_visibility": "ניראות",
+                        "type": "סוג תצוגה",
+                        "types": {
+                            "masonry": "לבנים",
+                            "panel": "לוח (כרטיס אחד)",
+                            "sidebar": "סרגל הצד"
+                        },
                         "visibility": {
                             "select_users": "בחר אילו משתמשים צריכים לראות תצוגה זו בתפריט"
                         }
@@ -3660,7 +3694,6 @@
                         "unsaved_changes": "שינויים שלא נשמרו"
                     },
                     "save_config": {
-                        "cancel": "לא משנה",
                         "close": "סגור",
                         "empty_config": "התחל עם לוח בקרה ריק",
                         "header": "קח שליטה על Lovelace ממשק המשתמש שלך",
@@ -3668,7 +3701,7 @@
                         "para_sure": "האם אתה בטוח שאתה רוצה לקחת שליטה על ממשק המשתמש?",
                         "save": "קח שליטה",
                         "yaml_config": "כדי לעזור לך להתחיל הנה התצורה הנוכחית של לוח מחוונים זה:",
-                        "yaml_control": "כדי לקבל שליטה במצב YAML, צור קובץ YAML עם השם שציינת ב-config עבור לוח מחוונים זה, או ברירת המחדל  'ui-lovelace.yaml'.",
+                        "yaml_control": "כדי להשתלט על מצב YAML, יש ליצור קובץ YAML עם השם שציינת בתצורה שלך עבור לוח המחוונים הזה, או ברירת המחדל 'ui-lovelace.yaml'.",
                         "yaml_mode": "אתה משתמש במצב YAML עבור לוח מחוונים זה ולכן אין באפשרותך לשנות את קונפיגורצית Lovelace מממשק המשתמש. אם ברצונך לנהל לוח מחוונים זה מממשק המשתמש, הסר 'mode: yaml' מתצורת Loverlace ב 'configuration.yaml.'."
                     },
                     "select_view": {
@@ -3689,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "פעולה זו מעבדת את הכרטיס הראשון ברוחב מלא. כרטיסים אחרים בתצוגה זו, כמו גם תגים לא יעובדו.",
-                            "title": "מצב לוח?",
                             "warning_multiple_cards": "תצוגה זו מכילה יותר מכרטיס אחד, אך בתצוגת פאנל ניתן להציג כרטיס אחד בלבד."
                         }
                     }
@@ -3706,7 +3737,7 @@
                 "reload_lovelace": "טען מחדש את ממשק המשתמש",
                 "reload_resources": {
                     "refresh_body": "עליך לרענן את הדף כדי להשלים את הטעינה מחדש. האם ברצונך לרענן כעת?",
-                    "refresh_header": "האם אתה רוצה לרענן?"
+                    "refresh_header": "האם ברצונך לרענן?"
                 },
                 "unused_entities": {
                     "available_entities": "אלה הן הישויות הזמינות, אך עדיין אינן בממשק המשתמש של Lovelace.",
@@ -3730,7 +3761,7 @@
                     "entity_non_numeric": "הישות אינה מספרית: {entity}",
                     "entity_not_found": "הישות אינה זמינה: {entity}",
                     "entity_unavailable": "הישות אינה זמינה כרגע: {entity}",
-                    "starting": "Home Assistant בעלייה, ייתכן שלא הכל יהיה זמין"
+                    "starting": "Home Assistant באיתחול, ייתכן שלא הכל יהיה זמין עדיין"
                 }
             },
             "mailbox": {
@@ -3831,7 +3862,7 @@
                             "step": {
                                 "init": {
                                     "data": {
-                                        "user": "מִשׁתַמֵשׁ"
+                                        "user": "משתמש"
                                     },
                                     "description": "בחר משתמש שאליו ברצונך להתחבר:"
                                 }
@@ -3893,13 +3924,12 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "הבא",
-                    "intro": "שתף ניתוח מהמופע שלך. נתונים אלה יהיו זמינים לציבור בכתובת {link}"
+                    "finish": "הבא"
                 },
                 "core-config": {
                     "button_detect": "לזהות",
                     "finish": "הבא",
-                    "intro": "שלום {name} , ברוך הבא ל- Home Assistant. איך היית רוצה את שם הבית שלך?",
+                    "intro": "שלום {name} , ברוך הבא ל- Home Assistant. איך היית רוצה לקרוא לבית שלך?",
                     "intro_location": "אנחנו רוצים לדעת איפה אתה גר. מידע זה יעזור עם הצגת מידע והגדרת אוטומציה מבוססת שמש. נתונים אלה לעולם אינם משותפים מחוץ לרשת שלך.",
                     "intro_location_detect": "אנו יכולים לעזור לך למלא מידע זה על ידי ביצוע בקשה חד פעמית לשירות חיצוני.",
                     "location_name": "שם ההתקנה של Home Assistant שלך",
@@ -3918,10 +3948,8 @@
                     "confirm_password": "אישור סיסמת גיבוי",
                     "description": "לחלופין, באפשרותך לשחזר מגיבוי קודם.",
                     "folders": "תיקיות",
-                    "full_snapshot": "גיבוי מלא",
                     "hide_log": "הסתר יומן מלא",
                     "in_progress": "שחזור מתבצע",
-                    "partial_snapshot": "גיבוי חלקי",
                     "password": "סיסמה",
                     "password_protection": "הגנה באמצעות סיסמה",
                     "select_type": "בחר מה לשחזר",
@@ -3995,7 +4023,7 @@
                     "create_failed": "יצירת אסימון הגישה נכשלה.",
                     "created": "נוצר {date}",
                     "delete_failed": "מחיקת אסימון הגישה נכשלה.",
-                    "description": "צור אסימוני גישה ארוכי טווח כדי לאפשר לסקריפטים שלך לקיים אינטראקציה עם Home Assistant.\nאסימונים אלו פועלים כיום:",
+                    "description": "יצירת אסימוני גישה ארוכי טווח כדי לאפשר לסקריפטים שלך ליצור אינטראקציה עם מופע ה-Home Assistant שלך. כל אסימון יהיה תקף למשך 10 שנים מיום היצירה. אסימוני הגישה הבאים לאורך זמן פעילים.",
                     "empty_state": "אין לך עדיין אסימוני גישה ארוכים.",
                     "header": "אסימוני גישה ארוכי חיים",
                     "learn_auth_requests": "למד כיצד לבצע בקשות מאומתות.",
@@ -4003,6 +4031,12 @@
                     "prompt_copy_token": "העתק את אסימון הגישה שלך. הוא לא יוצג שוב.",
                     "prompt_name": "תן שם לאסימון"
                 },
+                "mfa": {
+                    "confirm_disable": "האם בוודאות ברצונך להשבית {name}?",
+                    "disable": "השבתה",
+                    "enable": "הפעל",
+                    "header": "מודלי אימות מרובה גורמים"
+                },
                 "mfa_setup": {
                     "close": "סגור",
                     "step_done": "הגדרה בוצעה עבור {step}",
@@ -4010,12 +4044,6 @@
                     "title_aborted": "הופסק",
                     "title_success": "הצליח!"
                 },
-                "mfa": {
-                    "confirm_disable": "האם אתה בטוח שברצונך להשבית {name}?",
-                    "disable": "השבת",
-                    "enable": "הפעל",
-                    "header": "מודלי אימות מרובה גורמים"
-                },
                 "number_format": {
                     "description": "בחר כיצד מוצגים מספרים.",
                     "dropdown_label": "פורמט מספר",
@@ -4082,7 +4110,7 @@
                     "header": "תבנית שעה"
                 },
                 "vibrate": {
-                    "description": "הפעל או בטל את הרטט במכשיר זה בעת שליטה בהתקנים.",
+                    "description": "הפעלה או ביטול הרטט בהתקן זה בעת שליטה בהתקנים.",
                     "header": "רטט"
                 }
             },
diff --git a/translations/frontend/hi.json b/translations/frontend/hi.json
index 5e66dd1958..877893058c 100644
--- a/translations/frontend/hi.json
+++ b/translations/frontend/hi.json
@@ -9,6 +9,14 @@
         "shopping_list": "खरीदारी की सूची",
         "states": "स्थिति"
     },
+    "state": {
+        "default": {
+            "off": "बंद",
+            "on": "चालू",
+            "unavailable": "अनुपलब्ध",
+            "unknown": "अनजान"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -58,14 +66,6 @@
             "not_home": "बाहर"
         }
     },
-    "state": {
-        "default": {
-            "off": "बंद",
-            "on": "चालू",
-            "unavailable": "अनुपलब्ध",
-            "unknown": "अनजान"
-        }
-    },
     "ui": {
         "card": {
             "weather": {
@@ -203,31 +203,6 @@
                         "password": "पासवर्ड"
                     }
                 },
-                "core": {
-                    "section": {
-                        "core": {
-                            "analytics": {
-                                "learn_more": "हम आपके जानकारी को कैसे संसाधित करते हैं",
-                                "preference": {
-                                    "diagnostics": {
-                                        "description": "अप्रत्याशित त्रुटि होने पर क्रैश रिपोर्ट साझा करें"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "नाम, संस्करण और क्षमताएं"
-                                    },
-                                    "usage": {
-                                        "description": "नाम और संस्करण जानकारी",
-                                        "title": "उप्योग किये एकीकरण"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "filtering": {
-                    "clear": "विशद",
-                    "filtering_by": "द्वारा छान रहे हैं"
-                },
                 "integrations": {
                     "add_integration": "एकीकरण जोड़ें",
                     "config_entry": {
diff --git a/translations/frontend/hr.json b/translations/frontend/hr.json
index b2059ee873..f4df812ab6 100644
--- a/translations/frontend/hr.json
+++ b/translations/frontend/hr.json
@@ -23,6 +23,12 @@
         "shopping_list": "Popis za kupovinu",
         "states": "Pregled"
     },
+    "state": {
+        "default": {
+            "unavailable": "Nedostupan",
+            "unknown": "Nepoznato"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -78,12 +84,6 @@
             "not_home": "Odsutan"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "Nedostupan",
-            "unknown": "Nepoznato"
-        }
-    },
     "ui": {
         "auth_store": {
             "ask": "Želite li spremiti ovu prijavu?",
@@ -398,7 +398,6 @@
                             "introduction": "Radnje su ono što će Home Assistant učiniti kada se aktivira automatizacija. \n\n [Saznajte više o radnjama.] (Https://home-assistant.io/docs/automation/action/)",
                             "learn_more": "Saznajte više o akcijama",
                             "name": "Radnja",
-                            "type_select": "Vrsta akcije",
                             "type": {
                                 "condition": {
                                     "label": "Stanje"
@@ -427,6 +426,7 @@
                                     "wait_template": "Čekaj predložak"
                                 }
                             },
+                            "type_select": "Vrsta akcije",
                             "unsupported_action": "Nepodržana radnja: {action}"
                         },
                         "alias": "Ime",
@@ -439,7 +439,6 @@
                             "introduction": "Uvjeti su neobvezni dio pravila o automatizaciji i mogu se upotrebljavati kako bi se spriječilo da se neka akcija dogodi prilikom pokretanja. Uvjeti izgledaju vrlo slični pokretačima, ali su vrlo različiti. Okidač će pogledati događaje koji se događaju u sustavu, a stanje samo gleda kako sustav izgleda upravo sada. Okidač može primijetiti da je prekidač uključen. Stanje može vidjeti samo ako je uključen ili isključen prekidač. \n\n [Saznajte više o uvjetima.] (Https://home-assistant.io/docs/scripts/conditions/)",
                             "learn_more": "Saznajte više o uvjetima",
                             "name": "Uvjet",
-                            "type_select": "Vrsta uvjeta",
                             "type": {
                                 "and": {
                                     "label": "I"
@@ -492,6 +491,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Vrsta uvjeta",
                             "unsupported_condition": "Nepodržano stanje: {condition}"
                         },
                         "default_name": "Nova automatizacija",
@@ -512,7 +512,6 @@
                             "introduction": "Okidači su ono što pokreće obradu pravila o automatizaciji. Moguće je odrediti više okidača za isto pravilo. Kada pokrenete okidač, Home Assistant provjerit će uvjete, ako ih ima i pozvati akciju. \n\n [Saznajte više o pokretačima.] (Https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "Saznajte više o okidačima",
                             "name": "Okidač",
-                            "type_select": "Tip okidača",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -569,16 +568,16 @@
                                     "label": "Predložak",
                                     "value_template": "Predložak vrijednosti"
                                 },
+                                "time": {
+                                    "at": "U",
+                                    "label": "Vrijeme"
+                                },
                                 "time_pattern": {
                                     "hours": "Sati",
                                     "label": "Vremenski uzorak",
                                     "minutes": "Minuta",
                                     "seconds": "Sekundi"
                                 },
-                                "time": {
-                                    "at": "U",
-                                    "label": "Vrijeme"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -592,6 +591,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tip okidača",
                             "unsupported_platform": "Nepodržana platforma: {platform}"
                         },
                         "unsaved_confirm": "Imate nespremljene izmjene. Jeste li sigurni da želite napustiti?"
@@ -1182,7 +1182,6 @@
                         "unsaved_changes": "Nespremljene promjene"
                     },
                     "save_config": {
-                        "cancel": "Nema veze",
                         "header": "Preuzmite kontrolu nad Lovelace UI",
                         "para": "Home Assistant će prema zadanim postavkama održavati vaše korisničko sučelje, ažurirati ga kada novi entiteti ili Lovelace komponente postanu dostupni. Ako preuzmete kontrolu, više nećemo automatski vršiti izmjene za vas.",
                         "para_sure": "Jeste li sigurni da želite preuzeti kontrolu nad svojim korisničkim sučeljem?",
@@ -1420,6 +1419,12 @@
                     "prompt_copy_token": "Kopirajte pristupni token. Neće se više prikazati.",
                     "prompt_name": "Ime?"
                 },
+                "mfa": {
+                    "confirm_disable": "Jeste li sigurni da želite onemogućiti {name} ?",
+                    "disable": "Onemogući",
+                    "enable": "Omogući",
+                    "header": "Višefaktorski moduli za provjeru autentičnosti"
+                },
                 "mfa_setup": {
                     "close": "Zatvoriti",
                     "step_done": "Postavka gotova za {step}",
@@ -1427,12 +1432,6 @@
                     "title_aborted": "Prekinut",
                     "title_success": "Uspješno!"
                 },
-                "mfa": {
-                    "confirm_disable": "Jeste li sigurni da želite onemogućiti {name} ?",
-                    "disable": "Onemogući",
-                    "enable": "Omogući",
-                    "header": "Višefaktorski moduli za provjeru autentičnosti"
-                },
                 "push_notifications": {
                     "description": "Slanje obavijesti na ovaj uređaj.",
                     "error_load_platform": "Konfigurirajte notify.html5.",
diff --git a/translations/frontend/hu.json b/translations/frontend/hu.json
index 32d196d9a3..741864b5c7 100644
--- a/translations/frontend/hu.json
+++ b/translations/frontend/hu.json
@@ -17,6 +17,7 @@
         "calendar": "Naptár",
         "config": "Konfiguráció",
         "developer_tools": "Fejlesztői eszközök",
+        "energy": "Energia",
         "history": "Előzmények",
         "logbook": "Napló",
         "mailbox": "Postafiók",
@@ -26,6 +27,14 @@
         "shopping_list": "Bevásárló lista",
         "states": "Áttekintés"
     },
+    "state": {
+        "default": {
+            "off": "Ki",
+            "on": "Be",
+            "unavailable": "Nem elérhető",
+            "unknown": "Ismeretlen"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Távol"
         }
     },
-    "state": {
-        "default": {
-            "off": "Ki",
-            "on": "Be",
-            "unavailable": "Nem elérhető",
-            "unknown": "Ismeretlen"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -117,6 +118,7 @@
                     "header": "Hálózat",
                     "host": "Gazdagép"
                 },
+                "no_configuration": "Ez a bővítmény nem teszi ki a konfigurációt, amivel szórakozhatsz...",
                 "options": {
                     "edit_in_ui": "Szerkesztés a felhasználói felületen",
                     "edit_in_yaml": "Szerkesztés YAML-ben",
@@ -127,6 +129,7 @@
             },
             "dashboard": {
                 "action_error": {
+                    "get_changelog": "Nem sikerült megszerezni a kiegészítő változásnaplót",
                     "go_to_config": "Nem sikerült elindítani a bővítményt - a konfiguráció ellenőrzése nem sikerült!",
                     "install": "A bővítmény telepítése sikertelen",
                     "restart": "A bővítmény újraindítása sikertelen",
@@ -138,13 +141,15 @@
                 },
                 "capability": {
                     "apparmor": {
+                        "description": "Az AppArmor ('Application Armor') egy Linux kernel biztonsági modul, amely korlátozza a kiegészítők képességeit, például a hálózati hozzáférést, a nyers socket hozzáférést és az engedélyt bizonyos fájlok olvasására, írására vagy végrehajtására. \n\n A kiegészítő szerzők megadhatják a biztonsági profiljukat, optimalizálva a kiegészítőt, vagy kérhetik annak letiltását. Ha az AppArmor le van tiltva, az biztonsági kockázatokat vet fel, és ezért negatív hatással van a kiegészítő biztonsági pontszámára.",
                         "title": "AppArmor"
                     },
                     "auth_api": {
+                        "description": "Egy kiegészítő hitelesítheti a felhasználókat a Home Assistanthoz képest, lehetővé téve a kiegészítők számára, hogy a felhasználóknak lehetőségük legyen bejelentkezni a kiegészítőkben futó alkalmazásokba, a Home Assistant felhasználónév / jelszó használatával. Ez a jelvény jelzi, ha a kiegészítő szerző kéri ezt a képességet.",
                         "title": "Home Assistant Hitelesítés"
                     },
                     "docker_api": {
-                        "description": "A kiegészítő szerzője kérte a hozzáférését a rendszeren futó Docker-példányhoz. Ez a mód teljes hozzáférést és vezérlést biztosít a kiegészítőnek az egész Home Assistant rendszerhez, ami biztonsági kockázatokat jelent, és visszaélés esetén károsíthatja a rendszert. Ezért ez a szolgáltatás negatívan befolyásolja a Home assistant biztonságát\n\nEzt a hozzáférési szintet a program nem kapja meg automatikusan, ezt Önnek kell megerősítenie. Ehhez manuálisan le kell tiltania a kiegészítő védelmi módját. Csak akkor tiltsa le a védelmi módot, ha tudja, szükség van ÉS megbízik a kiegészítő forrásában.",
+                        "description": "A kiegészítő szerzője kérte a hozzáférését a rendszeren futó Docker-példányhoz. Ez a mód teljes hozzáférést és vezérlést biztosít a kiegészítőnek az egész Home Assistant rendszerhez, ami biztonsági kockázatokat jelent, és visszaélés esetén károsíthatja a rendszert. Ezért ez a szolgáltatás negatívan befolyásolja Home assistant biztonságát\n\nEzt a hozzáférési szintet a program nem kapja meg automatikusan, ezt Önnek kell megerősítenie. Ehhez manuálisan le kell tiltania a kiegészítő védelmi módját. Csak akkor tiltsa le a védelmi módot, ha tudja, szükség van ÉS megbízik a kiegészítő forrásában.",
                         "title": "Teljes Docker hozzáférés"
                     },
                     "full_access": {
@@ -152,9 +157,11 @@
                         "title": "Teljes hozzáférés a hardverhez"
                     },
                     "hassio_api": {
+                        "description": "A kiegészítő hozzáférést kapott a Supervisor API-hoz, a kiegészítő szerző kérésére. Alapértelmezés szerint a kiegészítő hozzáférhet a rendszer általános verzióinformációihoz. Amikor a kiegészítő „kezelő” vagy „rendszergazda” szintű hozzáférést kér az API-hoz, hozzáférést kap a Home Assistant rendszer több részének vezérléséhez. Ezt az engedélyt ez a jelvény jelzi, és ez negatívan befolyásolja a kiegészítő biztonsági pontszámát.",
                         "title": "Supervisor API hozzáférés"
                     },
                     "homeassistant_api": {
+                        "description": "Ez a kiegészítő hozzáférhet a futó Home Assistant példányhoz közvetlenül a Home Assistant API-n keresztül. Ez az üzemmód kezeli a kiegészítő hitelesítését is, amely lehetővé teszi egy kiegészítő számára, hogy további hitelesítési tokenek nélkül léphessen kapcsolatba a Home Assistant programmal.",
                         "title": "Home Assistant API-hozzáférés"
                     },
                     "host_network": {
@@ -162,7 +169,12 @@
                         "title": "Gazdahálózat"
                     },
                     "host_pid": {
-                        "description": "Általában a kiegészítő futtatásának folyamatait elkülönítik az összes többi rendszerfolyamattól. A kiegészítő szerzője azt kérte, hogy a kiegészítő hozzáférjen a gazda rendszerpéldányon futó rendszerfolyamatokhoz, és engedélyezze a kiegészítő számára a folyamatok futtatását a fogadó rendszeren is. Ez a mód teljes hozzáférést és vezérlést biztosít a kiegészítőnek az egész Home Assistant rendszerhez, ami biztonsági kockázatokat jelent, és visszaélés esetén károsíthatja a rendszert. Ezért ez a szolgáltatás negatívan befolyásolja a Home assistant biztonságát.\n\nEzt a hozzáférési szintet a program nem kapja meg automatikusan, ezt Önnek kell megerősítenie. Ehhez manuálisan le kell tiltania a kiegészítő védelmi módját. Csak akkor tiltsa le a védelmi módot, ha tudja, szükség van ÉS megbízik a kiegészítő forrásában."
+                        "description": "Általában a kiegészítő futtatásának folyamatait elkülönítik az összes többi rendszerfolyamattól. A kiegészítő szerzője azt kérte, hogy a kiegészítő hozzáférjen a gazda rendszerpéldányon futó rendszerfolyamatokhoz, és engedélyezze a kiegészítő számára a folyamatok futtatását a fogadó rendszeren is. Ez a mód teljes hozzáférést és vezérlést biztosít a kiegészítőnek az egész Home Assistant rendszerhez, ami biztonsági kockázatokat jelent, és visszaélés esetén károsíthatja a rendszert. Ezért ez a szolgáltatás negatívan befolyásolja Home assistant biztonságát.\n\nEzt a hozzáférési szintet a program nem kapja meg automatikusan, ezt Önnek kell megerősítenie. Ehhez manuálisan le kell tiltania a kiegészítő védelmi módját. Csak akkor tiltsa le a védelmi módot, ha tudja, szükség van ÉS megbízik a kiegészítő forrásában.",
+                        "title": "Gazda folyamatok névtér"
+                    },
+                    "ingress": {
+                        "description": "Ez a kiegészítő az Ingress használatával biztonságosan beágyazza a kezelőfelületét a Home Assistant alkalmazásba.",
+                        "title": "Ingress"
                     },
                     "label": {
                         "apparmor": "apparmor",
@@ -173,10 +185,12 @@
                         "hassio": "hassio",
                         "host": "gazdagép",
                         "host_pid": "gazda pid",
+                        "ingress": "ingress",
                         "rating": "értékelés",
                         "stage": "szakasz"
                     },
                     "rating": {
+                        "description": "A Home Assistant minden egyes kiegészítő biztonsági besorolást ad, amely jelzi a kiegészítő használatával járó kockázatokat. Minél több hozzáférést igényel egy kiegészítő a rendszeréhez, annál alacsonyabb a pontszám, ami növeli a lehetséges biztonsági kockázatokat. \n\nA pontszám 1 és 6 közötti skálán van. Ahol az 1 a legalacsonyabb pontszám (a legbizonytalanabb és a legmagasabb kockázatnak tekinthető), és a 6 a legmagasabb pontszám (a legbiztonságosabbnak és a legkisebb kockázatnak tekinthető).",
                         "title": "Kiegészítő biztonsági besorolása"
                     },
                     "role": {
@@ -187,6 +201,7 @@
                         "manager": "manager"
                     },
                     "stage": {
+                        "description": "A kiegészítőknek három szakasza lehet: \n\n {icon_stable} ** Stabil **: Ezek a gyártásban felhasználásra kész bővítmények. \n\n {icon_experimental} ** Kísérleti **: Ezek hibákat tartalmazhatnak, és befejezetlenek lehetnek. \n\n {icon_deprecated} ** Elavult **: Ezek a kiegészítők többé nem kapnak frissítéseket.",
                         "title": "Kiegészítő szakasz"
                     }
                 },
@@ -204,6 +219,7 @@
                         "title": "Automatikus frissítés"
                     },
                     "boot": {
+                        "description": "Indítsa el a kiegészítőt a rendszer indításakor",
                         "title": "Indítás a rendszerindításkor"
                     },
                     "ingress_panel": {
@@ -211,6 +227,7 @@
                         "title": "Megjelenítés az oldalsávon"
                     },
                     "protected": {
+                        "description": "Blokkolja a kiegészítő emelt szintű rendszer-elérését",
                         "title": "Védelmi mód"
                     },
                     "watchdog": {
@@ -251,6 +268,26 @@
                 "not_installed": "A bővítmény nincs telepítve"
             }
         },
+        "backup": {
+            "addons": "Bővítmények",
+            "confirm_password": "Pillanatkép jelszó megerősítése",
+            "could_not_create": "Nem lehet pillanatképet létrehozni",
+            "create": "Létrehozás",
+            "create_blocked_not_running": "Jelenleg nem lehet pillanatképet létrehozni, mivel a rendszer {state} állapotban van.",
+            "created": "Létrehozva",
+            "delete_backup_confirm": "törlés",
+            "delete_selected": "A kijelölt pillanatképek törlése",
+            "enter_password": "Add meg a jelszót",
+            "failed_to_delete": "Nem sikerült törölni",
+            "folders": "Mappák",
+            "name": "Pillanatkép neve",
+            "password": "Pillanatkép jelszava",
+            "password_protection": "Jelszóvédelem",
+            "passwords_not_matching": "A jelszavak nem egyeznek",
+            "select_type": "Válassza ki, hogy mit szeretne visszaállítani",
+            "selected": "{number} kiválasztva",
+            "type": "Pillanatkép típusa"
+        },
         "common": {
             "cancel": "Mégsem",
             "close": "Bezárás",
@@ -286,7 +323,7 @@
                 "title": "Visszaállítási lehetõségek"
             },
             "restart": {
-                "text": "Biztosan újra akarod indítani a(z) {name}-t?",
+                "text": "Biztosan újra akarod indítani: {name}?",
                 "title": "{name} újraindítása"
             },
             "update": {
@@ -323,6 +360,7 @@
                 "static": "Statikus",
                 "title": "Hálózati beállítások",
                 "unsaved": "Vannak nem mentett módosítások, amik elvesznek ha másik fülre váltasz, biztosan ki akarsz lépni?",
+                "warning": "Ha megváltoztatja a Wi-Fi, IP vagy átjáró címét, akkor elveszítheti a kapcsolatot!",
                 "wep": "WEP",
                 "wpa": "wpa-psk"
             },
@@ -330,10 +368,13 @@
                 "add_new_registry": "Hozzáadás új rendszerleíró adatbázishoz",
                 "add_registry": "Hozzáadás a rendszerleíró adatbázishoz",
                 "failed_to_add": "Nem sikerült hozzáadni a rendszerleíró adatbázishoz",
+                "failed_to_remove": "Nem sikerült eltávolítani a rendszerleíró adatbázisból",
                 "no_registries": "Nincsenek konfigurálva regiszterek",
                 "password": "Jelszó",
                 "registry": "Regisztrálás",
                 "remove": "Eltávolítás",
+                "title_add": "Új konténer-regiszter hozzáadása",
+                "title_manage": "Konténer-regiszterek kezelése",
                 "username": "Felhasználónév"
             },
             "repositories": {
@@ -342,68 +383,31 @@
                 "title": "Bővítmény-tárolók kezelése"
             },
             "restart_addon": {
-                "confirm_text": "Add-on újraindítása"
+                "confirm_text": "Add-on újraindítása",
+                "text": "Indítsa újra a kiegészítőt a módosításokkal?"
             },
             "update": {
-                "create_snapshot": "Frissítés előtt pillanatkép készítése erről: {name}",
-                "snapshot": "Pillanatkép",
-                "snapshotting": "Pillanatkép készítése erről: {name}",
                 "updating": "{name} frissítése {version} verzióra"
             }
         },
         "my": {
             "error": "Ismeretlen hiba történt",
+            "error_addon_no_ingress": "A kért bővítmény nem támogatja a bejutást",
             "error_addon_not_found": "A bővítmény nem található",
             "error_addon_not_installed": "A kért kiegészítő nincs telepítve. Kérjük, először telepítse",
             "error_addon_not_started": "A kért bővítmény nem fut. Kérjük, először indítsa el",
-            "faq_link": "My Home Assistant GYIK"
+            "faq_link": "My Home Assistant GYIK",
+            "not_supported": "Az otthoni asszisztens példánya nem támogatja ezt az átirányítást. Ellenőrizze a(z) {link} fájlban a támogatott átirányításokat és azok verzióját."
         },
         "panel": {
             "dashboard": "Irányítópult",
-            "snapshots": "Pillanatképek",
             "store": "Bővítménybolt",
             "system": "Rendszer"
         },
-        "snapshot": {
-            "addons": "Bővítmények",
-            "available_snapshots": "Rendelkezésreálló pillanatképek",
-            "confirm_password": "Pillanatkép jelszó megerősítése",
-            "could_not_create": "Nem lehet pillanatképet létrehozni",
-            "create": "Létrehozás",
-            "create_blocked_not_running": "Jelenleg nem lehet pillanatképet létrehozni, mivel a rendszer {state} állapotban van.",
-            "create_snapshot": "Pillanatkép létrehozása",
-            "created": "Létrehozva",
-            "delete_selected": "A kijelölt pillanatképek törlése",
-            "delete_snapshot_confirm": "törlés",
-            "delete_snapshot_text": "Törölni szeretné a {szám} {szám, többes szám,\n  egy {pillanatkép}\n  egyéb {pillanatképek}\n}?",
-            "delete_snapshot_title": "Pillanatkép törlése",
-            "description": "A pillanatképekkel könnyen hozhatsz létre vagy tölthetsz vissza mentést a teljes Home Assistant példányodról.",
-            "enter_password": "Add meg a jelszót",
-            "failed_to_delete": "Nem sikerült törölni",
-            "folder": {
-                "addons/local": "Helyi bővítmények",
-                "homeassistant": "Home Assistant konfiguráció",
-                "media": "Média",
-                "share": "Megosztás",
-                "ssl": "SSL"
-            },
-            "folders": "Mappák",
-            "full_snapshot": "Teljes pillanatkép",
-            "name": "Pillanatkép neve",
-            "no_snapshots": "Nincs még egyetlen pillanatképed sem létrehozva.",
-            "partial_snapshot": "Részleges pillanatkép",
-            "password": "Pillanatkép jelszava",
-            "password_protected": "jelszóval védett",
-            "password_protection": "Jelszóvédelem",
-            "passwords_not_matching": "A jelszavak nem egyeznek",
-            "security": "Biztonság",
-            "select_type": "Válassza ki, hogy mit szeretne visszaállítani",
-            "selected": "{number} kiválasztva",
-            "type": "Pillanatkép típusa",
-            "upload_snapshot": "Pillanatkép feltöltése"
-        },
         "store": {
             "missing_addons": "Hiányzó add-onok? Kapcsold be a haladó üzemmódot a felhasználói profil oldalon",
+            "no_results_found": "Nincs találat a(z) {repository}-ban.",
+            "registries": "Rendszerleíró adatbázis",
             "repositories": "Tárolók"
         },
         "system": {
@@ -418,6 +422,7 @@
                 "confirm_shutdown": "Valóban le szeretnéd állítani a gazdagépet?",
                 "deployment": "Telepítés",
                 "docker_version": "Docker verzió",
+                "emmc_lifetime_used": "Az eMMC élettartama elhasználódott",
                 "failed_to_get_hardware_list": "Nem sikerült lekérni a hardverlistát",
                 "failed_to_import_from_usb": "Nem sikerült importálni az USB-ről",
                 "failed_to_reboot": "A gazdagép újraindítása sikertelen",
@@ -448,30 +453,38 @@
                 "failed_to_set_option": "Nem sikerült beállítani a Supervisor opciót",
                 "failed_to_update": "Nem sikerült frissíteni a Supervisort",
                 "join_beta_action": "Csatlakozás a béta csatornához",
+                "join_beta_description": "Béta frissítéseket kaphat a Home Assistant (RC), a Supervisor és a host szolgáltatásról",
                 "leave_beta_action": "Kilépés a béta csatornából",
-                "leave_beta_description": "Stabil frissítések a Home Assistanthoz, a Supervisorhoz és a gazdagéphez",
+                "leave_beta_description": "Stabil frissítések Home Assistant-hoz, a Supervisor-hoz és a gazdagéphez",
                 "ram_usage": "Supervisor RAM használat",
                 "reload_supervisor": "Supervisor újratöltése",
                 "search": "Keresés",
                 "share_diagnostics": "Diagnosztika megosztása",
                 "share_diagnostics_description": "Összeomlási jelentések és diagnosztikai információk megosztása.",
+                "share_diagonstics_description": "Szeretné automatikusan megosztani az összeomlási jelentéseket és a diagnosztikai információkat, amikor a supervisor váratlan hibákkal találkozik? {line_break} Ez lehetővé teszi számunkra a problémák megoldását, az információkat csak a Home Assistant Core csapata érheti el, és nem osztják meg másokkal. {line_break} Az adatok nem tartalmaznak privát / érzékeny információkat, és ezt bármikor letilthatja a beállításokban.",
                 "share_diagonstics_title": "Segíts a Home Assistant fejlesztésében",
+                "unhealthy_description": "Az \"egészségtelen\" telepítés futtatása problémákat okoz. Az alábbiakban felsoroljuk a telepítés során talált problémákat. Kattintson a linkekre, hogy megtudja, hogyan oldhatja meg a problémákat.",
                 "unhealthy_reason": {
                     "docker": "A Docker futtatókörnyezet nem működik megfelelően",
+                    "privileged": "A supervisor nem privilegizált",
                     "setup": "A Supervisor beállítása sikertelen volt",
                     "supervisor": "A Supervisor nem tudott frissíteni",
                     "untrusted": "Nem megbízható tartalom észlelése"
                 },
                 "unhealthy_title": "A telepítés nem megfelelő",
+                "unsupported_description": "Az alábbiakban felsoroljuk a telepítés során talált problémákat. Kattintson a linkekre, hogy megtudja, hogyan oldhatja meg a problémákat.",
                 "unsupported_reason": {
                     "apparmor": "Az AppArmor nincs engedélyezve a gazdagépen",
                     "container": "Konténerek, amelyekről ismert, hogy problémákat okoznak",
+                    "content-trust": "A tartalom-megbízhatóság ellenőrzése le van tiltva",
                     "dbus": "DBUS",
                     "docker_configuration": "Docker konfiguráció",
                     "docker_version": "Docker verzió",
+                    "job_conditions": "Figyelmen kívül hagyott körülmények",
                     "lxc": "LCX",
                     "network_manager": "Network Manager",
                     "os": "Operációs rendszer",
+                    "privileged": "A supervisor nem privilegizált",
                     "systemd": "Systemd"
                 },
                 "unsupported_title": "Nem támogatott telepítést futtat",
@@ -685,6 +698,7 @@
                         "title": "Hiba történt a bővítmények beolvasása közben"
                     },
                     "no_supervisor": {
+                        "description": "Nem található supervisor, így a kiegészítőket nem sikerült betölteni.",
                         "title": "Nincs Supervisor"
                     }
                 }
@@ -725,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Befejezés dátuma",
+                "ranges": {
+                    "last_week": "Múlt hét",
+                    "this_week": "Ezen a héten",
+                    "today": "Ma",
+                    "yesterday": "Tegnap"
+                },
                 "select": "Kiválasztás",
                 "start_date": "Kezdés dátuma"
             },
@@ -755,7 +775,7 @@
                 "no_history_found": "Nem található előzmény."
             },
             "logbook": {
-                "by": "által",
+                "by": "általa:",
                 "by_service": "szolgáltatás szerint",
                 "entries_not_found": "Nincsenek naplóbejegyzések.",
                 "messages": {
@@ -816,10 +836,10 @@
                 "documentation": "dokumentáció",
                 "learn_adding_local_media": "Tudj meg többet a média hozzáadásról a {documentation}ban.",
                 "local_media_files": "Helyezd el a videó-, hang- és képfájljaidat a média könyvtárban ahhoz, hogy tallózhasd és lejátszhasd őket a böngészőben vagy a támogatott médialejátszókon.",
+                "media-player-browser": "Médialejátszó böngésző",
                 "media_browsing_error": "Média böngészési hiba",
                 "media_not_supported": "A böngésző médialejátszó nem támogatja az ilyen típusú médiafájlokat",
                 "media_player": "Médialejátszó",
-                "media-player-browser": "Médialejátszó böngésző",
                 "no_items": "Nincsenek elemek",
                 "no_local_media_found": "Nem található helyi média",
                 "no_media_folder": "Úgy tűnik, még nem hoztál létre média könyvtárat.",
@@ -889,6 +909,23 @@
             "service-picker": {
                 "service": "Szolgáltatás"
             },
+            "statistic-picker": {
+                "learn_more": "További információ a statisztikákról",
+                "missing_entity": "Miért nem szerepel itt az entitás?",
+                "no_match": "Nem található megfelelő statisztika",
+                "no_statistics": "Jelenleg nincs statisztikád",
+                "statistic": "Statisztika"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Statisztika betöltése...",
+                "no_statistics_found": "Nem található statisztika.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "átlag",
+                    "min": "min",
+                    "sum": "összeg"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Terület kiválasztása",
                 "add_device_id": "Eszköz kiválasztása",
@@ -907,8 +944,9 @@
         },
         "dialogs": {
             "config_entry_system_options": {
-                "enable_new_entities_description": "Ha le van tiltva, akkor az újonnan felfedezett {integration} entitások nem lesznek automatikusan hozzáadva a Home Assistant-hoz.",
+                "enable_new_entities_description": "Ha le van tiltva, akkor az újonnan felfedezett {integration} entitások nem lesznek automatikusan hozzáadva Home Assistant-hoz.",
                 "enable_new_entities_label": "Újonnan hozzáadott entitások engedélyezése.",
+                "enable_polling_description": "Home Assistant automatikusan lekérdezze-e az {integration} entitások a frissített állapotát.",
                 "enable_polling_label": "A frissítések lekérdezésének engedélyezése.",
                 "restart_home_assistant": "A módosítások életbe lépéséhez újra kell indítania a Home Assistant alkalmazást.",
                 "title": "{integration} rendszerbeállításai",
@@ -924,15 +962,17 @@
                 "dismiss": "Elvetés",
                 "editor": {
                     "advanced": "Haladó beállítások",
+                    "area": "Csak az entitás területét állítsa be",
+                    "area_note": "Alapértelmezés szerint egy eszköz entitásai ugyanazon a területen vannak, mint az eszköz. De ha megváltoztatja ennek az entitásnak a területét, nem követi az eszköz területe is, azt is át kell állítani.",
                     "change_device_area": "Az eszköz területének módosítása",
                     "confirm_delete": "Biztosan törölni szeretnéd ezt a bejegyzést?",
                     "delete": "Törlés",
                     "device_disabled": "Ennek az entitásnak az eszköze le van tiltva.",
                     "enabled_cause": "Letiltva. ({cause})",
-                    "enabled_delay_confirm": "Az engedélyezett entitások {delay} másodpercen belül hozzá lesznek adva a Home Assistant-hoz",
-                    "enabled_description": "A letiltott entitások nem lesznek hozzáadva a Home Assistant-hoz.",
+                    "enabled_delay_confirm": "Az engedélyezett entitások {delay} másodpercen belül hozzá lesznek adva Home Assistant-hoz",
+                    "enabled_description": "A letiltott entitások nem lesznek hozzáadva Home Assistant-hoz.",
                     "enabled_label": "Entitás engedélyezése",
-                    "enabled_restart_confirm": "Az entitások engedélyezésének befejezéséhez indítsd újra a Home Assistant-et",
+                    "enabled_restart_confirm": "Az entitások engedélyezésének befejezéséhez indítsd újra Home Assistant-ot",
                     "entity_id": "Entitás ID",
                     "follow_device_area": "Kövesse a készülék területét",
                     "icon": "Ikon",
@@ -944,6 +984,7 @@
                     "update": "Frissítés"
                 },
                 "faq": "dokumentáció",
+                "info_customize": "Néhány attribútumot felülírhat a {customize_link} szakaszban.",
                 "no_unique_id": "Ennek az entitásnak (\"{entity_id}\") nincs egyedi azonosítója, ezért a beállításait nem lehet kezelni a felhasználói felületről. További részletekért tekintsd meg a {faq_link} oldalt.",
                 "related": "Kapcsolatok",
                 "settings": "Beállítások"
@@ -1073,6 +1114,10 @@
                 "form": {
                     "header": "Opciók"
                 },
+                "loading": {
+                    "loading_flow": "Várjon, amíg az {integration} lehetőségei inicializálódnak",
+                    "loading_step": "A(z) {integration} következő lépésének betöltése"
+                },
                 "success": {
                     "description": "Beállítások sikeresen mentve."
                 }
@@ -1086,18 +1131,18 @@
                         "core": "Általános",
                         "customize": "Testreszabások",
                         "devices": "Eszközök",
+                        "energy": "Energia",
                         "entities": "Entitások",
                         "helpers": "Segítők",
                         "info": "Infó",
                         "integrations": "Integrációk",
                         "logs": "Napló",
                         "lovelace": "Lovelace Irányítópultok",
-                        "navigate_to": "Ugrás ide: {panel}",
                         "person": "Személyek",
                         "scene": "Jelenetek",
                         "script": "Szkriptek",
                         "server_control": "Szerver vezérlés",
-                        "tag": "Címkék",
+                        "tag": "Matricák",
                         "users": "Felhasználók",
                         "zone": "Zónák"
                     },
@@ -1188,6 +1233,7 @@
             },
             "zha_reconfigure_device": {
                 "attribute": "Attribútum",
+                "battery_device_warning": "Az újrakonfigurációs folyamat megkezdése előtt fel kell ébresztenie az akkumulátorral működő eszközöket. A készülék ébresztésére vonatkozó utasításokat az eszköz kézikönyvében találja.",
                 "bind_header": "Kötés",
                 "button_hide": "Részletek elrejtése",
                 "button_show": "Részletek megjelenítése",
@@ -1197,8 +1243,10 @@
                 "configuring_alt": "Konfigurálás",
                 "heading": "Eszköz újrakonfigurálása",
                 "in_progress": "Az eszköz újrakonfigurálása folyamatban van. Ez eltarthat egy ideig.",
+                "introduction": "Konfigurálja újra az eszközt a Zigbee hálózatán. Használja ezt a funkciót, ha készüléke nem működik megfelelően.",
                 "min_max_change": "min/max/változás",
                 "reporting_header": "Jelentés",
+                "run_in_background": "Bezárhatja ezt a párbeszédpanelt, az újrakonfigurálás a háttérben folytatódik.",
                 "start_reconfiguration": "Újrakonfigurálás indítása"
             }
         },
@@ -1215,15 +1263,19 @@
                 "editor_not_available": "Nincs elérhető vizuális szerkesztő a(z) \"{type}\" típushoz.",
                 "editor_not_supported": "A vizuális szerkesztő nem támogatott ebben a konfigurációban",
                 "error_detected": "Konfigurációs hibákat észleltünk",
-                "key_missing": "A (z) \" {key}\" szükséges kulcs hiányzik.",
+                "key_missing": "A szükséges \"{key}\" kulcs hiányzik.",
                 "key_not_expected": "A(z) \"{key}\" kulcs nem várt, vagy a vizuális szerkesztő nem támogatja.",
+                "key_wrong_type": "A \" {key} \" megadott értékét a vizuális szerkesztő nem támogatja. Támogatjuk ( {type_correct} ), de megkaptuk ( {type_wrong} ).",
+                "no_template_editor_support": "A sablonokat a vizuális szerkesztő nem támogatja",
                 "no_type_provided": "Nincs megadva típus."
             },
             "supervisor": {
                 "ask": "Kérjen segítséget",
                 "observer": "Ellenőrizze a Figyelőt",
                 "reboot": "Próbálja újraindítani a gazdagépet",
-                "system_health": "Rendszerállapot ellenőrzése"
+                "system_health": "Rendszerállapot ellenőrzése",
+                "title": "Nem sikerült betölteni a Supervisor panelt!",
+                "wait": "Ha most kezdte, győződjön meg arról, hogy elegendő időt adott-e a felügyelőnek a kezdéshez."
             }
         },
         "login-form": {
@@ -1243,8 +1295,8 @@
             "dismiss": "Elvetés",
             "integration_starting": "{integration} indítása folyamatban van, nem lesz elérhető, amíg ez be nem fejeződik.",
             "service_call_failed": "Nem sikerült meghívni a(z) {service} szolgáltatást.",
-            "started": "A Home Assistant indítása befejeződött!",
-            "starting": "A Home Assistant indítása folyamatban van. Nem lesz minden elérhető, amíg ez be nem fejeződik.",
+            "started": "Home Assistant indítása befejeződött!",
+            "starting": "Home Assistant indítása folyamatban van. Nem lesz minden elérhető, amíg ez be nem fejeződik.",
             "triggered": "Aktiválva {name}",
             "wrapping_up_startup": "Az indítás folyamatban. A folyamat befejezéséig nem minden lesz elérhető."
         },
@@ -1274,6 +1326,7 @@
                         "linked_entities_caption": "Entitások",
                         "name": "Név",
                         "name_required": "Név szükséges",
+                        "no_linked_entities": "Nincsenek ehhez a területhez kapcsolódó entitások.",
                         "unknown_error": "Ismeretlen hiba",
                         "update": "Frissítés"
                     },
@@ -1281,7 +1334,7 @@
                         "create_area": "Terület létrehozása",
                         "header": "Területek",
                         "integrations_page": "Integrációk oldal",
-                        "introduction": "A területekkel az eszközök elhelyezkedés szerint rendszerezhetők. Ezen információk felhasználásával a Home Assistant segíteni tud előkészíteni a felületet, a jogosultságokat és az integrációt más rendszerekkel.",
+                        "introduction": "A területekkel az eszközök elhelyezkedés szerint rendszerezhetők. Ezen információk felhasználásával Home Assistant segíteni tud előkészíteni a felületet, a jogosultságokat és az integrációt más rendszerekkel.",
                         "introduction2": "Az eszközök területekbe történő elhelyezéséhez használd az alábbi linket az integrációs oldalra való navigáláshoz, majd kattints egy konfigurált integrációra az eszközkártyák eléréséhez.",
                         "no_areas": "Úgy tűnik, még nincs egy területed sem!"
                     }
@@ -1313,7 +1366,6 @@
                             "introduction": "A műveleteket hajtja végre a Home Assistant, ha egy automatizálás elindul. Kattints az alábbi linkre, ha többet szeretnél megtudni a műveletekről.",
                             "learn_more": "Tudj meg többet a műveletekről",
                             "name": "Művelet",
-                            "type_select": "Művelet típusa",
                             "type": {
                                 "choose": {
                                     "add_option": "Opció hozzáadása",
@@ -1354,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Ismétlés",
                                     "sequence": "Műveletek",
-                                    "type_select": "Ismétlés típusa",
                                     "type": {
                                         "count": {
                                             "label": "Számláló"
@@ -1367,7 +1418,8 @@
                                             "conditions": "Amíg teljesülnek a feltételek",
                                             "label": "Amíg"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Ismétlés típusa"
                                 },
                                 "scene": {
                                     "label": "Jelenet aktiválása"
@@ -1387,6 +1439,7 @@
                                     "wait_template": "Várakozási sablon"
                                 }
                             },
+                            "type_select": "Művelet típusa",
                             "unsupported_action": "Nincs felhasználói felület támogatás a művelethez: {action}"
                         },
                         "alias": "Név",
@@ -1405,7 +1458,6 @@
                             "introduction": "A feltételek opcionálisak és meggátolják a további végrehajtást, kivéve, ha minden feltétel teljesül.",
                             "learn_more": "Tudj meg többet a feltételekről",
                             "name": "Feltétel",
-                            "type_select": "Feltétel típusa",
                             "type": {
                                 "and": {
                                     "label": "És"
@@ -1466,12 +1518,18 @@
                                         "wed": "Szerda"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Eseményindító ID",
+                                    "label": "Eseményindító",
+                                    "no_triggers": "Nincs elérhető eseményindító"
+                                },
                                 "zone": {
                                     "entity": "Entitás helyszínnel",
                                     "label": "Zóna",
                                     "zone": "Zóna"
                                 }
                             },
+                            "type_select": "Feltétel típusa",
                             "unsupported_condition": "Nincs felhasználói felület támogatás a feltételhez: {condition}"
                         },
                         "copy_to_clipboard": "Másolás a vágólapra",
@@ -1509,10 +1567,10 @@
                             "delete_confirm": "Biztos, hogy ezt törölni szeretnéd?",
                             "duplicate": "Duplikálás",
                             "header": "Eseményindítók",
+                            "id": "Eseményindító ID (az eseményindító feltétel használja)",
                             "introduction": "Az eseményindítók indítják el az automatizálási szabályok feldolgozását. Több eseményindítót is meg lehet adni egy szabályhoz. Ha egy eseményindító elindul, akkor a Home Assistant ellenőrzi a feltételeket - ha vannak -, majd meghívja a műveletet.",
                             "learn_more": "Tudj meg többet az eseményindítókról",
                             "name": "Eseményindító",
-                            "type_select": "Eseményindító típusa",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1572,24 +1630,24 @@
                                     "sunset": "Napnyugta"
                                 },
                                 "tag": {
-                                    "label": "Címke"
+                                    "label": "Matrica"
                                 },
                                 "template": {
                                     "label": "Sablon",
                                     "value_template": "Érték sablon"
                                 },
-                                "time_pattern": {
-                                    "hours": "Óra",
-                                    "label": "Idő sablon",
-                                    "minutes": "Perc",
-                                    "seconds": "Másodperc"
-                                },
                                 "time": {
                                     "at": "Mikor",
                                     "label": "Idő",
                                     "type_input": "Dátum/idő segítő értéke",
                                     "type_value": "Rögzített időpont"
                                 },
+                                "time_pattern": {
+                                    "hours": "Óra",
+                                    "label": "Idő sablon",
+                                    "minutes": "Perc",
+                                    "seconds": "Másodperc"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1603,6 +1661,7 @@
                                     "zone": "Zóna"
                                 }
                             },
+                            "type_select": "Eseményindító típusa",
                             "unsupported_platform": "Nincs felhasználói felület támogatás a platformhoz: {platform}"
                         },
                         "unsaved_confirm": "Vannak nem mentett módosítások. Biztos, hogy elhagyod az oldalt?"
@@ -1612,6 +1671,7 @@
                         "delete_automation": "Automatizálás törlése",
                         "delete_confirm": "Biztosan törölni szeretnéd ezt az automatizálást?",
                         "dev_automation": "Hibakeresési automatizálás",
+                        "dev_only_editable": "Csak azok az automatizálások hibakereshetők, amelyekhez egyedi azonosító van hozzárendelve.",
                         "duplicate": "Duplikálás",
                         "duplicate_automation": "Automatizálás duplikálása",
                         "edit_automation": "Automatizálás szerkesztése",
@@ -1689,7 +1749,7 @@
                             "enable_ha_skill": "Home Assistant készség aktiválása Alexának",
                             "enable_state_reporting": "Állapotjelentés engedélyezése",
                             "info": "Az Alexa integrációval a Home Assistant Felhő lehetőséget nyújt minden Home Assistant eszköz vezérlésére bármely Alexa képes eszközzel.",
-                            "info_state_reporting": "Ha engedélyezed az állapotjelentést, akkor a Home Assistant minden állapotváltozást el fog küldeni a feltárt entitásokról az Amazon-nak. Ez lehetővé teszi, hogy mindig láthasd a legfrissebb állapotokat az Alexa alkalmazásban, és az állapotváltozásokkal rutinokat hozhass létre.",
+                            "info_state_reporting": "Ha engedélyezed az állapotjelentést, akkor Home Assistant minden állapotváltozást el fog küldeni a feltárt entitásokról az Amazon-nak. Ez lehetővé teszi, hogy mindig láthasd a legfrissebb állapotokat az Alexa alkalmazásban, és az állapotváltozásokkal rutinokat hozhass létre.",
                             "manage_entities": "Entitások kezelése",
                             "state_reporting_error": "Nem lehet {enable_disable} az állapotjelentést.",
                             "sync_entities": "Entitások szinkronizálása az Amazonnal",
@@ -1711,6 +1771,7 @@
                             "info": "A Google Asszisztens integrációval a Home Assistant Felhő lehetőséget nyújt minden Home Assistant eszköz vezérlésére bármely Google Asszisztens képes eszközzel.",
                             "info_state_reporting": "Ha engedélyezed az állapotjelentést, akkor a Home Assistant minden állapotváltozást el fog küldeni a feltárt entitásokról a Google-nak. Ez lehetővé teszi, hogy mindig láthasd a legfrissebb állapotokat a Google alkalmazásban.",
                             "manage_entities": "Entitások kezelése",
+                            "not_configured_text": "A Google Segéd használata előtt aktiválnia kell a Home Assistant Cloud-ot Google Assistant számára a Google Home alkalmazásban.",
                             "not_configured_title": "A Google Assistant nincs aktiválva",
                             "security_devices": "Biztonsági eszközök",
                             "sync_entities": "Entitások szinkronizálása a Google-lal",
@@ -1733,8 +1794,10 @@
                             "instance_will_be_available": "A példányod itt lesz elérhető:",
                             "link_learn_how_it_works": "Tudd meg, hogyan működik",
                             "not_connected": "Nincs csatlakoztatva",
+                            "reconnecting": "Újracsatlakozás…",
                             "remote_enabled": {
-                                "caption": "Automatikus csatlakozás"
+                                "caption": "Automatikus csatlakozás",
+                                "description": "Engedélyezze ezt a lehetőséget, hogy megbizonyosodjon arról, hogy a Home Assistant példány mindig távolról elérhető."
                             },
                             "title": "Távoli vezérlés"
                         },
@@ -1750,7 +1813,7 @@
                                 "target_browser": "Böngésző"
                             },
                             "female": "Nő",
-                            "info": "Csinálj az otthonodnak személyiséget azzal, hogy a szövegfelolvasó szolgáltatásaink segítségével beszélhessünk veled. Ez használható az automatizálásokban és a szkriptekben a(z) {service} szolgáltatás használatával.",
+                            "info": "Varázsolj egyedi személyiséget az otthonodnak azzal, hogy a szövegfelolvasó szolgáltatásaink segítségével beszélhessünk veled. Ez használható az automatizálásokban és a szkriptekben a(z) {service} szolgáltatás használatával.",
                             "male": "Férfi",
                             "title": "Szövegről beszédre",
                             "try": "Próbálja meg"
@@ -1762,9 +1825,9 @@
                             "loading": "Betöltés...",
                             "manage": "Kezelés",
                             "no_hooks_yet": "Úgy tűnik, még nincs egy webhookod sem. Kezdéshez konfigurálj egy ",
+                            "no_hooks_yet2": "vagy hozz létre egy",
                             "no_hooks_yet_link_automation": "webhook automatizálást",
                             "no_hooks_yet_link_integration": "webhook-alapú integrációt",
-                            "no_hooks_yet2": "vagy hozz létre egy",
                             "title": "Webhookok"
                         }
                     },
@@ -1879,36 +1942,13 @@
                     "description": "Egységrendszer, hely, időzóna és egyéb általános paraméterek",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "header": "Analitika",
-                                "instance_id": "Példányazonosító: {huuid}",
-                                "preference": {
-                                    "base": {
-                                        "description": "Példányazonosító, verzió és telepítési típus.",
-                                        "title": "Alapvető elemzés"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Megosztja az összeomlási jelentéseket, ha váratlan hibák lépnek fel.",
-                                        "title": "Diagnosztika"
-                                    },
-                                    "statistics": {
-                                        "title": "Felhasználási statisztikák"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nevek, verziók és képességek.",
-                                        "title": "Használt integrációk és kiegészítők"
-                                    },
-                                    "usage": {
-                                        "description": "Nevek és verzióinformációk.",
-                                        "title": "Használt integrációk"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Pénznem",
                                 "edit_requires_storage": "A szerkesztő le van tiltva, mert a konfiguráció a configuration.yaml fájlban van tárolva.",
                                 "elevation": "Magasság",
                                 "elevation_meters": "méter",
                                 "external_url": "Külső URL",
+                                "find_currency_value": "Szabvány elnevezés megtalálása",
                                 "imperial_example": "Fahrenheit, font",
                                 "internal_url": "Belső URL",
                                 "latitude": "Szélesség",
@@ -1957,7 +1997,7 @@
                         },
                         "automations": "Automatizálások",
                         "conditions": {
-                            "caption": "Csak akkor csinálj valamit, ha a(z)...",
+                            "caption": "Csak akkor történjen valami, ha...",
                             "no_conditions": "Nincsenek feltételek",
                             "unknown_condition": "Ismeretlen feltétel"
                         },
@@ -1966,7 +2006,7 @@
                         "no_automations": "Nincsenek automatizálások",
                         "no_device_automations": "Ehhez az eszközhöz nem állnak rendelkezésre automatizálások.",
                         "triggers": {
-                            "caption": "Kezdj el csinálni valamit, amikor a(z)...",
+                            "caption": "Történjen valami, amikor...",
                             "no_triggers": "Nincsenek eseményindítók",
                             "unknown_trigger": "Ismeretlen eseményindító"
                         },
@@ -1975,6 +2015,7 @@
                     "cant_edit": "Kizárólag a felhasználói felületen létrehozott elemeket szerkesztheted.",
                     "caption": "Eszközök",
                     "confirm_delete": "Biztosan törölni szeretnéd ezt az eszközt?",
+                    "confirm_disable_config_entry": "Nincs több eszköz a {entry_name} konfigurációs bejegyzéshez, szeretné inkább letiltani a konfigurációs bejegyzést?",
                     "confirm_rename_entity_ids": "Szeretnéd átnevezni az entitások ID-ját is?",
                     "confirm_rename_entity_ids_warning": "Ez nem módosítja azokat a konfigurációkat (például automatizálásokat, szkripteket, jeleneteket, irányítópultokat), amelyek jelenleg ezeket az entitásokat használják! Az új entitásazonosítók használatához saját kezűleg kell frissítened őket!",
                     "data_table": {
@@ -2036,13 +2077,70 @@
                     "update": "Frissítés",
                     "update_device_error": "A készülék frissítése sikertelen"
                 },
+                "energy": {
+                    "caption": "Energia",
+                    "description": "Az energiatermelés, -fogyasztás nyomon követése",
+                    "device_consumption": {
+                        "add_stat": "Válassza ki az entitást az energiafogyasztás nyomon követéséhez",
+                        "dialog": {
+                            "selected_stat_intro": "Válassza ki az eszköz energiafelhasználását reprezentáló entitást."
+                        },
+                        "learn_more": "További információ a kezdésről.",
+                        "selected_stat": "Az energia nyomon követése",
+                        "sub": "Az egyes eszközök energiafelhasználásának nyomon követése lehetővé teszi, hogy Home Assistant lebontsa az energiafelhasználást külön az eszközökre.",
+                        "title": "Egyedi eszközök"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Használjon egy entitást aktuális árral",
+                                "cost_entity_input": "Entitás az aktuális árral",
+                                "cost_number": "Használjon fix árat",
+                                "cost_number_input": "Ár kWh-ként",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Válassza ki, hogy a HomeAssistant hogyan kövesse nyomon a vételezett energia költségeit.",
+                                "cost_stat": "A teljes költségeket nyomon követő entitás használata",
+                                "cost_stat_input": "Entitás a teljes költséggel",
+                                "energy_stat": "Vételezett energia (kWh)",
+                                "header": "Hálózati vételezés konfigurálása",
+                                "no_cost": "Ne kövesse nyomon a költségeket",
+                                "paragraph": "A vételezett energia az, amely az energiahálózatból az otthonába áramlik."
+                            },
+                            "to": {
+                                "cost_entity": "Használjon aktuális árat az entitásnál",
+                                "cost_entity_input": "Entitás az aktuális árral",
+                                "cost_number": "Használjon fix árat",
+                                "cost_number_input": "Ár kWh-ként",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Kap visszatérítést, ha visszatáplál energiát a hálózatba?",
+                                "cost_stat": "Használjon olyan entitást, amely nyomon követi a visszatérített pénzt",
+                                "cost_stat_input": "Teljes kompenzáció entitás",
+                                "energy_stat": "A hálózatba visszatáplált energia (kWh)",
+                                "header": "Hálózati visszatáplás konfigurálása",
+                                "no_cost": "Nem kapok vissza pénzt",
+                                "paragraph": "A visszatáplált energia az, amely a napelemekből a hálózatba áramlik."
+                            }
+                        },
+                        "learn_more": "Bővebben a beállítás módjáról.",
+                        "sub": "Állítsa be a hálózatból vételezett-, illetve ha termel, a visszatáplált energia mennyiségét. Ez lehetővé teszi Home Assistant számára, hogy nyomon kövesse az otthoni energiafelhasználást.",
+                        "title": "Villamosenergia-hálózat"
+                    },
+                    "solar": {
+                        "learn_more": "További információ a kezdésről.",
+                        "stat_predicted_production": "Napenergia-termelésének előrejelzése",
+                        "stat_production": "Az Ön napenergia-termelése",
+                        "stat_return_to_grid": "A hálózatba visszatáplált napenergia",
+                        "sub": "Hagyja, hogy Home Assistant figyelje a napelemeket, és betekintést nyerjen azok teljesítmény-adataiba.",
+                        "title": "Napelemek"
+                    }
+                },
                 "entities": {
                     "caption": "Entitások",
                     "description": "Ismert entitások kezelése",
                     "picker": {
                         "disable_selected": {
                             "button": "Kiválasztottak letiltása",
-                            "confirm_text": "A letiltott entitások nem lesznek hozzáadva a Home Assistant-hoz.",
+                            "confirm_text": "A letiltott entitások nem lesznek hozzáadva Home Assistant-hoz.",
                             "confirm_title": "Le szeretnél tiltani {number} {number, plural,\n  one {entitást}\n  other {entitást}\n}?"
                         },
                         "enable_selected": {
@@ -2067,7 +2165,7 @@
                             "status": "Állapot"
                         },
                         "introduction": "A Home Assistant nyilvántartást vezet minden olyan entitásról, melyet valaha látott, és egyedileg azonosítható. Ezen entitások mindegyikéhez létrejön egy entitás ID, amely csak az adott entitáshoz van rendelve.",
-                        "introduction2": "Az entitás nyilvántartás használatával felülbírálhatod a nevet, módosíthatod az entitás ID-t vagy eltávolíthatod a bejegyzést a Home Assistant-ból.",
+                        "introduction2": "Az entitás nyilvántartás használatával felülbírálhatod a nevet, módosíthatod az entitás ID-t vagy eltávolíthatod a bejegyzést Home Assistant-ból.",
                         "remove_selected": {
                             "button": "Kiválasztottak eltávolítása",
                             "confirm_partly_text": "A kiválasztott {selected} entitás közül csak {removable} távolítható el. Az entitások csak akkor távolíthatók el, ha az integráció már nem biztosítja azokat. Néha újra kell indítani a Home Assistant-et, mielőtt el tudnád távolítani egy már eltávolított integráció entitásait. Biztosan el szeretnéd távolítani az eltávolítható entitásokat?",
@@ -2086,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Törlés",
-                    "filtering_by": "Szűrés",
-                    "show": "Megmutat"
-                },
-                "hassio": {
-                    "button": "Konfigurál"
-                },
                 "header": "Home Assistant beállítása",
                 "helpers": {
                     "caption": "Segítők",
@@ -2143,16 +2233,11 @@
                     "server": "server",
                     "setup_time": "Beállítási idő",
                     "source": "Forrás:",
-                    "system_health_error": "A rendszerállapot összetevő nincs betöltve. Add hozzá a 'system_health:' sort a configuration.yaml fájlhoz.",
                     "system_health": {
                         "manage": "Kezelés",
                         "more_info": "további infók"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "integrációk oldal",
-                    "missing_zha": "Nem találod a ZHA konfigurációs panelt? Át lett helyezve az {integrations_page} a ZHA bejegyzéséhez.",
-                    "missing_zwave": "Nem találod a Z-Wave konfigurációs panelt? Át lett helyezve az {integrations_page} a Z-Wave bejegyzéséhez."
+                    },
+                    "system_health_error": "A rendszerállapot összetevő nincs betöltve. Add hozzá a 'system_health:' sort a configuration.yaml fájlhoz."
                 },
                 "integrations": {
                     "add_integration": "Integráció hozzáadása",
@@ -2164,10 +2249,9 @@
                         "configure": "Konfigurál",
                         "delete": "Törlés",
                         "delete_confirm": "Biztosan törölni szeretnéd ezt az integrációt?",
+                        "depends_on_cloud": "A felhőtől függ",
                         "device_unavailable": "Eszköz nem érhető el",
                         "devices": "{count} {count, plural,\n  one {eszköz}\n  other {eszköz}\n}",
-                        "disable_error": "Az integráció engedélyezése vagy letiltása sikertelen volt",
-                        "disable_restart_confirm": "Indítsa újra a Home Assistant programot az integráció lekapcsolásának befejezéséhez",
                         "disable": {
                             "disable_confirm": "Biztosan letiltja ezt a konfigurációs bejegyzést? Eszközeit és entitásait letiltjuk.",
                             "disabled": "Letiltva",
@@ -2178,25 +2262,27 @@
                             },
                             "disabled_cause": "Letiltva ez által: {cause}"
                         },
+                        "disable_error": "Az integráció engedélyezése vagy letiltása sikertelen volt",
+                        "disable_restart_confirm": "Indítsa újra Home Assistant-ot az integráció lekapcsolásának befejezéséhez",
                         "disabled_polling": "A frissített adatok automatikus lekérdezése le van tiltva",
                         "documentation": "Dokumentáció",
-                        "enable_restart_confirm": "Indítsa újra a Home Assistant programot az integráció bekapcsolásának befejezéséhez",
+                        "enable_restart_confirm": "Indítsa újra Home Assistant-ot az integráció bekapcsolásának befejezéséhez",
                         "entities": "{count} {count, plural,\n  one {entitás}\n  other {entitás}\n}",
                         "entity_unavailable": "Entitás nem érhető el",
                         "firmware": "Firmware: {version}",
                         "hub": "Kapcsolódva",
-                        "logs": "naplók",
                         "manuf": "{manufacturer} által",
                         "no_area": "Nincs Terület",
                         "not_loaded": "Nincs betöltve",
-                        "options": "Opciók",
+                        "provided_by_custom_integration": "Egyéni integráció biztosítja",
                         "reload": "Újratöltés",
                         "reload_confirm": "Az integráció újra lett töltve",
-                        "reload_restart_confirm": "Indítsd újra a Home Assistant-et az integráció újratöltésének befejezéséhez",
+                        "reload_restart_confirm": "Indítsd újra Home Assistant-ot az integráció újratöltésének befejezéséhez",
                         "rename": "Átnevezés",
                         "restart_confirm": "Indítsd újra a Home Assistant-ot az integráció törlésének befejezéséhez",
                         "services": "{count} {count, plural,\n  one {szolgáltatás}\n  other {szolgáltatás}\n}",
                         "state": {
+                            "failed_unload": "Nem sikerült",
                             "loaded": "Betöltve",
                             "migration_error": "Migrációs hiba",
                             "not_loaded": "Nincs betöltve",
@@ -2219,10 +2305,14 @@
                             "open_site": "Weboldal megnyitása"
                         },
                         "finish": "Befejezés",
-                        "loading_first_time": "Kérlek várj, amíg az integráció telepítésre kerül",
+                        "loading": {
+                            "fallback_title": "az integráció",
+                            "loading_flow": "Várjon, amíg az {integration} beállítása folyamatban van",
+                            "loading_step": "A(z) {integration} következő lépésének betöltése"
+                        },
                         "next": "Következő",
                         "not_all_required_fields": "Nincs kitöltve minden szükséges mező.",
-                        "not_loaded": "Az integrációt nem sikerült betölteni. Próbálja meg újraindítani a Home Assistantot.",
+                        "not_loaded": "Az integrációt nem sikerült betölteni. Próbálja meg újraindítani Home Assistant-ot.",
                         "pick_flow_step": {
                             "new_flow": "Nem, állítson be egy másik {integration}",
                             "title": "Felfedeztük ezeket, be akarod állítani őket?"
@@ -2231,12 +2321,11 @@
                     },
                     "configure": "Beállítás",
                     "configured": "Konfigurálva",
-                    "confirm_new": "Be szeretnéd állítani a(z) {integráció}-t?",
+                    "confirm_new": "Be szeretnéd állítani: {integration}?",
                     "description": "Integrációk kezelése (szolgáltatások, eszközök...)",
                     "details": "Integráció részletei",
                     "disable": {
                         "disabled_integrations": "{number} letiltva",
-                        "hide_disabled": "A letiltott integrációk elrejtése",
                         "show": "Mutat",
                         "show_disabled": "A letiltott integrációk megjelenítése"
                     },
@@ -2247,7 +2336,6 @@
                         "confirm_delete_ignore_title": "{name} mellőzésének visszavonása?",
                         "confirm_ignore": "Biztosan nem szeretnéd beállítani ezt az integrációt? Visszavonhatod a döntésed, ha kiválasztod a 'mellőzött integrációk megjelenítése' menüpontot a jobb felső sarokban lévő menüben.",
                         "confirm_ignore_title": "{name} felfedezésének mellőzése?",
-                        "hide_ignored": "Mellőzött integrációk elrejtése",
                         "ignore": "Mellőzés",
                         "ignored": "Mellőzve",
                         "show_ignored": "Mellőzött integrációk megjelenítése",
@@ -2274,6 +2362,7 @@
                     "custom_integration": "egyedi integráció",
                     "description": "A Home Assistant naplófájlok megtekintése",
                     "details": "Naplóbejegyzés részletei ({level})",
+                    "error_from_custom_integration": "Ez a hiba egy egyéni integrációból lett származtatva.",
                     "level": {
                         "critical": "KRITIKUS HIBA",
                         "debug": "DEBUG",
@@ -2366,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Beállítás",
                     "description_listen": "Téma figyelése",
                     "description_publish": "Csomag közzététele",
                     "listening_to": "Figyelés:",
@@ -2380,7 +2468,6 @@
                     "topic": "téma"
                 },
                 "ozw": {
-                    "button": "Beállítás",
                     "common": {
                         "controller": "Vezérlő",
                         "instance": "Példány",
@@ -2405,6 +2492,11 @@
                         "nodes": "Csomópontok",
                         "select_instance": "Példány kiválasztása"
                     },
+                    "network": {
+                        "header": "Hálózat menedzsment",
+                        "introduction": "Az egész hálózatra kiterjedő funkciók kezelése.",
+                        "node_count": "{count} csomópont"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Minden csomópont lekérdezésre került",
@@ -2425,10 +2517,9 @@
                         "starting": "Indulás",
                         "unknown": "Ismeretlen"
                     },
-                    "network": {
-                        "header": "Hálózat menedzsment",
-                        "introduction": "Az egész hálózatra kiterjedő funkciók kezelése.",
-                        "node_count": "{count} csomópont"
+                    "node": {
+                        "button": "Csomópont részletei",
+                        "not_found": "A csomópont nem található"
                     },
                     "node_config": {
                         "header": "Csomópont konfigurációja",
@@ -2458,10 +2549,6 @@
                         "versions": "Információk beszerzése a firmware-ről és a parancsosztály verzióiról",
                         "wakeup": "Ébresztési várólisták és üzenetek támogatásának beállítása"
                     },
-                    "node": {
-                        "button": "Csomópont részletei",
-                        "not_found": "A csomópont nem található"
-                    },
                     "nodes_table": {
                         "failed": "Sikertelen",
                         "id": "ID",
@@ -2500,7 +2587,7 @@
                     "confirm_delete": "Biztosan törölni szeretnéd ezt a személyt?",
                     "confirm_delete2": "Minden ehhez a személyhez tartozó eszköz hozzárendelés nélküli lesz.",
                     "create_person": "Személy létrehozása",
-                    "description": "A Home Assistant által követett személyek kezelése",
+                    "description": "Home Assistant által követett személyek kezelése",
                     "detail": {
                         "admin": "Adminisztrátor",
                         "allow_login": "Személy bejelentkezésének engedélyezése",
@@ -2519,7 +2606,7 @@
                         "no_device_tracker_available_intro": "Ha vannak olyan eszközeid, amelyek jelzik egy személy jelenlétét, akkor itt hozzá tudod rendelni őket egy személyhez. Az első eszköz hozzáadásához válassz egy jelenlét-érzékelő integrációt az integrációk oldalon.",
                         "update": "Frissítés"
                     },
-                    "introduction": "Itt adhatod meg a Home Assistant minden érdekelt személyét.",
+                    "introduction": "Itt adhatod meg Home Assistant minden érdekelt személyét.",
                     "learn_more": "Tudj meg többet az emberekről",
                     "no_persons_created_yet": "Úgy tűnik, még nem hoztál létre személyeket.",
                     "note_about_persons_configured_in_yaml": "Megjegyzés: a configuration.yaml fájlban konfigurált személyek nem szerkeszthetők a felhasználói felületen.",
@@ -2567,7 +2654,7 @@
                         },
                         "introduction": "A jelenet szerkesztő lehetővé teszi jelenetek létrehozását és szerkesztését. Kérlek, olvasd el az útmutatót az alábbi linken, hogy megbizonyosodj róla, hogy a Home Assistant helyesen van konfigurálva.",
                         "learn_more": "Tudj meg többet a jelenetekről",
-                        "no_scenes": "Nem találtunk szerkeszthető jeleneteket",
+                        "no_scenes": "Nem található jelenet",
                         "only_editable": "Csak a scenes.yaml fájlban megadott jelenetek szerkeszthetők.",
                         "pick_scene": "Válassz jelenetet a szerkesztéshez",
                         "show_info_scene": "Információk megjelenítése a jelenetről"
@@ -2604,10 +2691,12 @@
                         },
                         "save_script": "Szkript mentése",
                         "sequence": "Sorrend",
-                        "sequence_sentence": "A szkript műveleti sorrendje."
+                        "sequence_sentence": "A szkript műveleti sorrendje.",
+                        "show_trace": "Mutassa a nyomot"
                     },
                     "picker": {
                         "add_script": "Szkript hozzáadása",
+                        "dev_script": "Hibakeresési szkript",
                         "duplicate": "Duplikálás",
                         "duplicate_script": "Szkript duplikálása",
                         "edit_script": "Szkript szerkesztése",
@@ -2615,7 +2704,7 @@
                         "headers": {
                             "name": "Név"
                         },
-                        "introduction": "A szkript szerkesztő lehetővé teszi szkriptek létrehozását és szerkesztését. Kérlek, olvasd el az útmutatót az alábbi linken, hogy megbizonyosodj róla, hogy a Home Assistant helyesen van konfigurálva.",
+                        "introduction": "A szkript szerkesztő lehetővé teszi szkriptek létrehozását és szerkesztését. Kérlek, olvasd el az útmutatót az alábbi linken, hogy megbizonyosodj róla, hogy Home Assistant helyesen van konfigurálva.",
                         "learn_more": "Tudj meg többet a szkriptekről",
                         "no_scripts": "Nem találtunk szerkeszthető szkripteket",
                         "run_script": "Szkript futtatása",
@@ -2643,7 +2732,7 @@
                             "input_number": "Szám bemenetek",
                             "input_select": "Választási bemenetek",
                             "input_text": "Szöveg bemenetek",
-                            "introduction": "A Home Assistant bizonyos részei újraindítás nélkül újratölthetőek. Újratöltéskor az aktuálisan betöltött YAML konfiguráció helyére betöltődik az új.",
+                            "introduction": "Home Assistant bizonyos részei újraindítás nélkül újratölthetőek. Újratöltéskor az aktuálisan betöltött YAML konfiguráció helyére betöltődik az új.",
                             "min_max": "Min/max entitások",
                             "mqtt": "Manuálisan konfigurált MQTT entitások",
                             "person": "Személyek",
@@ -2662,10 +2751,10 @@
                             "zone": "Zónák"
                         },
                         "server_management": {
-                            "confirm_restart": "Biztosan újra szeretnéd indítani a Home Assistant-ot?",
+                            "confirm_restart": "Biztosan újra szeretnéd indítani Home Assistant-ot?",
                             "confirm_stop": "Biztosan le szeretnéd állítani a Home Assistant-ot?",
                             "heading": "Szerver menedzsment",
-                            "introduction": "Home Assistant szerver vezérlése... a Home Assistant-ból.",
+                            "introduction": "Home Assistant szerver vezérlése... Home Assistant-ból.",
                             "restart": "Újraindítás",
                             "stop": "Leállítás"
                         },
@@ -2679,13 +2768,13 @@
                     }
                 },
                 "tag": {
-                    "add_tag": "Címke hozzáadása",
-                    "automation_title": "{name} címke beolvasva",
-                    "caption": "Címkék",
-                    "confirm_remove": "Biztosan el szeretnéd távolítani a(z) {tag} címkét?",
-                    "confirm_remove_title": "Eltávolítod a címkét?",
-                    "create_automation": "Automatizálás létrehozása címkével",
-                    "description": "Automatizálások indítása NFC-címke, QR-kód stb. beolvasásakor",
+                    "add_tag": "Matrica hozzáadása",
+                    "automation_title": "{name} matrcica beolvasva",
+                    "caption": "Matricák",
+                    "confirm_remove": "Biztosan el szeretnéd távolítani a(z) {tag} matricát?",
+                    "confirm_remove_title": "Eltávolítod a matricát?",
+                    "create_automation": "Matricás automatizálás létrehozása",
+                    "description": "Automatizálások indítása NFC-, QR-kód matricák stb. beolvasásakor",
                     "detail": {
                         "companion_apps": "társalkalmazások",
                         "create": "Létrehozás",
@@ -2693,20 +2782,20 @@
                         "delete": "Törlés",
                         "description": "Leírás",
                         "name": "Név",
-                        "new_tag": "Új címke",
-                        "tag_id": "Címke azonosító",
+                        "new_tag": "Új matrica hozzáadása",
+                        "tag_id": "Matrica azonosítója",
                         "tag_id_placeholder": "Automatikusan generálódik, ha nincs kitöltve",
                         "update": "Frissítés",
-                        "usage": "A címke beolvasáskor egy automatizálást indíthat el. Használhatsz NFC tageket, QR-kódokat vagy bármilyen más címkét. Használd a {companion_link} appot, hogy ezt a címkét egy programozható NFC tagre írd, vagy hozz létre egy QR-kódot lentebb."
+                        "usage": "A matrica beolvasáskor egy automatizálást indíthat el. Használhatsz matricaként NFC tageket, QR-kódokat vagy bármi más hasonlót. Használd a {companion_link} appot, hogy ezt a címkét egy programozható NFC tagre írd, vagy hozz létre egy QR-kódot most."
                     },
                     "edit": "Szerkesztés",
                     "headers": {
                         "last_scanned": "Utoljára beolvasva",
                         "name": "Név"
                     },
-                    "learn_more": "Tudj meg többet a címkékről",
+                    "learn_more": "Tudj meg többet a matricákról",
                     "never_scanned": "Sosem volt beolvasva",
-                    "no_tags": "Nincsenek címkék",
+                    "no_tags": "Nincsenek bekonfigurált matricák",
                     "write": "Írás"
                 },
                 "users": {
@@ -2764,7 +2853,6 @@
                         "search_again": "Keresés Újra",
                         "spinner": "ZHA Zigbee eszközök keresése..."
                     },
-                    "button": "Beállítás",
                     "cluster_attributes": {
                         "attributes_of_cluster": "A kiválasztott klaszter attribútumai",
                         "get_zigbee_attribute": "Zigbee attribútum lekérdezése",
@@ -2794,10 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Parancsikonok",
-                        "update_button": "Beállítások frissítése",
-                        "zha_options": {
-                            "title": "Globális beállítások"
-                        }
+                        "update_button": "Beállítások frissítése"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "A konfigurálás befejeződött",
@@ -2879,76 +2964,7 @@
                     "introduction": "A zónák lehetővé teszik a Föld bizonyos területeinek megadását. Ha egy személy egy zónán belül van, az állapota felveszi a zóna nevét. A zónák eseményindítóként vagy feltételként is használhatók az automatizálási beállításokon belül.",
                     "no_zones_created_yet": "Úgy tűnik, még nem hoztál létre zónákat."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "inclusion_finished": "A csomópont hozzá lett adva.",
-                        "introduction": "Ez a varázsló végigvezeti Önt egy csomópont hozzáadásán a Z-Wave-hálózathoz.",
-                        "title": "Adjon hozzá egy Z-Wave csomópontot",
-                        "view_device": "Eszköz megtekintése"
-                    },
-                    "button": "Konfigurálja",
-                    "common": {
-                        "add_node": "Node hozzáadása",
-                        "close": "Bezárás",
-                        "home_id": "Otthon azonosító",
-                        "network": "Hálózat",
-                        "node_id": "Node azonosító",
-                        "reconfigure_server": "Kiszolgáló újrakonfigurálása",
-                        "remove_node": "Node eltávolítása"
-                    },
-                    "dashboard": {
-                        "driver_version": "Illesztőprogram verzió",
-                        "dump_not_ready_confirm": "Letöltés",
-                        "dump_not_ready_title": "Még nem minden csomópont áll készen",
-                        "header": "Kezelje Z-Wave hálózatát",
-                        "home_id": "Otthon azonosító",
-                        "introduction": "A Z-Wave hálózat és a Z-Wave csomópontok kezelése",
-                        "nodes_ready": "Csomópontok készen állnak",
-                        "server_version": "Szerver verzió"
-                    },
-                    "device_info": {
-                        "device_config": "Eszköz beállítása",
-                        "node_ready": "Csomópont készen áll",
-                        "node_status": "Csomópont állapota",
-                        "zwave_info": "Z-Wave infó"
-                    },
-                    "logs": {
-                        "log_level": "Naplószint",
-                        "log_level_changed": "A naplószint megváltozott erre: {level}",
-                        "title": "Z-Wave JS naplók"
-                    },
-                    "navigation": {
-                        "logs": "Naplók",
-                        "network": "Hálózat"
-                    },
-                    "network_status": {
-                        "connected": "Csatlakoztatva",
-                        "connecting": "Csatlakozás",
-                        "unknown": "Ismeretlen"
-                    },
-                    "node_config": {
-                        "error_device_not_found": "Az eszköz nem található",
-                        "header": "Z-Wave eszköz konfigurálása",
-                        "parameter_is_read_only": "Ez a paraméter csak olvasható",
-                        "set_param_accepted": "A paraméter frissült.",
-                        "set_param_error": "Hiba történt.",
-                        "zwave_js_device_database": "Z-Wave JS eszközadatbázis"
-                    },
-                    "node_status": {
-                        "alive": "Él",
-                        "asleep": "Alszik",
-                        "awake": "Ébren",
-                        "dead": "Halott",
-                        "unknown": "Ismeretlen"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "A kizárás megszakítása",
-                        "start_exclusion": "Kizárás indítása",
-                        "title": "Z-Wave csomópont eltávolítása"
-                    }
-                },
                 "zwave": {
-                    "button": "Beállítás",
                     "common": {
                         "index": "Index",
                         "instance": "Példány",
@@ -2990,7 +3006,7 @@
                         "add_to_group": "Hozzáadás a csoporthoz",
                         "entities": "A csomópont entitásai",
                         "entity_info": "Entitás adatai",
-                        "exclude_entity": "Entitás kizárása a Home Assistant-ból",
+                        "exclude_entity": "Entitás kizárása Home Assistant-ból",
                         "group": "Csoport",
                         "header": "Z-Wave csomópontkezelés",
                         "introduction": "Futtass egyetlen csomópontot érintő Z-Wave parancsokat. Válassz egy csomópontot az elérhető parancsok listájának megtekintéséhez.",
@@ -3037,11 +3053,149 @@
                     "values": {
                         "header": "Csomópont értékek"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Befogadás megszakítása",
+                        "controller_in_inclusion_mode": "A Z-Wave vezérlője most már befogadási módban van.",
+                        "follow_device_instructions": "Kövesse az eszközhöz kapott utasításokat a párosítás elindításához az eszközön.",
+                        "inclusion_failed": "A csomópont nem adható hozzá. Kérjük, ellenőrizze a naplókat további információkért.",
+                        "inclusion_finished": "A csomópont hozzá lett adva.",
+                        "interview_failed": "Az eszközinterjú nem sikerült. További információk elérhetők a naplókban.",
+                        "interview_started": "A készülékkel interjút készítenek. Ez eltarthat egy ideig.",
+                        "introduction": "Ez a varázsló végigvezeti Önt egy csomópont hozzáadásán a Z-Wave-hálózathoz.",
+                        "secure_inclusion_warning": "A biztonságos eszközök további sávszélességet igényelnek; túl sok biztonságos eszköz lelassíthatja a Z-Wave hálózatot. Javasoljuk, hogy csak biztonságos beépítést alkalmazzon olyan eszközökhöz, amelyek ezt igénylik, például zárakhoz vagy garázskapu nyitókhoz.",
+                        "start_inclusion": "Indítsa el a befogadást",
+                        "start_secure_inclusion": "Indítsa el a biztonságos befogadást",
+                        "title": "Adjon hozzá egy Z-Wave csomópontot",
+                        "use_secure_inclusion": "Használja a biztonságos befogadást",
+                        "view_device": "Eszköz megtekintése"
+                    },
+                    "common": {
+                        "add_node": "Node hozzáadása",
+                        "close": "Bezárás",
+                        "heal_network": "Z-Wave gyógyítása",
+                        "home_id": "Otthon azonosító",
+                        "network": "Hálózat",
+                        "node_id": "Node azonosító",
+                        "reconfigure_server": "Kiszolgáló újrakonfigurálása",
+                        "remove_node": "Node eltávolítása",
+                        "source": "Forrás"
+                    },
+                    "dashboard": {
+                        "driver_version": "Illesztőprogram verzió",
+                        "dump_dead_nodes_text": "Néhány csomópontod nem válaszolt, és feltételezhetően halottak. Ezeket nem exportálják teljes mértékben.",
+                        "dump_dead_nodes_title": "Néhány csomópontod halott",
+                        "dump_debug": "A problémák diagnosztizálásához töltse le a hálózat kiírását",
+                        "dump_not_ready_confirm": "Letöltés",
+                        "dump_not_ready_text": "Ha exportálást hoz létre, miközben nem minden csomópont áll készen, akkor hiányozhat a szükséges adat. Adjon egy kis időt a hálózatának az összes csomópont lekérdezésére. Folytatja az exportálást?",
+                        "dump_not_ready_title": "Még nem minden csomópont áll készen",
+                        "header": "Kezelje Z-Wave hálózatát",
+                        "home_id": "Otthon azonosító",
+                        "introduction": "A Z-Wave hálózat és a Z-Wave csomópontok kezelése",
+                        "nodes_ready": "Csomópontok készen állnak",
+                        "server_version": "Szerver verzió"
+                    },
+                    "device_info": {
+                        "device_config": "Eszköz beállítása",
+                        "heal_node": "Gyógyítsa a csomópontot",
+                        "node_ready": "Csomópont készen áll",
+                        "node_status": "Csomópont állapota",
+                        "reinterview_device": "Újbóli interjú eszközzel",
+                        "remove_failed": "Sikertelen az eszköz eltávolítása",
+                        "zwave_info": "Z-Wave infó"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "A hálózati gyógyítás megszakadt.",
+                        "healing_complete": "A hálózat gyógyulása befejeződött.",
+                        "healing_failed": "A gyógyulás nem sikerült. További információk elérhetők a naplókban.",
+                        "in_progress": "A hálózat gyógyítása folyamatban van. Ez eltart egy ideig.",
+                        "introduction": "Indítson hálózati gyógyítást a Z-Wave hálózatán. A hálózati helyreállítás hatására az összes eszköz újraszámolja az útvonalat a vezérlőhöz, ez akkor ajánlott, ha nemrég elköltöztetett eszközöket vagy vezérlőt.",
+                        "run_in_background": "Bezárhatja ezt a párbeszédpanelt, és a hálózati helyreállítás a háttérben folytatódik.",
+                        "start_heal": "Kezdje a gyógyulást",
+                        "stop_heal": "A gyógyulás leállítása",
+                        "title": "Gyógyítsa meg Z-Wave hálózatát",
+                        "traffic_warning": "A gyógyulási folyamat nagy mennyiségű forgalmat generál a Z-Wave hálózaton. Ez azt eredményezheti, hogy az eszközök lassan reagálnak (vagy egyáltalán nem reagálnak), amíg a gyógyítás folyamatban van."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} meggyógyítva.",
+                        "healing_failed": "{device} nem gyógyítható.",
+                        "healing_failed_check_logs": "További információk elérhetők a naplókban.",
+                        "in_progress": "{device} gyógyítása folyamatban van.",
+                        "introduction": "Mondja meg a {device} hogy frissítse útvonalait a vezérlőhöz. Ez segíthet a kommunikációs problémák megoldásában, ha nemrégiben áthelyezte az eszközt vagy a vezérlőt.",
+                        "network_heal_in_progress": "A Z-Wave hálózat gyógyítása már folyamatban van. Kérjük, várja meg, amíg befejeződik, mielőtt meggyógyítaná az egyes eszközöket.",
+                        "start_heal": "Eszköz gyógyítása",
+                        "title": "Gyógyítson meg egy Z-Wave készüléket",
+                        "traffic_warning": "A gyógyulási folyamat nagy mennyiségű forgalmat generál a Z-Wave hálózaton. Ez azt eredményezheti, hogy az eszközök lassan reagálnak (vagy egyáltalán nem reagálnak), amíg a gyógyítás folyamatban van."
+                    },
+                    "logs": {
+                        "log_level": "Naplószint",
+                        "log_level_changed": "A naplószint megváltozott erre: {level}",
+                        "subscribed_to_logs": "Feliratkozott a Z-Wave JS naplóüzenetekre ...",
+                        "title": "Z-Wave JS naplók"
+                    },
+                    "navigation": {
+                        "logs": "Naplók",
+                        "network": "Hálózat"
+                    },
+                    "network_status": {
+                        "connected": "Csatlakoztatva",
+                        "connecting": "Csatlakozás",
+                        "unknown": "Ismeretlen"
+                    },
+                    "node_config": {
+                        "attribution": "Az eszközkonfigurációs paramétereket és leírásokat az {device_database}",
+                        "battery_device_notice": "Az akkumulátoros eszközöknek ébren kell lenniük a konfigurációjuk frissítéséhez. Kérjük, olvassa el a készülék kézikönyvét az eszköz felébresztésére vonatkozó utasításokért.",
+                        "error_device_not_found": "Az eszköz nem található",
+                        "header": "Z-Wave eszköz konfigurálása",
+                        "introduction": "Az eszköz (csomópont) specifikus konfigurációs paramétereinek kezelése és módosítása a kiválasztott eszközhöz",
+                        "parameter": "Paraméter",
+                        "parameter_is_read_only": "Ez a paraméter csak olvasható",
+                        "set_param_accepted": "A paraméter frissült.",
+                        "set_param_error": "Hiba történt.",
+                        "set_param_queued": "A paraméterváltás várakozási sorba került, és frissülni fog, amikor az eszköz felébred.",
+                        "zwave_js_device_database": "Z-Wave JS eszközadatbázis"
+                    },
+                    "node_status": {
+                        "alive": "Él",
+                        "asleep": "Alszik",
+                        "awake": "Ébren",
+                        "dead": "Halott",
+                        "unknown": "Ismeretlen"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Az újbóli interjú megkezdése előtt fel kell ébresztenie az akkumulátorral működő eszközöket. A készülék ébresztésére vonatkozó utasításokat az eszköz kézikönyvében találja.",
+                        "in_progress": "A készülékkel interjút készítenek. Ez eltarthat egy ideig.",
+                        "interview_complete": "Készülék interjú befejezve.",
+                        "interview_failed": "Az eszközinterjú nem sikerült. További információk elérhetők a naplókban.",
+                        "introduction": "Egy eszköz újrainterjúvolása a Z-Wave hálózaton. Használja ezt a funkciót, ha az eszközének hiányzik vagy hibás funkciója van.",
+                        "run_in_background": "Bezárhatja ezt a párbeszédpanelt, az interjú a háttérben folytatódik.",
+                        "start_reinterview": "Újbóli interjú megkezdése",
+                        "title": "Z-Wave készülék újrainterjúvolása"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "A készülék eltávolítása folyamatban van.",
+                        "introduction": "Távolítsa el a meghibásodott eszközt a Z-Wave hálózatból. Használja ezt, ha nem tudja megfelelően kizárni az eszközt, mert meghibásodott.",
+                        "removal_failed": "Az eszközt nem lehetett eltávolítani a Z-Wave hálózatból.",
+                        "removal_finished": "A(z) {id} csomópont eltávolítva az Ön Z-Wave hálózatából.",
+                        "remove_device": "Eszköz eltávolítása",
+                        "title": "Távolítsa el a meghibásodott Z-Wave eszközt"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "A kizárás megszakítása",
+                        "controller_in_exclusion_mode": "A Z-Wave vezérlő most kizárási módban van.",
+                        "exclusion_failed": "A csomópont nem távolítható el. Kérjük, ellenőrizze a naplókat további információkért.",
+                        "exclusion_finished": "A(z) {id} csomópont el lett távolítva az Ön Z-Wave hálózatából.",
+                        "follow_device_instructions": "Kövesse az eszközhöz kapott utasításokat, hogy kizárja az eszközt.",
+                        "introduction": "Távolítson el egy csomópontot a Z-Wave hálózatból, és távolítsa el a társított eszközt és entitásokat a Home Assistant alkalmazásból.",
+                        "start_exclusion": "Kizárás indítása",
+                        "title": "Z-Wave csomópont eltávolítása"
+                    }
                 }
             },
             "custom": {
                 "external_panel": {
-                    "complete_access": "Hozzáférést fog kapni a Home Assistant összes adatához.",
+                    "complete_access": "Hozzáférést fog kapni Home Assistant összes adatához.",
                     "hide_message": "Ellenőrizd a panel_custom komponens dokumentációját ennek az üzenetnek az elrejtéséhez",
                     "question_trust": "Megbízol a(z) {name} külső panelben a következő linken: {link}?"
                 }
@@ -3067,6 +3221,7 @@
                         "type": "Esemény típusa"
                     },
                     "services": {
+                        "accepts_target": "Ez a szolgáltatás elfogad egy célt, például: `entitásazonosító: `entity_id: light.bed_light`",
                         "all_parameters": "Minden rendelkezésre álló paraméter",
                         "call_service": "Szolgáltatás meghívása",
                         "column_description": "Leírás",
@@ -3074,6 +3229,7 @@
                         "column_parameter": "Paraméter",
                         "description": "A 'service dev' eszköz lehetővé teszi bármely Home Assistant-ban rendelkezésre álló szolgáltatás meghívását.",
                         "fill_example_data": "Kitöltés példaadatokkal",
+                        "no_template_ui_support": "A felhasználói felület nem támogatja a sablonokat, továbbra is használhatja a YAML szerkesztőt.",
                         "title": "Szolgáltatások",
                         "ui_mode": "Ugrás a felhasználói felület módra",
                         "yaml_mode": "Ugrás a YAML módra",
@@ -3117,29 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Visszalépés",
-                "supervisor": {
-                    "ask": "Kérjen segítséget",
-                    "reboot": "Próbálja újraindítani a gazdagépet",
-                    "system_health": "A rendszer állapotának ellenőrzése",
-                    "title": "Nem sikerült betölteni a Supervisor panelt!"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Múlt hét",
-                    "this_week": "Aktuális hét",
-                    "today": "Ma",
-                    "yesterday": "Tegnap"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Múlt hét",
-                    "this_week": "Aktuális hét",
-                    "today": "Ma",
-                    "yesterday": "Tegnap"
+            "energy": {
+                "charts": {
+                    "by_device": "Eszköz szerinti fogyasztás",
+                    "solar": "Nap",
+                    "stat_house_energy_meter": "Teljes energiafogyasztás"
+                },
+                "setup": {
+                    "back": "Vissza",
+                    "done": "Mutasd az energia irányítópultot!",
+                    "next": "Következő"
                 }
             },
             "lovelace": {
@@ -3150,7 +3293,7 @@
                 },
                 "cards": {
                     "actions": {
-                        "action_confirmation": "Biztosan futtatod a(z) \"{action}\" műveletet?",
+                        "action_confirmation": "Biztosan futtatod ezt a műveletet: \"{action}\"?",
                         "no_entity_more_info": "A további információkhoz nincs megadva entitás",
                         "no_entity_toggle": "A váltáshoz nincs megadva entitás",
                         "no_navigation_path": "Nincs megadva navigációs útvonal",
@@ -3176,7 +3319,7 @@
                         "url": "Ablak megnyitása: {url_path}"
                     },
                     "safe-mode": {
-                        "description": "A Home Assistant a konfiguráció betöltése során problémába ütközött, ezért most csökkentett módban fut. Vess egy pillantást a hibanaplóra, hogy megtudd, mi romlott el.",
+                        "description": "A Home Assistant konfigurációjának betöltése során problémába ütközött, ezért most csökkentett módban fut. Vess egy pillantást a hibanaplóra, hogy megtudd, mi romlott el.",
                         "header": "Csökkentett mód aktiválva"
                     },
                     "shopping-list": {
@@ -3187,7 +3330,7 @@
                         "reorder_items": "Tételek átrendezése"
                     },
                     "starting": {
-                        "description": "A Home Assistant indítása folyamatban van, kérlek várj..."
+                        "description": "Home Assistant indítása folyamatban van, kérlek várj..."
                     }
                 },
                 "changed_toast": {
@@ -3253,7 +3396,6 @@
                         "entities": {
                             "description": "Az Entitások kártya a legalapvetőbb kártya. Az elemeket listákba csoportosítja.",
                             "edit_special_row": "A sor részleteinek megtekintése a Szerkesztés gombra kattintva",
-                            "entity_row_editor": "Entitássor szerkesztő",
                             "entity_row": {
                                 "attribute": "Attribútum",
                                 "button": "Gomb",
@@ -3265,6 +3407,7 @@
                                 "section": "Szakasz",
                                 "weblink": "Webes hivatkozás"
                             },
+                            "entity_row_editor": "Entitássor szerkesztő",
                             "name": "Entitások",
                             "secondary_info_values": {
                                 "brightness": "Fényerő",
@@ -3291,6 +3434,7 @@
                         "gauge": {
                             "description": "A Mérőműszer kártya egy alapkártya, amely lehetővé teszi az érzékelők adatainak vizuális megtekintését.",
                             "name": "Műszer",
+                            "needle_gauge": "Megjelenítés műszerként?",
                             "severity": {
                                 "define": "Súlyosság meghatározása?",
                                 "green": "Zöld",
@@ -3303,6 +3447,7 @@
                             "attribute": "Attribútum",
                             "camera_image": "Kamera entitás",
                             "camera_view": "Kamera nézet",
+                            "days_to_show": "Megjelenítendő napok",
                             "double_tap_action": "Dupla koppintási művelet",
                             "entities": "Entitások",
                             "entity": "Entitás",
@@ -3416,6 +3561,10 @@
                             "integration_not_loaded": "Ez a kártya megköveteli a `shopping_list` integráció beállítását.",
                             "name": "Bevásárló lista"
                         },
+                        "statistics-graph": {
+                            "description": "A statisztikai grafikon kártya lehetővé teszi grafikon megjelenítését a felsorolt entitások statisztikáiról.",
+                            "name": "Statisztikai grafikon"
+                        },
                         "thermostat": {
                             "description": "A Termosztát kártyával a hűtő/fűtő berendezés entitások vezérelhetők. Lehetővé teszi a hőmérséklet, illetve a mód megváltoztatását.",
                             "name": "Termosztát"
@@ -3485,6 +3634,12 @@
                         "tab_badges": "Kitűzők",
                         "tab_settings": "Beállítások",
                         "tab_visibility": "Láthatóság",
+                        "type": "Nézet típusa",
+                        "types": {
+                            "masonry": "Blokkok (alapértelmezett)",
+                            "panel": "Panel (1 kártya)",
+                            "sidebar": "Oldalsáv"
+                        },
                         "visibility": {
                             "select_users": "Válaszd ki, hogy mely felhasználók láthatják ezt a nézetet a navigációs sávon"
                         }
@@ -3539,7 +3694,6 @@
                         "unsaved_changes": "Nem mentett változások"
                     },
                     "save_config": {
-                        "cancel": "Mégsem",
                         "close": "Bezárás",
                         "empty_config": "Kezdj egy üres irányítópulttal",
                         "header": "Vedd át az irányítást a Lovelace UI felett",
@@ -3568,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Ez az első kártyát teljes szélességében fogja megjeleníteni. A többi kártya, továbbá a jelvények ebben a nézetben nem lesznek megjelenítve.",
-                            "title": "Panel mód?",
                             "warning_multiple_cards": "Ez a nézet több kártyát is tartalmaz, de a panelnézet csak 1 kártyát tud megjeleníteni."
                         }
                     }
@@ -3609,7 +3761,7 @@
                     "entity_non_numeric": "Entitás nem numerikus: {entity}",
                     "entity_not_found": "Entitás nem elérhető: {entity}",
                     "entity_unavailable": "Az entitás jelenleg nem érhető el: {entity}",
-                    "starting": "A Home Assistant indítása folyamatban van, ezért lehet hogy még nem minden érhető el."
+                    "starting": "Home Assistant indítása folyamatban van, ezért valószínű, hogy még nem minden érhető el."
                 }
             },
             "mailbox": {
@@ -3619,9 +3771,12 @@
                 "playback_title": "Üzenet lejátszása"
             },
             "my": {
+                "component_not_loaded": "Az otthoni asszisztens példánya nem támogatja ezt az átirányítást. Az átirányítás használatához {integration} van szükség.",
                 "documentation": "dokumentáció",
                 "error": "Ismeretlen hiba történt",
-                "faq_link": "My Home Assistant GYIK"
+                "faq_link": "My Home Assistant GYIK",
+                "no_supervisor": "Az otthoni asszisztens telepítése nem támogatja ezt az átirányítást. Vagy a Home Assistant operációs rendszerre, vagy a Home Assistant felügyelt telepítési módszerre van szüksége. További információ: {docs_link} .",
+                "not_supported": "Az otthoni asszisztens példánya nem támogatja ezt az átirányítást. Ellenőrizze a(z) {link} fájlban a támogatott átirányításokat és azok verzióját."
             },
             "page-authorize": {
                 "abort_intro": "Bejelentkezés megszakítva",
@@ -3774,7 +3929,7 @@
                 "core-config": {
                     "button_detect": "Észlelés",
                     "finish": "Tovább",
-                    "intro": "Hello {name}, üdvözöl a Home Assistant. Hogyan szeretnéd elnevezni az otthonodat?",
+                    "intro": "Helló {name}, Home Assistant üdvözöl! Hogyan szeretnéd elnevezni az otthonodat?",
                     "intro_location": "Szeretnénk tudni, hogy hol élsz. Ez segít az információk megjelenítésében és a nap alapú automatizálások beállításában. Ez az adat soha nem lesz megosztva a hálózatodon kívül.",
                     "intro_location_detect": "Segíthetünk neked kitölteni ezt az információt egy külső szolgáltatás egyszeri lekérdezésével.",
                     "location_name": "A Home Assistant rendszered neve",
@@ -3789,19 +3944,17 @@
                 "intro": "Készen állsz arra, hogy felébreszd az otthonod, visszaszerezd a magánéleted és csatlakozz egy világhálós közösséghez?",
                 "next": "Következő",
                 "restore": {
-                    "addons": "Kiegészítők",
-                    "confirm_password": "Erősítse meg a Pillanatkép jelszavát",
+                    "addons": "Bővítmények",
+                    "confirm_password": "Pillanatkép jelszó megerősítése",
                     "description": "Alternatív megoldásként visszaállíthatsz egy korábbi pillanatképet.",
                     "folders": "Mappák",
-                    "full_snapshot": "Teljes pillanatkép",
                     "hide_log": "Teljes napló elrejtése",
                     "in_progress": "Visszaállítás folyamatban",
-                    "partial_snapshot": "Részleges pillanatkép",
-                    "password": "Snapshot jelszó",
+                    "password": "Pillanatkép jelszava",
                     "password_protection": "Jelszóvédelem",
-                    "select_type": "Válassza ki a visszaállítandó elemeket",
+                    "select_type": "Válassza ki, hogy mit szeretne visszaállítani",
                     "show_log": "Teljes napló megjelenítése",
-                    "type": "Pillanatkép típus"
+                    "type": "Pillanatkép típusa"
                 },
                 "user": {
                     "create_account": "Fiók Létrehozása",
@@ -3878,6 +4031,12 @@
                     "prompt_copy_token": "Most másold ki a hozzáférési tokened! Erre később nem lesz lehetőséged.",
                     "prompt_name": "Adj nevet a tokennek"
                 },
+                "mfa": {
+                    "confirm_disable": "Biztosan le szeretnéd tiltani {name}-t?",
+                    "disable": "Letilt",
+                    "enable": "Engedélyez",
+                    "header": "Többfaktoros Hitelesítési Modulok"
+                },
                 "mfa_setup": {
                     "close": "Bezárás",
                     "step_done": "{step} beállítás elvégezve",
@@ -3885,12 +4044,6 @@
                     "title_aborted": "Megszakítva",
                     "title_success": "Siker!"
                 },
-                "mfa": {
-                    "confirm_disable": "Biztosan le szeretnéd tiltani {name}-t?",
-                    "disable": "Letilt",
-                    "enable": "Engedélyez",
-                    "header": "Többfaktoros Hitelesítési Modulok"
-                },
                 "number_format": {
                     "description": "Válassza ki a számok formátumát.",
                     "dropdown_label": "Számformátum",
diff --git a/translations/frontend/hy.json b/translations/frontend/hy.json
index c00d64209c..7b59f9bdfb 100644
--- a/translations/frontend/hy.json
+++ b/translations/frontend/hy.json
@@ -23,6 +23,12 @@
         "shopping_list": "Գնումների ցուցակ",
         "states": "Ակնարկ"
     },
+    "state": {
+        "default": {
+            "unavailable": "Անհասանելի",
+            "unknown": "Անհայտ"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -78,12 +84,6 @@
             "not_home": "Հեռու"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "Անհասանելի",
-            "unknown": "Անհայտ"
-        }
-    },
     "ui": {
         "auth_store": {
             "ask": "Դուք ցանկանում եք պահպանել այդ անունը?",
@@ -336,7 +336,6 @@
                             "header": "Գործողություններ",
                             "introduction": "Գործողությունները Տնային  օգնականի տանը պետք է անել, երբ ավտոմատացումը գործարկվի.",
                             "learn_more": "Իմանալ ավելին գործողությունների մասին",
-                            "type_select": "Գործողության տեսակը",
                             "type": {
                                 "condition": {
                                     "label": "Վիճակը"
@@ -362,6 +361,7 @@
                                     "wait_template": "Սպասեք ձևանմուշին"
                                 }
                             },
+                            "type_select": "Գործողության տեսակը",
                             "unsupported_action": "Չաջակցված գործողություն. {action}"
                         },
                         "alias": "Անուն",
@@ -373,7 +373,6 @@
                             "header": "Պայմանները",
                             "introduction": "Պայմանները ավտոմատացման կանոնների կամընտիր մասն են և կարող են օգտագործվել կանխելու համար գործողությունը կատարելու համար: Պայմանները շատ նման են հարուցիչների, բայց շատ տարբեր են: Ձգան կանդրադառնա համակարգում տեղի ունեցող իրադարձություններին, մինչդեռ մի պայման միայն նայում է, թե ինչպես է համակարգը հիմա նայում: Ձգան կարող է նկատել, որ անջատիչը միացված է: Մի պայման կարող է տեսնել միայն այն դեպքում, արդյոք անջատիչը ներկայում միացված է կամ անջատված է:",
                             "learn_more": "Իմանալ  ավելին պայմանների մասին",
-                            "type_select": "Պայմանի տեսակը",
                             "type": {
                                 "device": {
                                     "label": "Սարք"
@@ -415,6 +414,7 @@
                                     "zone": "Գոտի"
                                 }
                             },
+                            "type_select": "Պայմանի տեսակը",
                             "unsupported_condition": "Չաջակցված պայման. {condition}"
                         },
                         "default_name": "Նոր ավտոմատացում",
@@ -430,7 +430,6 @@
                             "header": "Թողարկիչ",
                             "introduction": "Ձգանները այն են, ինչն սկսում է ավտոմատացման կանոնների մշակումը: Նույն կանոնի համար հնարավոր է նշել մի քանի ձգան: Ձգանման մեկնարկից հետո Տնային օգնականը կվավերացնի պայմանները, եթե այդպիսիք կան, և կանչեն գործողություն:",
                             "learn_more": "Իմացեք ավելին ՝ հարուցիչների մասին",
-                            "type_select": "Տրիգերի տեսակ",
                             "type": {
                                 "device": {
                                     "label": "Սարք"
@@ -482,16 +481,16 @@
                                     "label": "Ձևանմուշ",
                                     "value_template": "Արժեքի ձևանմուշ"
                                 },
+                                "time": {
+                                    "at": "Ատ",
+                                    "label": "Ժամանակ"
+                                },
                                 "time_pattern": {
                                     "hours": "Ժամեր",
                                     "label": "Ժամային գոտի",
                                     "minutes": "Րոպեներ",
                                     "seconds": "Վայրկյան"
                                 },
-                                "time": {
-                                    "at": "Ատ",
-                                    "label": "Ժամանակ"
-                                },
                                 "webhook": {
                                     "label": "համացանցային կայք",
                                     "webhook_id": "համացանցային կայքի ID"
@@ -505,6 +504,7 @@
                                     "zone": "Գոտի"
                                 }
                             },
+                            "type_select": "Տրիգերի տեսակ",
                             "unsupported_platform": "Չաջակցված հարթակ. {platform}"
                         },
                         "unsaved_confirm": "Դուք  ունեք չպահպանված փոփոխություններ:Վստա՞հ եք, որ ուզում եք հեռանալ:"
@@ -818,7 +818,6 @@
                         "unsaved_changes": "Չփրկված փոփոխություններ"
                     },
                     "save_config": {
-                        "cancel": "Երբեք դեմ չեք",
                         "header": "Վերցրեք ձեր Lovelace UI- ն",
                         "para": "Տնային օգնականը կպահպանի ձեր ինտերֆեյսը ՝ այն թարմացնելով, երբ հասանելի լինեն նոր սուբյեկտները կամ Lovelace բաղադրիչները: Եթե դուք ստանձնեք վերահսկողություն, մենք այլևս ինքնաբերաբար փոփոխություններ չենք անի ձեզ համար:",
                         "para_sure": "Համոզվա՞ծ եք, որ ցանկանում եք ստանձնել ձեր UI-ի թարմացման պարտավորությունը:",
@@ -1044,6 +1043,12 @@
                     "prompt_copy_token": "Պատճենեք ձեր մուտքի նշանը: Այն կրկին չի ցուցադրվի:",
                     "prompt_name": "Անուն?"
                 },
+                "mfa": {
+                    "confirm_disable": "Համոզվա՞ծ եք, որ ուզում եք անջատել {name} :",
+                    "disable": "Անջատել",
+                    "enable": "Միացնել",
+                    "header": "Բազմաֆունկցիոնալ նույնականացման մոդուլներ"
+                },
                 "mfa_setup": {
                     "close": "փակել",
                     "step_done": "Կարգավորումը կատարվել է {step}",
@@ -1051,12 +1056,6 @@
                     "title_aborted": "Վիժեցված",
                     "title_success": "Հաջողություն:"
                 },
-                "mfa": {
-                    "confirm_disable": "Համոզվա՞ծ եք, որ ուզում եք անջատել {name} :",
-                    "disable": "Անջատել",
-                    "enable": "Միացնել",
-                    "header": "Բազմաֆունկցիոնալ նույնականացման մոդուլներ"
-                },
                 "push_notifications": {
                     "description": "Ուղարկեք ծանուցումներ այս սարքին:",
                     "error_load_platform": "Ստեղծել ծանուցման:է HTML5.",
diff --git a/translations/frontend/id.json b/translations/frontend/id.json
index bb798e8931..dd6fc62e28 100644
--- a/translations/frontend/id.json
+++ b/translations/frontend/id.json
@@ -26,6 +26,14 @@
         "shopping_list": "Daftar Belanja",
         "states": "Ikhtisar"
     },
+    "state": {
+        "default": {
+            "off": "Mati",
+            "on": "Nyala",
+            "unavailable": "Tidak tersedia",
+            "unknown": "Tidak diketahui"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +102,6 @@
             "not_home": "Keluar"
         }
     },
-    "state": {
-        "default": {
-            "off": "Mati",
-            "on": "Nyala",
-            "unavailable": "Tidak tersedia",
-            "unknown": "Tidak diketahui"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +267,26 @@
                 "not_installed": "Add-on tidak diinstal"
             }
         },
+        "backup": {
+            "addons": "Add-on",
+            "confirm_password": "Konfirmasi kata sandi Backup",
+            "could_not_create": "Tidak dapat membuat backup",
+            "create": "Buat",
+            "create_blocked_not_running": "Pembuatan backup tidak dapat dilakukan saat ini karena sistem dalam keadaan {state} .",
+            "created": "Dibuat",
+            "delete_backup_confirm": "hapus",
+            "delete_selected": "Hapus backup yang dipilih",
+            "enter_password": "Masukkan kata sandi.",
+            "failed_to_delete": "Gagal menghapus",
+            "folders": "Folder",
+            "name": "Nama",
+            "password": "Kata sandi",
+            "password_protection": "Perlindungan kata sandi",
+            "passwords_not_matching": "Kata sandi tidak cocok",
+            "select_type": "Pilih yang akan dipulihkan",
+            "selected": "{number} dipilih",
+            "type": "Jenis"
+        },
         "common": {
             "cancel": "Batalkan",
             "close": "Tutup",
@@ -318,6 +338,14 @@
             "no_addons": "Anda belum memasang add-on apa pun. Kunjungi toko add-on untuk memulai!"
         },
         "dialog": {
+            "hardware": {
+                "attributes": "Atribut",
+                "device_path": "Jalur perangkat",
+                "id": "ID",
+                "search": "Cari perangkat keras",
+                "subsystem": "Subsistem",
+                "title": "Perangkat keras"
+            },
             "network": {
                 "connected_to": "Tersambung ke {ssid}",
                 "dhcp": "DHCP",
@@ -358,52 +386,23 @@
                 "text": "Ingin memulai ulang add-on disertai perubahan Anda?"
             },
             "update": {
-                "create_snapshot": "Buat snapshot dari {name} sebelum memperbarui",
-                "snapshot": "Snapshot",
-                "snapshotting": "Membuat snapshot dari {name}",
                 "updating": "Memperbarui {name} ke versi {version}"
             }
         },
         "my": {
             "error": "Terjadi kesalahan yang tidak diketahui",
+            "error_addon_no_ingress": "Add-on yang diminta tidak mendukung ingress",
             "error_addon_not_found": "Add-on tidak ditemukan",
+            "error_addon_not_installed": "Add-on yang diminta belum diinstal. Instal terlebih dahulu",
+            "error_addon_not_started": "Add-on yang diminta tidak berjalan. Jalankan terlebih dulu",
             "faq_link": "FAQ Home Assistant Saya",
             "not_supported": "Pengalihan ini tidak didukung oleh instans Home Assistant Anda. Periksa {link} tentang pengalihan yang didukung dan versi mana mulai diperkenalkan."
         },
         "panel": {
             "dashboard": "Dasbor",
-            "snapshots": "Snapshot",
             "store": "Toko Add-on",
             "system": "Sistem"
         },
-        "snapshot": {
-            "addons": "Add-on",
-            "available_snapshots": "Snapshot yang Tersedia",
-            "could_not_create": "Tidak dapat membuat snapshot",
-            "create": "Buat",
-            "create_blocked_not_running": "Pembuatan snapshot tidak dapat dilakukan saat ini karena sistem dalam keadaan {state} .",
-            "create_snapshot": "Buat snapshot",
-            "description": "Snapshot dapat digunakan untuk mempermudah pencadangan dan pemulihan semua data instans Home Assistant Anda.",
-            "enter_password": "Masukkan kata sandi.",
-            "folder": {
-                "addons/local": "Add-on lokal",
-                "homeassistant": "Konfigurasi Home Assistant",
-                "media": "Media",
-                "share": "Bagikan",
-                "ssl": "SSL"
-            },
-            "folders": "Folder",
-            "full_snapshot": "Snapshot lengkap",
-            "name": "Nama",
-            "no_snapshots": "Anda belum memiliki snapshot.",
-            "partial_snapshot": "Snapshot parsial",
-            "password": "Kata sandi",
-            "password_protected": "dilindungi kata sandi",
-            "password_protection": "Perlindungan kata sandi",
-            "security": "Keamanan",
-            "type": "Jenis",
-            "upload_snapshot": "Unggah snapshot"
-        },
         "store": {
             "missing_addons": "Add-on tidak ada? Aktifkan mode tingkat lanjut di halaman profil pengguna Anda",
             "no_results_found": "Tidak ada hasil yang ditemukan di {repository}.",
@@ -458,6 +457,7 @@
                 "leave_beta_description": "Dapatkan pembaruan stabil untuk Home Assistant, Supervisor, dan host",
                 "ram_usage": "Penggunaan RAM Supervisor",
                 "reload_supervisor": "Muat Ulang Supervisor",
+                "search": "Cari",
                 "share_diagnostics": "Bagikan Diagnostik",
                 "share_diagnostics_description": "Bagikan laporan kerusakan dan informasi diagnostik.",
                 "share_diagonstics_description": "Apakah Anda ingin membagikan laporan kerusakan dan informasi diagnostik secara otomatis saat Supervisor menemukan kesalahan yang tidak terduga? {line_break} Ini akan memungkinkan kami memperbaiki masalah. Informasinya hanya dapat diakses oleh tim Home Assistant Core dan tidak akan dibagikan dengan orang lain. {line_break} Data tidak menyertakan informasi pribadi/sensitif dan Anda dapat menonaktifkannya di setelan kapan saja.",
@@ -717,6 +717,9 @@
                 "no_match": "Tidak ada area yang cocok ditemukan",
                 "show_areas": "Tampilkan area"
             },
+            "attributes": {
+                "expansion_header": "Atribut"
+            },
             "blueprint-picker": {
                 "add_user": "Tambahkan pengguna",
                 "remove_user": "Hapus pengguna",
@@ -795,6 +798,7 @@
                     "was_unplugged": "telah dicabut",
                     "was_unsafe": "tidak aman"
                 },
+                "retrieval_error": "Kesalahan ketika mengambil entri buku log",
                 "show_trace": "Tampilkan jejak"
             },
             "media-browser": {
@@ -825,10 +829,10 @@
                 "documentation": "dokumentasi",
                 "learn_adding_local_media": "Pelajari lebih lanjut tentang menambahkan media di {documentation}.",
                 "local_media_files": "Tempatkan file video, audio, dan gambar Anda di direktori media untuk dapat menelusuri dan memutarnya di browser atau pada pemutar media yang didukung.",
+                "media-player-browser": "Browser Pemutar Media",
                 "media_browsing_error": "Kesalahan Browser Media",
                 "media_not_supported": "Pemutar Media Browser tidak mendukung jenis media ini",
                 "media_player": "Pemutar Media",
-                "media-player-browser": "Browser Pemutar Media",
                 "no_items": "Tidak ada item",
                 "no_local_media_found": "Tidak ditemukan media lokal",
                 "no_media_folder": "Sepertinya Anda belum membuat direktori media.",
@@ -918,6 +922,9 @@
             "config_entry_system_options": {
                 "enable_new_entities_description": "Jika dinonaktifkan, entitas yang baru ditemukan untuk {integration} tidak akan ditambahkan secara otomatis ke Home Assistant.",
                 "enable_new_entities_label": "Aktifkan entitas yang baru ditambahkan.",
+                "enable_polling_description": "Apakah Home Assistant harus melakukan polling {integration} secara otomatis untuk pembaruan.",
+                "enable_polling_label": "Aktifkan polling untuk pembaruan.",
+                "restart_home_assistant": "Anda perlu memulai ulang Home Assistant agar perubahan diterapkan.",
                 "title": "Opsi Sistem untuk {integration}",
                 "update": "Perbarui"
             },
@@ -1102,7 +1109,6 @@
                         "integrations": "Integrasi",
                         "logs": "Log",
                         "lovelace": "Dasbor Lovelace",
-                        "navigate_to": "Buka {panel}",
                         "person": "Orang",
                         "scene": "Scene",
                         "script": "Skrip",
@@ -1198,6 +1204,7 @@
             },
             "zha_reconfigure_device": {
                 "attribute": "Atribut",
+                "battery_device_warning": "Anda perlu membangunkan perangkat bertenaga baterai sebelum memulai konfigurasi ulang. Lihat manual perangkat Anda untuk instruksi tentang cara membangunkan perangkat.",
                 "button_hide": "Sembunyikan Detail",
                 "button_show": "Tampilkan Detail",
                 "cluster_header": "Klaster",
@@ -1329,7 +1336,6 @@
                             "introduction": "Aksi adalah hal yang dilakukan Home Assistant ketika otomasi terpicu.",
                             "learn_more": "Pelajari lebih lanjut tentang aksi",
                             "name": "Aksi",
-                            "type_select": "Jenis aksi",
                             "type": {
                                 "choose": {
                                     "add_option": "Tambahkan opsi",
@@ -1370,7 +1376,6 @@
                                 "repeat": {
                                     "label": "Ulangi",
                                     "sequence": "Aksi",
-                                    "type_select": "Jenis perulangan",
                                     "type": {
                                         "count": {
                                             "label": "Jumlah perulangan"
@@ -1383,7 +1388,8 @@
                                             "conditions": "Kondisi selagi",
                                             "label": "Selagi"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Jenis perulangan"
                                 },
                                 "scene": {
                                     "label": "Aktifkan scene"
@@ -1403,6 +1409,7 @@
                                     "wait_template": "Templat Tunggu"
                                 }
                             },
+                            "type_select": "Jenis aksi",
                             "unsupported_action": "Tidak ada dukungan antarmuka untuk aksi: {action}"
                         },
                         "alias": "Nama",
@@ -1421,7 +1428,6 @@
                             "introduction": "Kondisi bersifat opsional dan akan mencegah eksekusi lebih lanjut kecuali semua kondisi terpenuhi.",
                             "learn_more": "Pelajari lebih lanjut tentang kondisi",
                             "name": "Kondisi",
-                            "type_select": "Jenis kondisi",
                             "type": {
                                 "and": {
                                     "label": "Dan"
@@ -1482,12 +1488,18 @@
                                         "wed": "Rabu"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "ID Pemicu",
+                                    "label": "Pemicu",
+                                    "no_triggers": "Tidak ada pemicu yang tersedia"
+                                },
                                 "zone": {
                                     "entity": "Entitas dengan lokasi",
                                     "label": "Zona",
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Jenis kondisi",
                             "unsupported_condition": "Tidak ada dukungan antarmuka untuk kondisi: {condition}"
                         },
                         "copy_to_clipboard": "Salin ke Papan Klip",
@@ -1525,10 +1537,10 @@
                             "delete_confirm": "Yakin ingin menghapus?",
                             "duplicate": "Gandakan",
                             "header": "Pemicu",
+                            "id": "ID pemicu (digunakan oleh kondisi pemicu)",
                             "introduction": "Pemicu adalah hal yang memulai pemrosesan aturan otomasi. Beberapa pemicu bisa ditentukan untuk aturan yang sama. Setelah pemicu dimulai, Home Assistant akan memvalidasi kondisi, dan jika memenuhi, akan memanggil aksi.",
                             "learn_more": "Pelajari lebih lanjut tentang pemicu",
                             "name": "Pemicu",
-                            "type_select": "Jenis pemicu",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1594,18 +1606,18 @@
                                     "label": "Templat",
                                     "value_template": "Nilai templat"
                                 },
-                                "time_pattern": {
-                                    "hours": "Jam",
-                                    "label": "Pola Waktu",
-                                    "minutes": "Menit",
-                                    "seconds": "Detik"
-                                },
                                 "time": {
                                     "at": "Jam",
                                     "label": "Waktu",
                                     "type_input": "Nilai pembantu tanggal/waktu",
                                     "type_value": "Waktu tertentu"
                                 },
+                                "time_pattern": {
+                                    "hours": "Jam",
+                                    "label": "Pola Waktu",
+                                    "minutes": "Menit",
+                                    "seconds": "Detik"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "ID Webhook"
@@ -1619,6 +1631,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Jenis pemicu",
                             "unsupported_platform": "Tidak ada dukungan antarmuka untuk platform: {platform}"
                         },
                         "unsaved_confirm": "Anda memiliki perubahan yang belum disimpan. Yakin ingin meninggalkan?"
@@ -1628,6 +1641,7 @@
                         "delete_automation": "Hapus otomasi",
                         "delete_confirm": "Yakin ingin menghapus otomasi ini?",
                         "dev_automation": "Otomatisasi debug",
+                        "dev_only_editable": "Hanya otomasi yang memiliki ID unik yang ditetapkan yang bisa didebug.",
                         "duplicate": "Gandakan",
                         "duplicate_automation": "Gandakan otomasi",
                         "edit_automation": "Edit otomasi",
@@ -1713,6 +1727,7 @@
                             "title": "Alexa"
                         },
                         "connected": "Terhubung",
+                        "connecting": "Menghubungkan…",
                         "connection_status": "Status koneksi cloud",
                         "fetching_subscription": "Mengambil langganan…",
                         "google": {
@@ -1743,10 +1758,16 @@
                         "remote": {
                             "access_is_being_prepared": "Akses jarak jauh sedang disiapkan. Kami akan memberi tahu Anda jika sudah siap.",
                             "certificate_info": "Info Sertifikat",
+                            "connected": "Terhubung",
                             "info": "Home Assistant Cloud menyediakan koneksi jarak jauh yang aman ke instans Anda saat jauh dari rumah.",
                             "instance_is_available": "Instans Anda tersedia di",
                             "instance_will_be_available": "Instans Anda akan tersedia di",
                             "link_learn_how_it_works": "Pelajari cara kerjanya",
+                            "not_connected": "Tidak Terhubung",
+                            "remote_enabled": {
+                                "caption": "Terhubung secara otomatis",
+                                "description": "Aktifkan opsi ini untuk memastikan instans Home Assistant Anda selalu dapat diakses dari jarak jauh."
+                            },
                             "title": "Kontrol Jarak Jauh"
                         },
                         "sign_out": "Keluar",
@@ -1773,9 +1794,9 @@
                             "loading": "Memuat…",
                             "manage": "Kelola",
                             "no_hooks_yet": "Sepertinya Anda belum memiliki webhook. Mulailah dengan mengonfigurasi",
+                            "no_hooks_yet2": " atau dengan membuat ",
                             "no_hooks_yet_link_automation": "otomasi webhook",
                             "no_hooks_yet_link_integration": "integrasi berbasis webhook",
-                            "no_hooks_yet2": " atau dengan membuat ",
                             "title": "Webhook"
                         }
                     },
@@ -1890,25 +1911,6 @@
                     "description": "Sistem unit, lokasi, zona waktu & parameter umum lainnya",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Sebelum Anda mengaktifkan, pastikan Anda mengunjungi halaman dokumentasi analitika {link} untuk memahami apa yang Anda kirim dan bagaimana penyimpanannya.",
-                                "header": "Analitika",
-                                "instance_id": "ID Instans: {huuid}",
-                                "learn_more": "Cara kami memproses data Anda",
-                                "needs_base": "Anda perlu mengaktifkan analitik dasar agar opsi ini tersedia",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID instans, versi, dan jenis instalasi."
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nama, versi, dan kemampuan.",
-                                        "title": "Integrasi dan add-on yang digunakan"
-                                    },
-                                    "usage": {
-                                        "title": "Integrasi yang Digunakan"
-                                    }
-                                }
-                            },
                             "core_config": {
                                 "edit_requires_storage": "Editor dinonaktifkan karena konfigurasi disimpan dalam configuration.yaml.",
                                 "elevation": "Ketinggian",
@@ -2039,7 +2041,8 @@
                     "scripts": "Skrip",
                     "unknown_error": "Kesalahan yang tidak diketahui",
                     "unnamed_device": "Perangkat tanpa nama",
-                    "update": "Perbarui"
+                    "update": "Perbarui",
+                    "update_device_error": "Gagal memperbarui perangkat"
                 },
                 "entities": {
                     "caption": "Entitas",
@@ -2091,14 +2094,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Bersihkan",
-                    "filtering_by": "Filter menurut",
-                    "show": "Tampilkan"
-                },
-                "hassio": {
-                    "button": "Konfigurasi"
-                },
                 "header": "Mengonfigurasi Home Assistant",
                 "helpers": {
                     "caption": "Pembantu",
@@ -2146,17 +2141,13 @@
                     "license": "Diterbitkan di bawah lisensi Apache 2.0",
                     "path_configuration": "Jalur ke configuration.yaml: {path}",
                     "server": "server",
+                    "setup_time": "Waktu penyiapan",
                     "source": "Sumber:",
-                    "system_health_error": "Komponen Kesehatan Sistem tidak dimuat. Tambahkan 'system_health:' ke configuration.yaml",
                     "system_health": {
                         "manage": "Kelola",
                         "more_info": "info lebih lanjut"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "halaman integrasi",
-                    "missing_zha": "Panel konfigurasi ZHA tidak ada? Panelnya dipindahkan ke entri ZHA di {integrations_page} .",
-                    "missing_zwave": "Panel konfigurasi Z-Wave tidak ada? Panelnya dipindahkan ke entri Z-Wave di {integrations_page} ."
+                    },
+                    "system_health_error": "Komponen Kesehatan Sistem tidak dimuat. Tambahkan 'system_health:' ke configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Tambahkan integrasi",
@@ -2168,9 +2159,9 @@
                         "configure": "Konfigurasikan",
                         "delete": "Hapus",
                         "delete_confirm": "Yakin ingin menghapus integrasi ini?",
+                        "depends_on_cloud": "Tergantung pada cloud",
                         "device_unavailable": "Perangkat tidak tersedia",
                         "devices": "{count} {count, plural,\n  one {perangkat}\n  other {perangkat}\n}",
-                        "disable_restart_confirm": "Mulai ulang Home Assistant untuk menyelesaikan penonaktifan integrasi ini",
                         "disable": {
                             "disable_confirm": "Yakin ingin menonaktifkan entri konfigurasi ini? Perangkat dan entitasnya akan dinonaktifkan.",
                             "disabled": "Dinonaktifkan",
@@ -2181,23 +2172,32 @@
                             },
                             "disabled_cause": "Dinonaktifkan oleh {cause}"
                         },
+                        "disable_error": "Gagal mengaktifkan atau menonaktifkan integrasi",
+                        "disable_restart_confirm": "Mulai ulang Home Assistant untuk menyelesaikan penonaktifan integrasi ini",
+                        "disabled_polling": "Polling otomatis untuk data yang diperbarui dinonaktifkan",
                         "documentation": "Dokumentasi",
                         "enable_restart_confirm": "Mulai ulang Home Assistant untuk menyelesaikan pengaktifan integrasi ini",
                         "entities": "{count} {count, plural,\n  one {entitas}\n  other {entitas}\n}",
                         "entity_unavailable": "Entitas tidak tersedia",
                         "firmware": "Firmware: {version}",
                         "hub": "Terhubung via",
-                        "logs": "log",
                         "manuf": "oleh {manufacturer}",
                         "no_area": "Tidak Ada Area",
                         "not_loaded": "Tidak dimuat, periksa {logs_link}",
-                        "options": "Opsi",
+                        "provided_by_custom_integration": "Disediakan oleh integrasi khusus",
                         "reload": "Muat Ulang",
                         "reload_confirm": "Integrasi telah dimuat ulang",
                         "reload_restart_confirm": "Mulai ulang Home Assistant untuk menyelesaikan pemuatan ulang integrasi ini",
                         "rename": "Ganti Nama",
                         "restart_confirm": "Mulai ulang Home Assistant untuk menyelesaikan penghapusan integrasi ini",
                         "services": "{count} {count, plural,\n  one {layanan}\n  other {layanan}\n}",
+                        "state": {
+                            "loaded": "Dimuat",
+                            "migration_error": "Kesalahan migrasi",
+                            "not_loaded": "Tidak dimuat",
+                            "setup_error": "Gagal menyiapkan",
+                            "setup_retry": "Mencoba kembali penyiapan"
+                        },
                         "system_options": "Opsi Sistem",
                         "unnamed_entry": "Entri tanpa nama"
                     },
@@ -2214,7 +2214,7 @@
                             "open_site": "Buka situs web"
                         },
                         "finish": "Selesai",
-                        "loading_first_time": "Mohon tunggu sementara integrasi sedang dipasang",
+                        "next": "Berikutnya",
                         "not_all_required_fields": "Belum semua bidang wajib telah terisi.",
                         "not_loaded": "Integrasi tidak dapat dimuat, coba mulai ulang Home Assistant.",
                         "pick_flow_step": {
@@ -2230,7 +2230,6 @@
                     "details": "Detail integrasi",
                     "disable": {
                         "disabled_integrations": "{number} dinonaktifkan",
-                        "hide_disabled": "Sembunyikan integrasi yang dinonaktifkan",
                         "show": "Tampilkan",
                         "show_disabled": "Tampilkan integrasi yang dinonaktifkan"
                     },
@@ -2241,7 +2240,6 @@
                         "confirm_delete_ignore_title": "Berhenti mengabaikan {name}?",
                         "confirm_ignore": "Yakin tidak ingin menyiapkan integrasi ini? Anda dapat membatalkan ini dengan mengeklik 'Tampilkan integrasi yang diabaikan' di menu tambahan di kanan atas.",
                         "confirm_ignore_title": "Abaikan penemuan {name}?",
-                        "hide_ignored": "Sembunyikan integrasi yang diabaikan",
                         "ignore": "Abaikan",
                         "ignored": "Diabaikan",
                         "show_ignored": "Tampilkan integrasi yang diabaikan",
@@ -2265,8 +2263,10 @@
                 "logs": {
                     "caption": "Log",
                     "clear": "Bersihkan",
+                    "custom_integration": "integrasi khusus",
                     "description": "Lihat log Home Assistant",
                     "details": "Detail Log ({level})",
+                    "error_from_custom_integration": "Kesalahan ini berasal dari integrasi khusus.",
                     "level": {
                         "critical": "CRITICAL",
                         "debug": "DEBUG",
@@ -2359,7 +2359,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfigurasi",
                     "description_listen": "Dengarkan topik",
                     "description_publish": "Publikasikan paket",
                     "listening_to": "Mendengarkan",
@@ -2373,7 +2372,6 @@
                     "topic": "topik"
                 },
                 "ozw": {
-                    "button": "Konfigurasikan",
                     "common": {
                         "controller": "Pengendali",
                         "instance": "Instans",
@@ -2398,6 +2396,11 @@
                         "nodes": "Node",
                         "select_instance": "Pilih Instans"
                     },
+                    "network": {
+                        "header": "Manajemen Jaringan",
+                        "introduction": "Kelola fungsi seluruh jaringan.",
+                        "node_count": "{count} node"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Semua node telah dikueri",
@@ -2418,10 +2421,9 @@
                         "starting": "Memulai",
                         "unknown": "Tidak diketahui"
                     },
-                    "network": {
-                        "header": "Manajemen Jaringan",
-                        "introduction": "Kelola fungsi seluruh jaringan.",
-                        "node_count": "{count} node"
+                    "node": {
+                        "button": "Detail Node",
+                        "not_found": "Node tidak ditemukan"
                     },
                     "node_config": {
                         "header": "Konfigurasi Node",
@@ -2451,10 +2453,6 @@
                         "versions": "Mendapatkan informasi tentang firmware dan versi kelas perintah",
                         "wakeup": "Menyiapkan dukungan untuk antrean dan pesan bangun"
                     },
-                    "node": {
-                        "button": "Detail Node",
-                        "not_found": "Node tidak ditemukan"
-                    },
                     "nodes_table": {
                         "failed": "Gagal",
                         "id": "ID",
@@ -2551,6 +2549,8 @@
                         "add_scene": "Tambahkan scene",
                         "delete_confirm": "Yakin ingin menghapus scene ini?",
                         "delete_scene": "Hapus scene",
+                        "duplicate": "Gandakan",
+                        "duplicate_scene": "Gandakan scene",
                         "edit_scene": "Edit scene",
                         "header": "Editor Scene",
                         "headers": {
@@ -2595,10 +2595,12 @@
                         },
                         "save_script": "Simpan skrip",
                         "sequence": "Urutan",
-                        "sequence_sentence": "Urutan tindakan skrip ini."
+                        "sequence_sentence": "Urutan tindakan skrip ini.",
+                        "show_trace": "Tampilkan jejak"
                     },
                     "picker": {
                         "add_script": "Tambahkan skrip",
+                        "dev_script": "Debug skrip",
                         "duplicate": "Gandakan",
                         "duplicate_script": "Gandakan skrip",
                         "edit_script": "Edit skrip",
@@ -2755,7 +2757,6 @@
                         "search_again": "Cari Lagi",
                         "spinner": "Mencari perangkat ZHA Zigbee…"
                     },
-                    "button": "Konfigurasikan",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atribut klaster yang dipilih",
                         "get_zigbee_attribute": "Dapatkan Atribut Zigbee",
@@ -2783,6 +2784,10 @@
                         "manufacturer_code_override": "Penimpaan Kode Produsen",
                         "value": "Nilai"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Pintasan",
+                        "update_button": "Perbarui Konfigurasi"
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Konfigurasi Selesai",
                         "CONFIGURED_status_text": "Inisialisasi",
@@ -2863,87 +2868,7 @@
                     "introduction": "Zona memungkinkan Anda untuk menentukan wilayah tertentu di bumi. Ketika seseorang berada dalam zona, status akan mengambil nama dari zona tersebut. Zona juga dapat digunakan sebagai pemicu atau kondisi di dalam pengaturan otomasi.",
                     "no_zones_created_yet": "Sepertinya Anda belum membuat zona."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Batalkan Penyertaan",
-                        "controller_in_inclusion_mode": "Pengontrol Z-Wave Anda sekarang dalam mode penyertaan.",
-                        "follow_device_instructions": "Ikuti petunjuk yang disertakan dengan perangkat Anda untuk memicu pemasangan pada perangkat.",
-                        "inclusion_failed": "Node tidak dapat ditambahkan. Periksa log untuk informasi lebih lanjut.",
-                        "inclusion_finished": "Node telah ditambahkan. Mungkin perlu beberapa menit bagi semua entitas untuk muncul saat kami selesai menyiapkan node di latar belakang.",
-                        "introduction": "Wisaya ini akan memandu Anda menambahkan node ke jaringan Z-Wave.",
-                        "secure_inclusion_warning": "Perangkat aman memerlukan bandwidth tambahan; terlalu banyak perangkat aman yang dapat memperlambat jaringan Z-Wave Anda. Sebaiknya hanya menggunakan inklusi aman untuk perangkat yang memerlukannya, seperti kunci atau pembuka pintu garasi.",
-                        "start_inclusion": "Mulai Penyertaan",
-                        "start_secure_inclusion": "Mulai Penyertaan Aman",
-                        "title": "Tambahkan Node Z-Wave",
-                        "use_secure_inclusion": "Gunakan penyertaan yang aman",
-                        "view_device": "Lihat Perangkat"
-                    },
-                    "button": "Konfigurasikan",
-                    "common": {
-                        "add_node": "Tambahkan Node",
-                        "close": "Tutup",
-                        "home_id": "ID Rumah",
-                        "network": "Jaringan",
-                        "node_id": "ID Node",
-                        "remove_node": "Hapus Node"
-                    },
-                    "dashboard": {
-                        "driver_version": "Versi Driver",
-                        "dump_dead_nodes_text": "Beberapa node Anda tidak merespons dan dianggap mati. Ini tidak akan diekspor sepenuhnya.",
-                        "dump_dead_nodes_title": "Beberapa node Anda mati",
-                        "dump_debug": "Unduh dump jaringan Anda untuk membantu mendiagnosis masalah",
-                        "dump_not_ready_confirm": "Unduh",
-                        "dump_not_ready_text": "Jika Anda membuat ekspor sementara tidak semua node siap, Anda bisa kehilangan data yang dibutuhkan. Berikan waktu pada jaringan Anda untuk menanyakan semua node. Ingin melanjutkan proses dump?",
-                        "dump_not_ready_title": "Belum semua node siap",
-                        "header": "Kelola Jaringan Z-Wave Anda",
-                        "home_id": "ID Rumah",
-                        "introduction": "Kelola jaringan Z-Wave dan node Z-Wave Anda",
-                        "nodes_ready": "Node siap",
-                        "server_version": "Versi Server"
-                    },
-                    "device_info": {
-                        "device_config": "Konfigurasikan Perangkat",
-                        "node_ready": "Node Siap",
-                        "node_status": "Status Node",
-                        "zwave_info": "Info Z-Wave"
-                    },
-                    "navigation": {
-                        "network": "Jaringan"
-                    },
-                    "network_status": {
-                        "connected": "Terhubung",
-                        "connecting": "Menghubungkan",
-                        "unknown": "Tidak diketahui"
-                    },
-                    "node_config": {
-                        "attribution": "Parameter konfigurasi dan deskripsi perangkat disediakan oleh proyek {device_database}.",
-                        "battery_device_notice": "Perangkat dengan baterai harus dalam keadaan aktif untuk memperbarui konfigurasinya. Rujuk manual perangkat Anda untuk mendapatkan instruksi tentang cara membangunkan perangkat.",
-                        "error_device_not_found": "Perangkat tidak ditemukan",
-                        "header": "Konfigurasi Perangkat Z-Wave",
-                        "introduction": "Kelola dan seseuaikan parameter konfigurasi tertentu untuk perangkat (node) yang dipilih.",
-                        "parameter_is_read_only": "Parameter ini bersifat hanya baca",
-                        "zwave_js_device_database": "Basis Data Perangkat Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Hidup",
-                        "asleep": "Tertidur",
-                        "awake": "Bangun",
-                        "dead": "Mati",
-                        "unknown": "Tidak diketahui"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Batalkan Pengeluaran",
-                        "controller_in_exclusion_mode": "Pengontrol Z-Wave Anda sekarang dalam mode pengeluaran.",
-                        "exclusion_failed": "Node tidak dapat dihapus. Periksa log untuk informasi lebih lanjut.",
-                        "exclusion_finished": "Node {id} telah dihapus dari jaringan Z-Wave Anda.",
-                        "follow_device_instructions": "Ikuti petunjuk yang disertakan dengan perangkat Anda untuk memicu pengeluaran pada perangkat.",
-                        "introduction": "Hapus node dari jaringan Z-Wave Anda, dan hapus perangkat dan entitas terkait dari Home Assistant.",
-                        "start_exclusion": "Mulai Pengeluaran",
-                        "title": "Hapus Node Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfigurasikan",
                     "common": {
                         "index": "Indeks",
                         "instance": "Instans",
@@ -3032,6 +2957,120 @@
                     "values": {
                         "header": "Nilai Node"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Batalkan Penyertaan",
+                        "controller_in_inclusion_mode": "Pengontrol Z-Wave Anda sekarang dalam mode penyertaan.",
+                        "follow_device_instructions": "Ikuti petunjuk yang disertakan dengan perangkat Anda untuk memicu pemasangan pada perangkat.",
+                        "inclusion_failed": "Node tidak dapat ditambahkan. Periksa log untuk informasi lebih lanjut.",
+                        "inclusion_finished": "Node telah ditambahkan. Mungkin perlu beberapa menit bagi semua entitas untuk muncul saat kami selesai menyiapkan node di latar belakang.",
+                        "interview_failed": "Wawancara perangkat gagal. Informasi tambahan mungkin tersedia di log.",
+                        "interview_started": "Perangkat sedang diwawancarai. Proses ini mungkin membutuhkan beberapa saat.",
+                        "introduction": "Wisaya ini akan memandu Anda menambahkan node ke jaringan Z-Wave.",
+                        "secure_inclusion_warning": "Perangkat aman memerlukan bandwidth tambahan; terlalu banyak perangkat aman yang dapat memperlambat jaringan Z-Wave Anda. Sebaiknya hanya menggunakan inklusi aman untuk perangkat yang memerlukannya, seperti kunci atau pembuka pintu garasi.",
+                        "start_inclusion": "Mulai Penyertaan",
+                        "start_secure_inclusion": "Mulai Penyertaan Aman",
+                        "title": "Tambahkan Node Z-Wave",
+                        "use_secure_inclusion": "Gunakan penyertaan yang aman",
+                        "view_device": "Lihat Perangkat"
+                    },
+                    "common": {
+                        "add_node": "Tambahkan Node",
+                        "close": "Tutup",
+                        "heal_network": "Sembuhkan Jaringan",
+                        "home_id": "ID Rumah",
+                        "network": "Jaringan",
+                        "node_id": "ID Node",
+                        "reconfigure_server": "Konfigurasikan Ulang Server",
+                        "remove_node": "Hapus Node"
+                    },
+                    "dashboard": {
+                        "driver_version": "Versi Driver",
+                        "dump_dead_nodes_text": "Beberapa node Anda tidak merespons dan dianggap mati. Ini tidak akan diekspor sepenuhnya.",
+                        "dump_dead_nodes_title": "Beberapa node Anda mati",
+                        "dump_debug": "Unduh dump jaringan Anda untuk membantu mendiagnosis masalah",
+                        "dump_not_ready_confirm": "Unduh",
+                        "dump_not_ready_text": "Jika Anda membuat ekspor sementara tidak semua node siap, Anda bisa kehilangan data yang dibutuhkan. Berikan waktu pada jaringan Anda untuk menanyakan semua node. Ingin melanjutkan proses dump?",
+                        "dump_not_ready_title": "Belum semua node siap",
+                        "header": "Kelola Jaringan Z-Wave Anda",
+                        "home_id": "ID Rumah",
+                        "introduction": "Kelola jaringan Z-Wave dan node Z-Wave Anda",
+                        "nodes_ready": "Node siap",
+                        "server_version": "Versi Server"
+                    },
+                    "device_info": {
+                        "device_config": "Konfigurasikan Perangkat",
+                        "node_ready": "Node Siap",
+                        "node_status": "Status Node",
+                        "zwave_info": "Info Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Penyembuhan jaringan telah dibatalkan.",
+                        "healing_complete": "Penyembuhan jaringan selesai.",
+                        "healing_failed": "Penyembuhan gagal. Informasi tambahan mungkin tersedia di log.",
+                        "in_progress": "Proses penyambuhan sedang berjalan. Proses ini membutuhkan beberapa saat.",
+                        "introduction": "Mulai penyembuhan jaringan di jaringan Z-Wave Anda. Pemulihan jaringan akan menyebabkan semua perangkat mengonfigurasi ulang rute mereka kembali ke pengontrol dan direkomendasikan jika Anda baru saja memindahkan perangkat atau pengontrol Anda.",
+                        "run_in_background": "Anda dapat menutup dialog ini dan penyembuhan jaringan akan dilanjutkan di latar belakang.",
+                        "start_heal": "Mulai Penyembuhan",
+                        "stop_heal": "Hentikan Penyembuhan",
+                        "title": "Sembuhkan Jaringan Z-Wave Anda",
+                        "traffic_warning": "Proses penyembuhan menghasilkan sejumlah besar lalu lintas di jaringan Z-Wave. Ini dapat menyebabkan perangkat merespons dengan lambat (atau tidak sama sekali) saat penyembuhan sedang berlangsung."
+                    },
+                    "logs": {
+                        "log_level": "Tingkat Log",
+                        "log_level_changed": "Tingkat Log diubah menjadi: {level}",
+                        "subscribed_to_logs": "Berlangganan Pesan Log Z-Wave JS…",
+                        "title": "Log Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Log",
+                        "network": "Jaringan"
+                    },
+                    "network_status": {
+                        "connected": "Terhubung",
+                        "connecting": "Menghubungkan",
+                        "unknown": "Tidak diketahui"
+                    },
+                    "node_config": {
+                        "attribution": "Parameter konfigurasi dan deskripsi perangkat disediakan oleh proyek {device_database}.",
+                        "battery_device_notice": "Perangkat dengan baterai harus dalam keadaan aktif untuk memperbarui konfigurasinya. Rujuk manual perangkat Anda untuk mendapatkan instruksi tentang cara membangunkan perangkat.",
+                        "error_device_not_found": "Perangkat tidak ditemukan",
+                        "header": "Konfigurasi Perangkat Z-Wave",
+                        "introduction": "Kelola dan seseuaikan parameter konfigurasi tertentu untuk perangkat (node) yang dipilih.",
+                        "parameter_is_read_only": "Parameter ini bersifat hanya baca",
+                        "set_param_accepted": "Parameter telah diperbarui.",
+                        "set_param_error": "Terjadi kesalahan.",
+                        "set_param_queued": "Perubahan parameter telah diantrekan, dan akan diperbarui saat perangkat bangun.",
+                        "zwave_js_device_database": "Basis Data Perangkat Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Hidup",
+                        "asleep": "Tertidur",
+                        "awake": "Bangun",
+                        "dead": "Mati",
+                        "unknown": "Tidak diketahui"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Anda perlu membangunkan perangkat bertenaga baterai sebelum memulai wawancara ulang. Lihat manual perangkat Anda untuk instruksi tentang cara membangunkan perangkat.",
+                        "in_progress": "Perangkat sedang diwawancarai. Proses ini mungkin membutuhkan beberapa saat.",
+                        "interview_complete": "Wawancara perangkat selesai.",
+                        "interview_failed": "Wawancara perangkat gagal. Informasi tambahan mungkin tersedia di log.",
+                        "introduction": "Wawancara ulang sebuah perangkat di jaringan Z-Wave Anda. Gunakan fitur ini jika perangkat tersebut tidak berfungsi dengan benar atau fiturnya tidak tersedia.",
+                        "run_in_background": "Anda dapat menutup dialog ini dan wawancara akan dilanjutkan di latar belakang.",
+                        "start_reinterview": "Mulai Wawancara Ulang",
+                        "title": "Wawancara ulang perangkat Z-Wave"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Batalkan Pengeluaran",
+                        "controller_in_exclusion_mode": "Pengontrol Z-Wave Anda sekarang dalam mode pengeluaran.",
+                        "exclusion_failed": "Node tidak dapat dihapus. Periksa log untuk informasi lebih lanjut.",
+                        "exclusion_finished": "Node {id} telah dihapus dari jaringan Z-Wave Anda.",
+                        "follow_device_instructions": "Ikuti petunjuk yang disertakan dengan perangkat Anda untuk memicu pengeluaran pada perangkat.",
+                        "introduction": "Hapus node dari jaringan Z-Wave Anda, dan hapus perangkat dan entitas terkait dari Home Assistant.",
+                        "start_exclusion": "Mulai Pengeluaran",
+                        "title": "Hapus Node Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3103,33 +3142,6 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Kembali",
-                "supervisor": {
-                    "ask": "Dapatkan bantuan",
-                    "observer": "Periksa Observer",
-                    "reboot": "Coba me-reboot host",
-                    "system_health": "Periksa Kesehatan Sistem",
-                    "title": "Tidak dapat memuat panel Supervisor!",
-                    "wait": "Jika Anda baru saja memulai, pastikan Anda telah memberikan cukup waktu kepada supervisor untuk memulai."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Minggu lalu",
-                    "this_week": "Minggu ini",
-                    "today": "Hari ini",
-                    "yesterday": "Kemarin"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Minggu lalu",
-                    "this_week": "Minggu ini",
-                    "today": "Hari ini",
-                    "yesterday": "Kemarin"
-                }
-            },
             "lovelace": {
                 "add_entities": {
                     "generated_unsupported": "Anda hanya dapat menggunakan fungsi ini jika Anda telah mengontrol antarmuka Lovelace.",
@@ -3241,7 +3253,6 @@
                         "entities": {
                             "description": "Kartu Entitas adalah jenis kartu yang paling umum. Ini mengelompokkan item bersama ke dalam daftar.",
                             "edit_special_row": "Lihat detail baris ini dengan mengklik tombol edit",
-                            "entity_row_editor": "Editor Baris Entitas",
                             "entity_row": {
                                 "attribute": "Atribut",
                                 "button": "Tombol",
@@ -3253,6 +3264,7 @@
                                 "section": "Bagian",
                                 "weblink": "Tautan Web"
                             },
+                            "entity_row_editor": "Editor Baris Entitas",
                             "name": "Entitas",
                             "secondary_info_values": {
                                 "brightness": "Kecerahan",
@@ -3527,7 +3539,6 @@
                         "unsaved_changes": "Perubahan yang belum disimpan"
                     },
                     "save_config": {
-                        "cancel": "Lupakan saja",
                         "close": "Tutup",
                         "empty_config": "Mulai dengan dasbor kosong",
                         "header": "Kendalikan antarmuka Lovelace Anda",
@@ -3556,8 +3567,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Ini akan membuat kartu pertama dengan lebar penuh. Kartu lain dan lencana dalam tampilan ini tidak akan dirender.",
-                            "title": "Mode Panel?",
                             "warning_multiple_cards": "Tampilan ini berisi lebih dari satu kartu, tetapi tampilan panel hanya dapat menampilkan 1 kartu."
                         }
                     }
@@ -3760,8 +3769,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Berikutnya",
-                    "intro": "Bagikan analitika dari instans Anda. Data ini akan tersedia untuk umum di {link}"
+                    "finish": "Berikutnya"
                 },
                 "core-config": {
                     "button_detect": "Deteksi",
@@ -3781,10 +3789,17 @@
                 "intro": "Siap untuk membuat rumah Anda lebih hidup, merebut kembali privasi Anda, dan bergabung dengan komunitas pemikir di seluruh dunia?",
                 "next": "Berikutnya",
                 "restore": {
-                    "description": "Atau, Anda dapat memulihkan dari snapshot sebelumnya.",
+                    "addons": "Add-on",
+                    "confirm_password": "Konfirmasi kata sandi Backup",
+                    "description": "Atau, Anda dapat memulihkan dari backup sebelumnya.",
+                    "folders": "Folder",
                     "hide_log": "Sembunyikan log lengkap",
                     "in_progress": "Pemulihan sedang berlangsung",
-                    "show_log": "Tampilkan log lengkap"
+                    "password": "Kata sandi",
+                    "password_protection": "Perlindungan kata sandi",
+                    "select_type": "Pilih yang akan dipulihkan",
+                    "show_log": "Tampilkan log lengkap",
+                    "type": "Jenis"
                 },
                 "user": {
                     "create_account": "Buat Akun",
@@ -3861,6 +3876,12 @@
                     "prompt_copy_token": "Salin token akses Anda. Ini tidak akan ditampilkan lagi.",
                     "prompt_name": "Beri nama token"
                 },
+                "mfa": {
+                    "confirm_disable": "Yakin ingin menonaktifkan {name}?",
+                    "disable": "Nonaktifkan",
+                    "enable": "Aktifkan",
+                    "header": "Modul Autentikasi Multifaktor"
+                },
                 "mfa_setup": {
                     "close": "Tutup",
                     "step_done": "Penyiapan selesai untuk {step}",
@@ -3868,12 +3889,6 @@
                     "title_aborted": "Dibatalkan",
                     "title_success": "Sukses!"
                 },
-                "mfa": {
-                    "confirm_disable": "Yakin ingin menonaktifkan {name}?",
-                    "disable": "Nonaktifkan",
-                    "enable": "Aktifkan",
-                    "header": "Modul Autentikasi Multifaktor"
-                },
                 "number_format": {
                     "description": "Pilih cara pemformatan bilangan",
                     "dropdown_label": "Format bilangan",
@@ -3928,6 +3943,17 @@
                     "primary_color": "Warna primer",
                     "reset": "Setel ulang"
                 },
+                "time_format": {
+                    "description": "Pilih pemformatan waktu",
+                    "dropdown_label": "Format waktu",
+                    "formats": {
+                        "12": "12 jam (AM/PM)",
+                        "24": "24 jam",
+                        "language": "Otomatis (gunakan pengaturan bahasa)",
+                        "system": "Gunakan pelokalan sistem"
+                    },
+                    "header": "Format Waktu"
+                },
                 "vibrate": {
                     "description": "Aktifkan atau nonaktifkan getaran pada perangkat ini saat mengontrol perangkat.",
                     "header": "Bergetar"
diff --git a/translations/frontend/is.json b/translations/frontend/is.json
index f3968d1d40..3c13dd1ba4 100644
--- a/translations/frontend/is.json
+++ b/translations/frontend/is.json
@@ -16,6 +16,7 @@
         "calendar": "Dagatal",
         "config": "Stillingar",
         "developer_tools": "Þróunarverkfæri",
+        "energy": "Orka",
         "history": "Saga",
         "logbook": "Breytingarsaga",
         "mailbox": "Pósthólf",
@@ -24,6 +25,14 @@
         "shopping_list": "Innkaupalisti",
         "states": "Yfirlit"
     },
+    "state": {
+        "default": {
+            "off": "Slökkt",
+            "on": "Á",
+            "unavailable": "Ekki tiltækt",
+            "unknown": "Óþekkt"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -85,16 +94,25 @@
             "not_home": "Fjarverandi"
         }
     },
-    "state": {
-        "default": {
-            "off": "Slökkt",
-            "on": "Á",
-            "unavailable": "Ekki tiltækt",
-            "unknown": "Óþekkt"
-        }
-    },
     "supervisor": {
+        "backup": {
+            "addons": "Viðbætur",
+            "could_not_create": "Ekki tókst að búa til skyndimynd",
+            "create": "Búa til",
+            "create_blocked_not_running": "Ekki er hægt að búa til skyndimynd núna þar sem kerfið er í {state} stöðu.",
+            "delete_backup_confirm": "eyða",
+            "enter_password": "Færðu inn lykilorð.",
+            "folders": "Möppur",
+            "name": "Heiti",
+            "password": "Lykilorð",
+            "password_protection": "Vörn með lykilorði",
+            "type": "Gerð"
+        },
         "dialog": {
+            "hardware": {
+                "search": "Leitaðu að vélbúnaði",
+                "title": "Vélbúnaður"
+            },
             "network": {
                 "connected_to": "Tengt við {ssid}",
                 "dhcp": "DHCP",
@@ -127,42 +145,12 @@
                 "text": "Á að endurræsa viðbótina með breytingum þínum?"
             },
             "update": {
-                "create_snapshot": "Stofna skyndimynd af {name} áður en uppfært er",
-                "snapshot": "Skyndimynd",
-                "snapshotting": "Bý til skyndimynd af {name}",
                 "updating": "Uppfæri {name} í útgáfu {version}"
             }
         },
         "my": {
             "error_addon_not_found": "Viðbót fannst ekki"
         },
-        "snapshot": {
-            "addons": "Viðbætur",
-            "available_snapshots": "Tiltækar skyndimyndir",
-            "could_not_create": "Ekki tókst að búa til skyndimynd",
-            "create": "Búa til",
-            "create_blocked_not_running": "Ekki er hægt að búa til skyndimynd núna þar sem kerfið er í {state} stöðu.",
-            "create_snapshot": "Búa til skyndimynd",
-            "description": "Skyndimyndir gera þér kleift að vinna með öryggisafrit af gögnum þessa tilviks af Home Assistant.",
-            "enter_password": "Færðu inn lykilorð.",
-            "folder": {
-                "addons/local": "Staðbundnar viðbætur",
-                "homeassistant": "Home Assistant stillingar",
-                "media": "Efni",
-                "share": "Deila",
-                "ssl": "SSL"
-            },
-            "folders": "Möppur",
-            "full_snapshot": "Full skyndimynd",
-            "name": "Heiti",
-            "partial_snapshot": "Skyndimynd að hluta",
-            "password": "Lykilorð",
-            "password_protected": "varið með lykilorði",
-            "password_protection": "Vörn með lykilorði",
-            "security": "Öryggi",
-            "type": "Gerð",
-            "upload_snapshot": "Hlaða upp skyndimynd"
-        },
         "system": {
             "core": {
                 "cpu_usage": "Kjarni: Notkun örgjörva",
@@ -192,6 +180,7 @@
                 "used_space": "Notað pláss"
             },
             "supervisor": {
+                "search": "Leita",
                 "unhealthy_reason": {
                     "docker": "Docker umhverfið virkar ekki rétt",
                     "privileged": "Umsjónarkerfi hefur ekki áskilin réttindi",
@@ -396,10 +385,17 @@
                 "today": "Í dag"
             },
             "data-table": {
+                "clear": "Hreinsa",
                 "search": "Leita"
             },
             "date-range-picker": {
                 "end_date": "Loka dagsetning",
+                "ranges": {
+                    "last_week": "Í síðustu viku",
+                    "this_week": "Í þessari viku",
+                    "today": "Í dag",
+                    "yesterday": "Í gær"
+                },
                 "select": "Velja",
                 "start_date": "Upphafs dagsetning"
             },
@@ -455,6 +451,13 @@
             "service-picker": {
                 "service": "Þjónusta"
             },
+            "statistic-picker": {
+                "learn_more": "Læra meira um tölfræði",
+                "statistic": "Tölfræði"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Hleð tölfræði..."
+            },
             "target-picker": {
                 "add_area_id": "Velja svæði",
                 "add_device_id": "Velja tæki",
@@ -579,6 +582,7 @@
                         "blueprint": "Uppdrættir",
                         "core": "Almennt",
                         "devices": "Tæki",
+                        "energy": "Orka",
                         "entities": "Einingar",
                         "helpers": "Hjálp",
                         "info": "Upplýsingar",
@@ -597,6 +601,9 @@
                     "server_control": {
                         "restart": "Endurræsa",
                         "stop": "Stöðva"
+                    },
+                    "types": {
+                        "reload": "Endurhlaða"
                     }
                 }
             },
@@ -622,6 +629,9 @@
                 "zha_device_card": {
                     "device_name_placeholder": "Breyta nafni á tæki"
                 }
+            },
+            "zha_reconfigure_device": {
+                "cluster_header": "Klasi"
             }
         },
         "duration": {
@@ -670,6 +680,7 @@
                         "create": "STOFNA",
                         "default_name": "Nýtt svæði",
                         "delete": "EYÐA",
+                        "linked_entities_caption": "Einingar",
                         "name": "Nafn",
                         "name_required": "Nafn er skilyrt",
                         "unknown_error": "Óþekkt villa",
@@ -709,7 +720,6 @@
                             "introduction": "Aðgerðir er það sem Home Assistant mun gera þegar sjálfvirkni er ræst.",
                             "learn_more": "Læra meira um aðgerðir",
                             "name": "Aðgerð",
-                            "type_select": "Gerð aðgerðar",
                             "type": {
                                 "condition": {
                                     "label": "Skilyrði"
@@ -723,6 +733,7 @@
                                     "extra_fields": {
                                         "code": "Kóði",
                                         "message": "Skilaboð",
+                                        "mode": "Hamur",
                                         "title": "Titill"
                                     },
                                     "label": "Tæki"
@@ -744,6 +755,7 @@
                                     "wait_template": "Bið sniðmát"
                                 }
                             },
+                            "type_select": "Gerð aðgerðar",
                             "unsupported_action": "Óstudd aðgerð: {action}"
                         },
                         "alias": "Nafn",
@@ -761,7 +773,6 @@
                             "header": "Skilyrði",
                             "learn_more": "Læra meira um skilyrði",
                             "name": "Skilyrði",
-                            "type_select": "Gerð skilyrðis",
                             "type": {
                                 "and": {
                                     "label": "Og"
@@ -823,6 +834,7 @@
                                     "zone": "Öryggissvæði"
                                 }
                             },
+                            "type_select": "Gerð skilyrðis",
                             "unsupported_condition": "Skilyrði ekki stutt: {condition}"
                         },
                         "default_name": "Ný sjálfvirkni",
@@ -851,7 +863,6 @@
                             "header": "Kveikjur",
                             "introduction": "Kveikjur sjá um að ræsa sjálfvirkni reglur. Það er mögulegt að tilgreina margar kveikjur fyrir sömu regluna. Þegar kveikja er ræst þá mun Home Assistant sannreyna skilyrðin ef einhver og kalla á aðgerðina.",
                             "learn_more": "Læra meira um kveikjur",
-                            "type_select": "Gerð kveikju",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -906,16 +917,16 @@
                                     "label": "Sniðmát",
                                     "value_template": "Gildissniðmát"
                                 },
+                                "time": {
+                                    "at": "Þann",
+                                    "label": "Tími"
+                                },
                                 "time_pattern": {
                                     "hours": "Klukkustundir",
                                     "label": "Tímamynstur",
                                     "minutes": "Mínútur",
                                     "seconds": "Sekúndur"
                                 },
-                                "time": {
-                                    "at": "Þann",
-                                    "label": "Tími"
-                                },
                                 "webhook": {
                                     "label": "Vefkrókur",
                                     "webhook_id": "Vefkrókur ID"
@@ -929,6 +940,7 @@
                                     "zone": "Svæði"
                                 }
                             },
+                            "type_select": "Gerð kveikju",
                             "unsupported_platform": "Vettvangur ekki studdur: {platform}"
                         },
                         "unsaved_confirm": "Þú ert með óvistaðar breytingar. Ertu viss um að þú viljir fara?"
@@ -999,6 +1011,7 @@
                             "title": "Alexa"
                         },
                         "connected": "Tengdur",
+                        "connecting": "Tengist...",
                         "connection_status": "Staða tengingar við skýið",
                         "fetching_subscription": "Sæki áskrift...",
                         "google": {
@@ -1096,6 +1109,7 @@
                     "section": {
                         "core": {
                             "core_config": {
+                                "currency": "Gjaldmiðill",
                                 "edit_requires_storage": "Ritill er óvirkur af því að stillingar eru vistaðar í configuration.yaml.",
                                 "elevation": "Hækkun",
                                 "elevation_meters": "metrar",
@@ -1193,6 +1207,20 @@
                     "unnamed_device": "Ónefnt tæki",
                     "update": "Uppfæra"
                 },
+                "energy": {
+                    "caption": "Orka",
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_number_input": "verð á kWh",
+                                "cost_number_suffix": "{currency}/kWh"
+                            },
+                            "to": {
+                                "cost_number_suffix": "{currency}/kWh"
+                            }
+                        }
+                    }
+                },
                 "entities": {
                     "caption": "Einingarskrá",
                     "description": "Yfirlit yfir allar þekktar einingar.",
@@ -1229,10 +1257,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Hreinsa",
-                    "filtering_by": "Sía eftir"
-                },
                 "header": "Stilla af Home Assistant",
                 "helpers": {
                     "dialog": {
@@ -1261,9 +1285,6 @@
                     "icons_by": "Smátákn eftir",
                     "integrations": "Samþættingar"
                 },
-                "integration_panel_move": {
-                    "link_integration_page": "Samþættingar síða"
-                },
                 "integrations": {
                     "add_integration": "Bæta við samþættingu",
                     "caption": "Samþættingar",
@@ -1280,7 +1301,6 @@
                         "hub": "Tengt gegnum",
                         "manuf": "eftir {manufacturer}",
                         "no_area": "Ekkert svæði",
-                        "options": "Valkostir",
                         "reload": "Endurhlaða",
                         "rename": "Endurnefna",
                         "restart_confirm": "Endurræsa Home Assitant til að klára að fjarlægja þessa samþættingu",
@@ -1302,7 +1322,6 @@
                     "discovered": "Uppgötvað",
                     "home_assistant_website": "Vefsíða Home Assistant",
                     "ignore": {
-                        "hide_ignored": "Fela hunsaðar samþættingar",
                         "ignore": "Hunsa",
                         "ignored": "Hunsað",
                         "show_ignored": "Sýna hunsaðar samþættingar"
@@ -1378,7 +1397,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Stilla",
                     "listening_to": "Hlusta á",
                     "title": "MQTT"
                 },
@@ -1443,6 +1461,7 @@
                         "add_scene": "Bæta við senu",
                         "delete_confirm": "Ertu viss um að þú viljir eyða þessari senu?",
                         "delete_scene": "Eyða senu",
+                        "duplicate": "Fjölfalda",
                         "edit_scene": "Breyta senu",
                         "header": "Senuritill",
                         "headers": {
@@ -1566,7 +1585,6 @@
                         "search_again": "Leita aftur",
                         "spinner": "Leitað að ZHA Zigbee tækjum..."
                     },
-                    "button": "Stilla",
                     "cluster_commands": {
                         "header": "Klasa skipanir"
                     },
@@ -1621,61 +1639,7 @@
                         "update": "Uppfæra"
                     }
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "title": "Bæta við Z-Wave hnúti",
-                        "view_device": "Skoða tæki"
-                    },
-                    "button": "Stilla",
-                    "common": {
-                        "add_node": "Bæta við hnúti",
-                        "close": "Loka",
-                        "network": "Net",
-                        "node_id": "Hnútauðkenni",
-                        "remove_node": "Fjarlægja hnút"
-                    },
-                    "dashboard": {
-                        "driver_version": "Útgáfa rekils",
-                        "dump_dead_nodes_text": "Sumir hnútanna svöruðu ekki og er gert ráð fyrir að þeir séu dauðir. Þessir hnútar verða ekki fluttir út að fullu.",
-                        "dump_dead_nodes_title": "Sumir hnútanna eru dauðir",
-                        "dump_not_ready_confirm": "Sækja",
-                        "dump_not_ready_title": "Ekki eru allir hnútar tilbúnir ennþá",
-                        "nodes_ready": "Hnútar tilbúnir",
-                        "server_version": "Útgáfa miðlara"
-                    },
-                    "device_info": {
-                        "node_ready": "Hnútur tilbúinn",
-                        "node_status": "Staða hnúts",
-                        "zwave_info": "Z-Wave upplýsingar"
-                    },
-                    "navigation": {
-                        "network": "Net"
-                    },
-                    "network_status": {
-                        "connected": "Tengt",
-                        "connecting": "Tengist",
-                        "unknown": "Óþekkt"
-                    },
-                    "node_status": {
-                        "alive": "Á lífi",
-                        "asleep": "Sofandi",
-                        "awake": "Vakandi",
-                        "dead": "Dauður",
-                        "unknown": "Óþekkt"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Hætta við útilokun",
-                        "controller_in_exclusion_mode": "Z-Wave stjórinn þinn er nú í útilokunarham.",
-                        "exclusion_failed": "Ekki tókst að fjarlægja hnútinn. Vinsamlegast athugaðu atburðaskrár fyrir frekari upplýsingar.",
-                        "exclusion_finished": "Hnúturinn {id} hefur verið fjarlægður af Z-Wave netinu.",
-                        "follow_device_instructions": "Fylgdu leiðbeiningunum sem fylgdu tækinu þínu til að kveikja á útilokun í tækinu.",
-                        "introduction": "Fjarlægðu hnút af Z-Wave netinu þínu og fjarlægðu tengd tæki og einingar úr Home Assistant.",
-                        "start_exclusion": "Hefja útilokun",
-                        "title": "Fjarlægja Z-Wave hnút"
-                    }
-                },
                 "zwave": {
-                    "button": "Stilla",
                     "common": {
                         "unknown": "óþekkt",
                         "value": "Gildi"
@@ -1715,6 +1679,65 @@
                         "stop_network": "Stöðva net",
                         "test_network": "Prófa net"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "title": "Bæta við Z-Wave hnúti",
+                        "view_device": "Skoða tæki"
+                    },
+                    "common": {
+                        "add_node": "Bæta við hnúti",
+                        "close": "Loka",
+                        "network": "Net",
+                        "node_id": "Hnútauðkenni",
+                        "remove_node": "Fjarlægja hnút"
+                    },
+                    "dashboard": {
+                        "driver_version": "Útgáfa rekils",
+                        "dump_dead_nodes_text": "Sumir hnútanna svöruðu ekki og er gert ráð fyrir að þeir séu dauðir. Þessir hnútar verða ekki fluttir út að fullu.",
+                        "dump_dead_nodes_title": "Sumir hnútanna eru dauðir",
+                        "dump_not_ready_confirm": "Sækja",
+                        "dump_not_ready_title": "Ekki eru allir hnútar tilbúnir ennþá",
+                        "nodes_ready": "Hnútar tilbúnir",
+                        "server_version": "Útgáfa miðlara"
+                    },
+                    "device_info": {
+                        "node_ready": "Hnútur tilbúinn",
+                        "node_status": "Staða hnúts",
+                        "zwave_info": "Z-Wave upplýsingar"
+                    },
+                    "navigation": {
+                        "network": "Net"
+                    },
+                    "network_status": {
+                        "connected": "Tengt",
+                        "connecting": "Tengist",
+                        "unknown": "Óþekkt"
+                    },
+                    "node_config": {
+                        "error_device_not_found": "Tæki fannst ekki",
+                        "set_param_error": "Villa kom upp."
+                    },
+                    "node_status": {
+                        "alive": "Á lífi",
+                        "asleep": "Sofandi",
+                        "awake": "Vakandi",
+                        "dead": "Dauður",
+                        "unknown": "Óþekkt"
+                    },
+                    "remove_failed_node": {
+                        "remove_device": "Fjarlægja tæki"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Hætta við útilokun",
+                        "controller_in_exclusion_mode": "Z-Wave stjórinn þinn er nú í útilokunarham.",
+                        "exclusion_failed": "Ekki tókst að fjarlægja hnútinn. Vinsamlegast athugaðu atburðaskrár fyrir frekari upplýsingar.",
+                        "exclusion_finished": "Hnúturinn {id} hefur verið fjarlægður af Z-Wave netinu.",
+                        "follow_device_instructions": "Fylgdu leiðbeiningunum sem fylgdu tækinu þínu til að kveikja á útilokun í tækinu.",
+                        "introduction": "Fjarlægðu hnút af Z-Wave netinu þínu og fjarlægðu tengd tæki og einingar úr Home Assistant.",
+                        "start_exclusion": "Hefja útilokun",
+                        "title": "Fjarlægja Z-Wave hnút"
+                    }
                 }
             },
             "developer-tools": {
@@ -1751,20 +1774,15 @@
                     }
                 }
             },
-            "history": {
-                "ranges": {
-                    "last_week": "Í síðustu viku",
-                    "this_week": "Í þessari viku",
-                    "today": "Í dag",
-                    "yesterday": "Í gær"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Í síðustu viku",
-                    "this_week": "Í þessari viku",
-                    "today": "Í dag",
-                    "yesterday": "Í gær"
+            "energy": {
+                "charts": {
+                    "by_device": "Orkunotkun eftir tæki",
+                    "solar": "Sólarorka",
+                    "stat_house_energy_meter": "Heildarorkunotkun"
+                },
+                "setup": {
+                    "back": "Til baka",
+                    "next": "Næsta"
                 }
             },
             "lovelace": {
@@ -1927,6 +1945,9 @@
                         "shopping-list": {
                             "name": "Innkaupalisti"
                         },
+                        "statistics-graph": {
+                            "name": "Tölfræðilínurit"
+                        },
                         "thermostat": {
                             "name": "Hitastillir"
                         },
@@ -1994,7 +2015,6 @@
                         "unsaved_changes": "Óvistaðar breytingar"
                     },
                     "save_config": {
-                        "cancel": "Gleymdu þessu",
                         "close": "Loka",
                         "header": "Taka yfir stjórn á Lovelace viðmótinu",
                         "para": "Home Assistant mun sjálfgefið halda utan um notendaviðmótið og uppfæra það þegar nýjar einingar eða Lovlace íhlutir verða aðgengilegir. Ef þú tekur yfir stjórn á viðmótinu þá mun þetta ekki gerast sjálfkrafa fyrir þig.",
@@ -2184,6 +2204,13 @@
                     "more_integrations": "Meira"
                 },
                 "intro": "Ertu tilbúinn að vekja heimilið þitt, endurheimta friðhelgi þína og gerast þáttakandi í  samfélagi grúskara á heimsvísu?",
+                "restore": {
+                    "addons": "Viðbætur",
+                    "folders": "Möppur",
+                    "password": "Lykilorð",
+                    "password_protection": "Vörn með lykilorði",
+                    "type": "Gerð"
+                },
                 "user": {
                     "create_account": "Stofna aðgang",
                     "data": {
@@ -2251,6 +2278,12 @@
                     "prompt_copy_token": "Afritaðu aðgangstókann þinn en hann verður ekki birtur aftur.",
                     "prompt_name": "Nafn?"
                 },
+                "mfa": {
+                    "confirm_disable": "Ertu viss um að þú viljir afvirkja {name} ?",
+                    "disable": "Afvirkja",
+                    "enable": "Virkja",
+                    "header": "Fjölþátta auðkenningareiningar"
+                },
                 "mfa_setup": {
                     "close": "Loka",
                     "step_done": "Uppsetningu lokið fyrir {step}",
@@ -2258,11 +2291,12 @@
                     "title_aborted": "Hætt var við",
                     "title_success": "Tókst!"
                 },
-                "mfa": {
-                    "confirm_disable": "Ertu viss um að þú viljir afvirkja {name} ?",
-                    "disable": "Afvirkja",
-                    "enable": "Virkja",
-                    "header": "Fjölþátta auðkenningareiningar"
+                "number_format": {
+                    "formats": {
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
+                        "space_comma": "1 234 567,89"
+                    }
                 },
                 "push_notifications": {
                     "description": "Senda tilkynningar í þetta tæki.",
diff --git a/translations/frontend/it.json b/translations/frontend/it.json
index d2ddb9ca09..3bc3135b3f 100644
--- a/translations/frontend/it.json
+++ b/translations/frontend/it.json
@@ -17,6 +17,7 @@
         "calendar": "Calendario",
         "config": "Impostazioni",
         "developer_tools": "Strumenti per sviluppatori",
+        "energy": "Energia",
         "history": "Storico",
         "logbook": "Registro",
         "mailbox": "Posta",
@@ -26,6 +27,14 @@
         "shopping_list": "Lista della spesa",
         "states": "Panoramica"
     },
+    "state": {
+        "default": {
+            "off": "Spento",
+            "on": "Acceso",
+            "unavailable": "Non disponibile",
+            "unknown": "Sconosciuto"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Fuori casa"
         }
     },
-    "state": {
-        "default": {
-            "off": "Spento",
-            "on": "Acceso",
-            "unavailable": "Non disponibile",
-            "unknown": "Sconosciuto"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Il componente aggiuntivo non è installato"
             }
         },
+        "backup": {
+            "addons": "Componenti aggiuntivi",
+            "confirm_password": "Conferma la password dell'istantanea",
+            "could_not_create": "Impossibile creare l'istantanea",
+            "create": "Crea",
+            "create_blocked_not_running": "La creazione di un'istantanea non è al momento possibile perché il sistema è nello stato {state}.",
+            "created": "Creato",
+            "delete_backup_confirm": "Elimina",
+            "delete_selected": "Elimina le istantanee selezionate",
+            "enter_password": "Immettere una password.",
+            "failed_to_delete": "Impossibile eliminare",
+            "folders": "Cartelle",
+            "name": "Nome dell'istantanea",
+            "password": "Password dell'istantanea",
+            "password_protection": "Protezione con password",
+            "passwords_not_matching": "Le password non corrispondono",
+            "select_type": "Seleziona cosa ripristinare",
+            "selected": "{number} selezionato/i",
+            "type": "Tipo di istantanea"
+        },
         "common": {
             "cancel": "Annulla",
             "close": "Chiudi",
@@ -366,9 +387,6 @@
                 "text": "Riavviare il componente aggiuntivo con le modifiche?"
             },
             "update": {
-                "create_snapshot": "Creare un'istantanea di {name} prima dell'aggiornamento",
-                "snapshot": "Istantanea",
-                "snapshotting": "Creazione istantanea di {name}",
                 "updating": "Aggiornamento di {name} alla versione {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Pannello di controllo",
-            "snapshots": "Istantanee",
             "store": "Raccolta di Componenti Aggiuntivi",
             "system": "Sistema"
         },
-        "snapshot": {
-            "addons": "Componenti aggiuntivi",
-            "available_snapshots": "Istantanee disponibili",
-            "confirm_password": "Conferma la password dell'istantanea",
-            "could_not_create": "Impossibile creare l'istantanea",
-            "create": "Crea",
-            "create_blocked_not_running": "La creazione di un'istantanea non è al momento possibile perché il sistema è nello stato {state}.",
-            "create_snapshot": "Crea istantanea",
-            "created": "Creato",
-            "delete_selected": "Elimina le istantanee selezionate",
-            "delete_snapshot_confirm": "Elimina",
-            "delete_snapshot_text": "Vuoi eliminare {number} {number, plural,\n  one {istantanea}\n  other {istantanee}\n}?",
-            "delete_snapshot_title": "Elimina istantanea",
-            "description": "Le istantanee ti consentono di eseguire facilmente il backup e il ripristino di tutti i dati dell'istanza di Home Assistant.",
-            "enter_password": "Immettere una password.",
-            "failed_to_delete": "Impossibile eliminare",
-            "folder": {
-                "addons/local": "Componenti aggiuntivi locali",
-                "homeassistant": "Configurazione di Home Assistant",
-                "media": "Media",
-                "share": "Condividi",
-                "ssl": "SSL"
-            },
-            "folders": "Cartelle",
-            "full_snapshot": "Istantanea completa",
-            "name": "Nome dell'istantanea",
-            "no_snapshots": "Non hai ancora nessuna istantanea.",
-            "partial_snapshot": "Istantanea parziale",
-            "password": "Password dell'istantanea",
-            "password_protected": "protetto da password",
-            "password_protection": "Protezione con password",
-            "passwords_not_matching": "Le password non corrispondono",
-            "security": "Sicurezza",
-            "select_type": "Seleziona cosa ripristinare",
-            "selected": "{number} selezionato/i",
-            "type": "Tipo di istantanea",
-            "upload_snapshot": "Aggiungi istantanea"
-        },
         "store": {
             "missing_addons": "Componenti aggiuntivi mancanti? Abilita la modalità avanzata nella pagina del tuo profilo utente",
             "no_results_found": "Nessun risultato trovato in {repository}.",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Data di fine",
+                "ranges": {
+                    "last_week": "Settimana scorsa",
+                    "this_week": "Questa settimana",
+                    "today": "Oggi",
+                    "yesterday": "Ieri"
+                },
                 "select": "Selezionare",
                 "start_date": "Data di inizio"
             },
@@ -821,7 +806,7 @@
                     "was_unsafe": "non era sicuro"
                 },
                 "retrieval_error": "Errore durante il recupero della voce del registro",
-                "show_trace": "Mostra la traccia"
+                "show_trace": "Mostra traccia"
             },
             "media-browser": {
                 "audio_not_supported": "Il tuo browser non supporta l'elemento audio.",
@@ -851,10 +836,10 @@
                 "documentation": "documentazione",
                 "learn_adding_local_media": "Ulteriori informazioni sull'aggiunta di file multimediali nella {documentation}.",
                 "local_media_files": "Posizionare i file video, audio e immagine nella cartella multimediale per poterli sfogliare e riprodurli nel browser o sui lettori multimediali supportati.",
+                "media-player-browser": "Lettore multimediale",
                 "media_browsing_error": "Errore di navigazione multimediale",
                 "media_not_supported": "Il Browser Media Player non supporta questo tipo di file multimediali",
                 "media_player": "Lettore multimediale",
-                "media-player-browser": "Lettore multimediale",
                 "no_items": "Nessun elemento",
                 "no_local_media_found": "Nessun media locale trovato",
                 "no_media_folder": "Sembra che ancora non sia stata creata una cartella multimediale.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Servizio"
             },
+            "statistic-picker": {
+                "learn_more": "Ulteriori informazioni sulle statistiche",
+                "missing_entity": "Perché la mia entità non è elencata?",
+                "no_match": "Nessuna statistica corrispondente trovata",
+                "no_statistics": "Non hai nessuna statistica",
+                "statistic": "Statistica"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Caricamento delle statistiche...",
+                "no_statistics_found": "Nessuna statistica trovata.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "media",
+                    "min": "min",
+                    "sum": "somma"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Scegli area",
                 "add_device_id": "Scegli dispositivo",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Opzioni"
                 },
+                "loading": {
+                    "loading_flow": "Attendi mentre le opzioni per {integration} vengono inizializzate",
+                    "loading_step": "Caricamento del passaggio successivo per {integration}"
+                },
                 "success": {
                     "description": "Opzioni salvate correttamente."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Generale",
                         "customize": "Personalizzazioni",
                         "devices": "Dispositivi",
+                        "energy": "Energia",
                         "entities": "Entità",
                         "helpers": "Aiutanti",
                         "info": "Informazioni",
                         "integrations": "Integrazioni",
                         "logs": "Registri",
                         "lovelace": "Plance di Lovelace",
-                        "navigate_to": "Navigare verso {panel}",
                         "person": "Persone",
                         "scene": "Scene",
                         "script": "Script",
@@ -1360,7 +1366,6 @@
                             "introduction": "Le Azioni sono ciò che Home Assistant eseguirà quando un'Attivazione (o Trigger) avvia un'Automazione.",
                             "learn_more": "Per saperne di più sulle azioni",
                             "name": "Azione",
-                            "type_select": "Tipo di azione",
                             "type": {
                                 "choose": {
                                     "add_option": "Aggiungi opzione",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Ripetere",
                                     "sequence": "Azioni",
-                                    "type_select": "Tipo \"ripetizione\"",
                                     "type": {
                                         "count": {
                                             "label": "Conteggio"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Condizioni \"mentre\"",
                                             "label": "Mentre"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Tipo \"ripetizione\""
                                 },
                                 "scene": {
                                     "label": "Attivare la scena"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Modello di attesa"
                                 }
                             },
+                            "type_select": "Tipo di azione",
                             "unsupported_action": "Nessun supporto dell'Interfaccia Utente per l'azione: {action}"
                         },
                         "alias": "Nome",
@@ -1452,7 +1458,6 @@
                             "introduction": "Le Condizioni sono facoltative e impediranno l'esecuzione dell'Automazione a meno che non siano soddisfatte tutte.",
                             "learn_more": "Per saperne di più sulle condizioni",
                             "name": "Condizione",
-                            "type_select": "Tipo di condizione",
                             "type": {
                                 "and": {
                                     "label": "E"
@@ -1513,12 +1518,18 @@
                                         "wed": "Mercoledì"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "ID Attivazione",
+                                    "label": "Attivazione",
+                                    "no_triggers": "Nessuna attivazione disponibile"
+                                },
                                 "zone": {
                                     "entity": "Entità con posizione",
                                     "label": "Zona",
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo di condizione",
                             "unsupported_condition": "Nessun supporto dell'Interfaccia Utente per la condizione: {condition}"
                         },
                         "copy_to_clipboard": "Copia negli Appunti",
@@ -1556,10 +1567,10 @@
                             "delete_confirm": "Sei sicuro di voler eliminare questo?",
                             "duplicate": "Duplica",
                             "header": "Attivazioni (o Trigger)",
+                            "id": "ID Attivazione (utilizzato dalla condizione di attivazione)",
                             "introduction": "L'Attivazione (o Trigger) avvia l'elaborazione di una regola di automazione. È possibile specificare più Attivazioni per una stessa regola di automazione. Una volta avviata una Attivazione, Home Assistant convaliderà le Condizioni, se presenti, ed eseguirà l'Azione.",
                             "learn_more": "Per saperne di più sulle attivazioni (o trigger)",
                             "name": "Attivazione",
-                            "type_select": "Tipo di attivazione",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1625,18 +1636,18 @@
                                     "label": "Modello",
                                     "value_template": "Valore modello"
                                 },
-                                "time_pattern": {
-                                    "hours": "Ore",
-                                    "label": "Ricorrenza temporale",
-                                    "minutes": "Minuti",
-                                    "seconds": "Secondi"
-                                },
                                 "time": {
                                     "at": "Al momento",
                                     "label": "Ora",
                                     "type_input": "Valore di un aiutante data/ora",
                                     "type_value": "Tempo fisso"
                                 },
+                                "time_pattern": {
+                                    "hours": "Ore",
+                                    "label": "Ricorrenza temporale",
+                                    "minutes": "Minuti",
+                                    "seconds": "Secondi"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1650,6 +1661,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo di attivazione",
                             "unsupported_platform": "Nessun supporto dell'Interfaccia Utente per la piattaforma: {platform}"
                         },
                         "unsaved_confirm": "Hai delle modifiche non salvate. Sei sicuro di voler uscire?"
@@ -1812,9 +1824,9 @@
                             "loading": "Caricamento in corso...",
                             "manage": "Gestisci",
                             "no_hooks_yet": "Sembra che tu non abbia ancora dei webhook. Per iniziare, configurare un ",
+                            "no_hooks_yet2": " o creando un ",
                             "no_hooks_yet_link_automation": "automazione webhook",
                             "no_hooks_yet_link_integration": "Integrazione basata su webhook",
-                            "no_hooks_yet2": " o creando un ",
                             "title": "Webhooks"
                         }
                     },
@@ -1929,41 +1941,13 @@
                     "description": "Sistema di unità, posizione, fuso orario e altri parametri generali",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Prima di abilitarlo, assicurati di visitare la pagina della documentazione di analisi {link} per capire cosa stai inviando e come viene archiviato.",
-                                "header": "Analisi",
-                                "instance_id": "ID istanza: {huuid}",
-                                "introduction": "Condividi le informazioni di installazione per migliorare Home Assistant e aiutarci a convincere i produttori ad aggiungere funzionalità incentrate sul controllo locale e sulla privacy.",
-                                "learn_more": "Come elaboriamo i tuoi dati",
-                                "needs_base": "È necessario abilitare l'analisi di base affinché questa opzione sia disponibile",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID dell'istanza, versione e tipo di installazione.",
-                                        "title": "Analisi di base"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Condividi i rapporti sugli arresti anomali quando si verificano errori imprevisti.",
-                                        "title": "Diagnostica"
-                                    },
-                                    "statistics": {
-                                        "description": "Totale entità, utenti e altri elementi utilizzati.",
-                                        "title": "Statistiche d'uso"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nomi, versioni e funzionalità.",
-                                        "title": "Integrazioni e componenti aggiuntivi utilizzati"
-                                    },
-                                    "usage": {
-                                        "description": "Nomi e informazioni sulla versione.",
-                                        "title": "Integrazioni usate"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Valuta",
                                 "edit_requires_storage": "Editor disabilitato perché la configurazione è memorizzata in configuration.yaml.",
                                 "elevation": "Altitudine",
                                 "elevation_meters": "metri",
                                 "external_url": "URL esterno",
+                                "find_currency_value": "Trova il tuo valore",
                                 "imperial_example": "Fahrenheit, libbre",
                                 "internal_url": "URL interno",
                                 "latitude": "Latitudine",
@@ -2092,6 +2076,63 @@
                     "update": "Aggiorna",
                     "update_device_error": "Aggiornamento del dispositivo non riuscito"
                 },
+                "energy": {
+                    "caption": "Energia",
+                    "description": "Monitora la produzione e il consumo di energia",
+                    "device_consumption": {
+                        "add_stat": "Scegli l'entità di cui tenere traccia dell'energia",
+                        "dialog": {
+                            "selected_stat_intro": "Seleziona l'entità che rappresenta il consumo energetico del dispositivo."
+                        },
+                        "learn_more": "Maggiori informazioni su come iniziare.",
+                        "selected_stat": "Monitoraggio dell'energia per",
+                        "sub": "Il monitoraggio del consumo energetico dei singoli dispositivi consente a Home Assistant di suddividere il consumo energetico per dispositivo.",
+                        "title": "Dispositivi individuali"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Utilizzare un'entità con prezzo corrente",
+                                "cost_entity_input": "Entità con il prezzo corrente",
+                                "cost_number": "Utilizzare un prezzo statico",
+                                "cost_number_input": "Prezzo per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Seleziona come Home Assistant deve tenere traccia dei costi dell'energia consumata.",
+                                "cost_stat": "Utilizzare un'entità che tiene traccia dei costi totali",
+                                "cost_stat_input": "Entità costi totali",
+                                "energy_stat": "Energia consumata (kWh)",
+                                "header": "Configura il consumo di rete",
+                                "no_cost": "Non tenere traccia dei costi",
+                                "paragraph": "Il consumo di rete è l'energia che passa dalla rete energetica alla tua casa."
+                            },
+                            "to": {
+                                "cost_entity": "Utilizzare un'entità con tariffa corrente",
+                                "cost_entity_input": "Entità con la tariffa corrente",
+                                "cost_number": "Utilizzare una tariffa statica",
+                                "cost_number_input": "Tariffa per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Ricevi denaro quando restituisci energia alla rete?",
+                                "cost_stat": "Utilizza un'entità che tiene traccia del denaro totale ricevuto",
+                                "cost_stat_input": "Entità di compensazione totale",
+                                "energy_stat": "Energia restituita alla rete (kWh)",
+                                "header": "Configura la produzione di rete",
+                                "no_cost": "Non ricevo soldi indietro",
+                                "paragraph": "La produzione di rete è l'energia che passa dai tuoi pannelli solari alla rete."
+                            }
+                        },
+                        "learn_more": "Maggiori informazioni su come iniziare.",
+                        "sub": "Configura la quantità di energia che consumi dalla rete e, se produci energia, restituisci alla rete. Ciò consente a Home Assistant di tenere traccia del consumo energetico dell'intera casa.",
+                        "title": "Rete elettrica"
+                    },
+                    "solar": {
+                        "learn_more": "Maggiori informazioni su come iniziare.",
+                        "stat_predicted_production": "Previsione della tua produzione di energia solare",
+                        "stat_production": "La tua produzione di energia solare",
+                        "stat_return_to_grid": "Energia solare restituita alla rete",
+                        "sub": "Consenti a Home Assistant di monitorare i tuoi pannelli solari e di fornirti informazioni sulle loro prestazioni.",
+                        "title": "Pannelli solari"
+                    }
+                },
                 "entities": {
                     "caption": "Entità",
                     "description": "Gestisci le entità conosciute",
@@ -2142,14 +2183,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Cancella",
-                    "filtering_by": "Filtraggio per",
-                    "show": "Mostra"
-                },
-                "hassio": {
-                    "button": "Configura"
-                },
                 "header": "Configura Home Assistant",
                 "helpers": {
                     "caption": "Aiutanti",
@@ -2199,16 +2232,11 @@
                     "server": "server",
                     "setup_time": "Tempo di preparazione",
                     "source": "Sorgenti:",
-                    "system_health_error": "Il componente System Health non è caricato. Aggiungere 'system_health:' a configuration.yaml",
                     "system_health": {
                         "manage": "Gestisci",
                         "more_info": "maggiori informazioni"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "pagina integrazioni",
-                    "missing_zha": "Manca il pannello di configurazione ZHA? È stato spostato alla voce ZHA nella {integrations_page}.",
-                    "missing_zwave": "Manca il pannello di configurazione di Z-Wave? È stato spostato alla voce Z-Wave nella {integrations_page}."
+                    },
+                    "system_health_error": "Il componente System Health non è caricato. Aggiungere 'system_health:' a configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Aggiungi integrazione",
@@ -2223,8 +2251,6 @@
                         "depends_on_cloud": "Dipende dal cloud",
                         "device_unavailable": "Dispositivo non disponibile",
                         "devices": "{count} {count, plural, \none {dispositivo}\nother {dispositivi}\n}",
-                        "disable_error": "Abilitazione o disabilitazione dell'integrazione non riuscita",
-                        "disable_restart_confirm": "Riavvia Home Assistant per terminare la disabilitazione di questa integrazione",
                         "disable": {
                             "disable_confirm": "Sei sicuro di voler disabilitare questa voce di configurazione? I suoi dispositivi ed entità saranno disabilitati.",
                             "disabled": "Disabilitato",
@@ -2235,6 +2261,8 @@
                             },
                             "disabled_cause": "Disabilitato da {cause}"
                         },
+                        "disable_error": "Abilitazione o disabilitazione dell'integrazione non riuscita",
+                        "disable_restart_confirm": "Riavvia Home Assistant per terminare la disabilitazione di questa integrazione",
                         "disabled_polling": "Polling automatico per i dati aggiornati disabilitato",
                         "documentation": "Documentazione",
                         "enable_restart_confirm": "Riavvia Home Assistant per completare l'attivazione di questa integrazione",
@@ -2242,11 +2270,9 @@
                         "entity_unavailable": "Entità non disponibile",
                         "firmware": "Firmware: {version}",
                         "hub": "Connesso tramite",
-                        "logs": "registri",
                         "manuf": "da {manufacturer}",
                         "no_area": "Nessuna area",
                         "not_loaded": "Non caricato",
-                        "options": "Opzioni",
                         "provided_by_custom_integration": "Fornito da un'integrazione personalizzata",
                         "reload": "Ricarica",
                         "reload_confirm": "L'integrazione è stata ricaricata",
@@ -2278,7 +2304,11 @@
                             "open_site": "Apri sito Web"
                         },
                         "finish": "Finito",
-                        "loading_first_time": "Si prega di attendere durante l'installazione dell'integrazione",
+                        "loading": {
+                            "fallback_title": "l'integrazione",
+                            "loading_flow": "Attendi mentre {integration} viene configurato",
+                            "loading_step": "Caricamento del passaggio successivo per {integration}"
+                        },
                         "next": "Prossimo",
                         "not_all_required_fields": "Non tutti i campi obbligatori sono compilati.",
                         "not_loaded": "L'integrazione non può essere caricata, prova a riavviare Home Assistant.",
@@ -2295,7 +2325,6 @@
                     "details": "Dettagli dell'integrazione",
                     "disable": {
                         "disabled_integrations": "{number} disabilitate",
-                        "hide_disabled": "Nascondi integrazioni disabilitate",
                         "show": "Mostra",
                         "show_disabled": "Mostra integrazioni disabilitate"
                     },
@@ -2306,7 +2335,6 @@
                         "confirm_delete_ignore_title": "Smettere di ignorare {name}?",
                         "confirm_ignore": "Sei sicuro di non voler configurare questa integrazione? È possibile annullare questa operazione facendo clic su 'Mostra integrazioni ignorate' nel menu di overflow in alto a destra.",
                         "confirm_ignore_title": "Ignorare a rilevazione di {name}?",
-                        "hide_ignored": "Nascondi integrazioni ignorate",
                         "ignore": "Ignora",
                         "ignored": "Ignorato",
                         "show_ignored": "Mostra integrazioni ignorate",
@@ -2319,7 +2347,7 @@
                     "none": "Non hai ancora configurato niente",
                     "none_found": "Non sono state trovate integrazioni",
                     "none_found_detail": "Modifica i criteri di ricerca.",
-                    "note_about_integrations": "Non tutte le integrazioni possono ancora essere configurate tramite l'interfaccia utente.",
+                    "note_about_integrations": "Nessuna integrazione corrisponde alla ricerca, l'integrazione che si desidera configurare potrebbe non essere ancora disponibile per la configurazione tramite l'interfaccia utente.",
                     "note_about_website_reference": "Ulteriori informazioni sono disponibili su ",
                     "reconfigure": "Riconfigurare",
                     "rename_dialog": "Modifica il nome di questa voce di configurazione",
@@ -2426,7 +2454,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configura",
                     "description_listen": "Ascoltare un argomento",
                     "description_publish": "Pubblicare un pacchetto",
                     "listening_to": "Ascolto di",
@@ -2440,7 +2467,6 @@
                     "topic": "argomento"
                 },
                 "ozw": {
-                    "button": "Configura",
                     "common": {
                         "controller": "Controllore",
                         "instance": "Istanza",
@@ -2465,6 +2491,11 @@
                         "nodes": "Nodi",
                         "select_instance": "Seleziona istanza"
                     },
+                    "network": {
+                        "header": "Gestione della rete",
+                        "introduction": "Gestisci le funzioni a livello di rete.",
+                        "node_count": "{count} nodi"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Tutti i nodi sono stati interrogati.",
@@ -2485,10 +2516,9 @@
                         "starting": "In avvio",
                         "unknown": "Sconosciuto"
                     },
-                    "network": {
-                        "header": "Gestione della rete",
-                        "introduction": "Gestisci le funzioni a livello di rete.",
-                        "node_count": "{count} nodi"
+                    "node": {
+                        "button": "Dettagli del nodo",
+                        "not_found": "Nodo non trovato"
                     },
                     "node_config": {
                         "header": "Configurazione del nodo",
@@ -2518,10 +2548,6 @@
                         "versions": "Recupero di informazioni sulle versioni del firmware e della classe di comando",
                         "wakeup": "Configurazione del supporto per code di riattivazione e messaggi "
                     },
-                    "node": {
-                        "button": "Dettagli del nodo",
-                        "not_found": "Nodo non trovato"
-                    },
                     "nodes_table": {
                         "failed": "Fallito",
                         "id": "ID",
@@ -2664,10 +2690,12 @@
                         },
                         "save_script": "Salva script",
                         "sequence": "Sequenza",
-                        "sequence_sentence": "Sequenza delle azioni di questo Script."
+                        "sequence_sentence": "Sequenza delle azioni di questo Script.",
+                        "show_trace": "Mostra traccia"
                     },
                     "picker": {
                         "add_script": "Aggiungi script",
+                        "dev_script": "Script di debug",
                         "duplicate": "Duplica",
                         "duplicate_script": "Duplica script",
                         "edit_script": "Modifica script",
@@ -2703,7 +2731,7 @@
                             "input_number": "Input numerici",
                             "input_select": "Input di selezione",
                             "input_text": "Input testuali",
-                            "introduction": "Alcune parti di Home Assistant possono essere ricaricate senza richiedere un riavvio. Premendo su Ricarica si rimuoverà la loro Configurazione YAML attuale e si caricherà la versione aggiornata.",
+                            "introduction": "Alcune parti di Home Assistant possono essere ricaricate senza richiedere un riavvio. Premendo una delle opzioni seguenti si rimuoverà la loro attuale configurazione YAML e si caricherà quella nuova.",
                             "min_max": "Entità min/max",
                             "mqtt": "Entità MQTT configurate manualmente",
                             "person": "Persone",
@@ -2824,7 +2852,6 @@
                         "search_again": "Cerca di nuovo",
                         "spinner": "Ricerca di dispositivi ZHA Zigbee ..."
                     },
-                    "button": "Configura",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attributi del cluster selezionato",
                         "get_zigbee_attribute": "Ottieni l'attributo Zigbee",
@@ -2854,12 +2881,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Collegamenti",
-                        "update_button": "Aggiorna Configurazione",
-                        "zha_options": {
-                            "default_light_transition": "Tempo di transizione della luce predefinito (secondi)",
-                            "enable_identify_on_join": "Abilita la notifica di identificazione quando i dispositivi si collegano alla rete",
-                            "title": "Opzioni Globali"
-                        }
+                        "update_button": "Aggiorna Configurazione"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Configurazione completata",
@@ -2941,110 +2963,7 @@
                     "introduction": "Le Zone consentono di specificare determinate regioni sulla Terra. Quando una persona si trova all'interno di una Zona, nel suo stato apparirà il nome dalla Zona. Le Zone possono anche essere utilizzate come Attivazioni (o Trigger) o Condizioni all'interno delle impostazioni di una Automazione.",
                     "no_zones_created_yet": "Sembra che tu non abbia ancora creato nessuna zona."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Annulla inclusione",
-                        "controller_in_inclusion_mode": "Il tuo controller Z-Wave è ora in modalità inclusione.",
-                        "follow_device_instructions": "Segui le indicazioni fornite con il tuo dispositivo per attivare l'associazione sul dispositivo.",
-                        "inclusion_failed": "Impossibile aggiungere il nodo. Si prega di controllare i registri per ulteriori informazioni.",
-                        "inclusion_finished": "Il nodo è stato aggiunto.",
-                        "interview_failed": "L'interrogazione al dispositivo non è riuscita. Ulteriori informazioni potrebbero essere disponibili nei registri.",
-                        "interview_started": "Il dispositivo viene interrogato. Potrebbe volerci un po' di tempo.",
-                        "introduction": "Questa procedura ti guiderà nell'aggiunta di un nodo alla tua rete Z-Wave.",
-                        "secure_inclusion_warning": "I dispositivi protetti richiedono una larghezza di banda aggiuntiva; troppi dispositivi sicuri possono rallentare la tua rete Z-Wave. Si consiglia di utilizzare l'inclusione sicura solo per i dispositivi che lo richiedono, come serrature o apri porta da garage.",
-                        "start_inclusion": "Avvia inclusione",
-                        "start_secure_inclusion": "Avvia inclusione sicura",
-                        "title": "Aggiungi un Nodo Z-Wave",
-                        "use_secure_inclusion": "Usa l'inclusione sicura",
-                        "view_device": "Visualizza dispositivo"
-                    },
-                    "button": "Configura",
-                    "common": {
-                        "add_node": "Aggiungi Nodo",
-                        "close": "Chiudi",
-                        "home_id": "ID Home",
-                        "network": "Rete",
-                        "node_id": "ID Nodo",
-                        "reconfigure_server": "Riconfigurare il server",
-                        "remove_node": "Rimuovi Nodo"
-                    },
-                    "dashboard": {
-                        "driver_version": "Versione del driver",
-                        "dump_dead_nodes_text": "Alcuni dei tuoi nodi non hanno risposto e si presume che siano disattivi. Questi non verranno esportati completamente.",
-                        "dump_dead_nodes_title": "Alcuni dei tuoi nodi sono disattivi",
-                        "dump_debug": "Scarica una struttura della tua rete per diagnosticare i problemi",
-                        "dump_not_ready_confirm": "Scarica",
-                        "dump_not_ready_text": "Se crei un'esportazione mentre i nodi non sono tutti pronti, potresti perdere dati necessari. Dai alla tua rete un po' di tempo per interrogare tutti i nodi. Vuoi continuare con questa struttura di rete?",
-                        "dump_not_ready_title": "Non tutti i nodi sono ancora pronti",
-                        "header": "Gestisci la tua rete Z-Wave",
-                        "home_id": "ID Home",
-                        "introduction": "Gestisci la tua rete Z-Wave e i nodi Z-Wave",
-                        "nodes_ready": "Nodi pronti",
-                        "server_version": "Versione del server"
-                    },
-                    "device_info": {
-                        "device_config": "Configura il dispositivo",
-                        "node_ready": "Nodo pronto",
-                        "node_status": "Stato del Nodo",
-                        "zwave_info": "Informazioni Z-Wave"
-                    },
-                    "logs": {
-                        "log_level": "Livello di registro",
-                        "log_level_changed": "Livello di registro modificato in: {level}",
-                        "subscribed_to_logs": "Sottoscrizione al registro dei messaggi di Z-Wave JS ...",
-                        "title": "Registri Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "Registri",
-                        "network": "Rete"
-                    },
-                    "network_status": {
-                        "connected": "Connesso",
-                        "connecting": "In collegamento",
-                        "unknown": "Sconosciuto"
-                    },
-                    "node_config": {
-                        "attribution": "I parametri e le descrizioni di configurazione del dispositivo sono forniti da {device_database}",
-                        "battery_device_notice": "I dispositivi batteria devono essere attivi per aggiornare la loro configurazione. Fare riferimento al manuale del dispositivo per istruzioni su come riattivare il dispositivo.",
-                        "error_device_not_found": "Dispositivo non trovato",
-                        "header": "Configurazione del dispositivo Z-Wave",
-                        "introduction": "Gestire e regolare i parametri di configurazione specifici del dispositivo (nodo) per il dispositivo selezionato",
-                        "parameter_is_read_only": "Questo parametro è di sola lettura.",
-                        "set_param_accepted": "Il parametro è stato aggiornato.",
-                        "set_param_error": "Si è verificato un errore.",
-                        "set_param_queued": "La modifica del parametro è stata messa in coda e verrà aggiornata quando il dispositivo si riattiva.",
-                        "zwave_js_device_database": "Database dei dispositivi Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Attivo",
-                        "asleep": "Addormentato",
-                        "awake": "Sveglio",
-                        "dead": "Disattivo",
-                        "unknown": "Sconosciuto"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Sarà necessario riattivare i dispositivi alimentati a batteria prima di iniziare la nuova interrogazione. Fare riferimento al manuale del dispositivo per istruzioni su come riattivare il dispositivo.",
-                        "in_progress": "Il dispositivo viene interrogato. Potrebbe volerci un po' di tempo.",
-                        "interview_complete": "Interrogazione del dispositivo completata.",
-                        "interview_failed": "L'interrogazione al dispositivo non è riuscita. Ulteriori informazioni potrebbero essere disponibili nei registri.",
-                        "introduction": "Interroga nuovamente un dispositivo sulla tua rete Z-Wave. Usa questa funzione se il tuo dispositivo ha funzionalità mancanti o errate.",
-                        "run_in_background": "Puoi chiudere questa finestra di dialogo e l'interrogazione continuerà in background.",
-                        "start_reinterview": "Inizia una nuova interrogazione",
-                        "title": "Re-interroga un dispositivo Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Annulla esclusione",
-                        "controller_in_exclusion_mode": "Il tuo controller Z-Wave è ora in modalità di esclusione.",
-                        "exclusion_failed": "Impossibile rimuovere il nodo. Si prega di controllare i registri per ulteriori informazioni.",
-                        "exclusion_finished": "Il nodo {id} è stato rimosso dalla tua rete Z-Wave.",
-                        "follow_device_instructions": "Segui le indicazioni fornite con il tuo dispositivo per attivare l'esclusione sul dispositivo.",
-                        "introduction": "Rimuovi un nodo dalla tua rete Z-Wave e rimuovi il dispositivo e le entità associati da Home Assistant.",
-                        "start_exclusion": "Avvia esclusione",
-                        "title": "Rimuovi un nodo Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Configura",
                     "common": {
                         "index": "Indice",
                         "instance": "Esempio",
@@ -3133,6 +3052,144 @@
                     "values": {
                         "header": "Valori del nodo"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Annulla inclusione",
+                        "controller_in_inclusion_mode": "Il tuo controller Z-Wave è ora in modalità inclusione.",
+                        "follow_device_instructions": "Segui le indicazioni fornite con il tuo dispositivo per attivare l'associazione sul dispositivo.",
+                        "inclusion_failed": "Impossibile aggiungere il nodo. Si prega di controllare i registri per ulteriori informazioni.",
+                        "inclusion_finished": "Il nodo è stato aggiunto.",
+                        "interview_failed": "L'interrogazione al dispositivo non è riuscita. Ulteriori informazioni potrebbero essere disponibili nei registri.",
+                        "interview_started": "Il dispositivo viene interrogato. Potrebbe volerci un po' di tempo.",
+                        "introduction": "Questa procedura ti guiderà nell'aggiunta di un nodo alla tua rete Z-Wave.",
+                        "secure_inclusion_warning": "I dispositivi protetti richiedono una larghezza di banda aggiuntiva; troppi dispositivi sicuri possono rallentare la tua rete Z-Wave. Si consiglia di utilizzare l'inclusione sicura solo per i dispositivi che lo richiedono, come serrature o apri porta da garage.",
+                        "start_inclusion": "Avvia inclusione",
+                        "start_secure_inclusion": "Avvia inclusione sicura",
+                        "title": "Aggiungi un Nodo Z-Wave",
+                        "use_secure_inclusion": "Usa l'inclusione sicura",
+                        "view_device": "Visualizza dispositivo"
+                    },
+                    "common": {
+                        "add_node": "Aggiungi Nodo",
+                        "close": "Chiudi",
+                        "heal_network": "Ripara la rete",
+                        "home_id": "ID Home",
+                        "network": "Rete",
+                        "node_id": "ID Nodo",
+                        "reconfigure_server": "Riconfigurare il server",
+                        "remove_node": "Rimuovi Nodo",
+                        "source": "Fonte"
+                    },
+                    "dashboard": {
+                        "driver_version": "Versione del driver",
+                        "dump_dead_nodes_text": "Alcuni dei tuoi nodi non hanno risposto e si presume che siano disattivi. Questi non verranno esportati completamente.",
+                        "dump_dead_nodes_title": "Alcuni dei tuoi nodi sono disattivi",
+                        "dump_debug": "Scarica una struttura della tua rete per diagnosticare i problemi",
+                        "dump_not_ready_confirm": "Scarica",
+                        "dump_not_ready_text": "Se crei un'esportazione mentre i nodi non sono tutti pronti, potresti perdere dati necessari. Dai alla tua rete un po' di tempo per interrogare tutti i nodi. Vuoi continuare con questa struttura di rete?",
+                        "dump_not_ready_title": "Non tutti i nodi sono ancora pronti",
+                        "header": "Gestisci la tua rete Z-Wave",
+                        "home_id": "ID Home",
+                        "introduction": "Gestisci la tua rete Z-Wave e i nodi Z-Wave",
+                        "nodes_ready": "Nodi pronti",
+                        "server_version": "Versione del server"
+                    },
+                    "device_info": {
+                        "device_config": "Configura il dispositivo",
+                        "heal_node": "Ripristina Nodo",
+                        "node_ready": "Nodo pronto",
+                        "node_status": "Stato del Nodo",
+                        "reinterview_device": "Re-interroga il dispositivo",
+                        "remove_failed": "Rimuovi dispositivo guasto",
+                        "zwave_info": "Informazioni Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "La riparazione della rete è stata annullata.",
+                        "healing_complete": "La riparazione della rete è completa.",
+                        "healing_failed": "Riparazione fallita. Ulteriori informazioni potrebbero essere disponibili nei registri.",
+                        "in_progress": "La riparazione della rete è in corso. Questo richiederà del tempo.",
+                        "introduction": "Avvia una riparazione di rete sulla tua rete Z-Wave. Una riparazione della rete farà sì che tutti i dispositivi ricalcolino i loro percorsi verso il controller ed è consigliata se hai spostato di recente i dispositivi o il controller.",
+                        "run_in_background": "Puoi chiudere questa finestra di dialogo e la riparazione della rete continuerà in sottofondo.",
+                        "start_heal": "Inizia la riparazione",
+                        "stop_heal": "Ferma la riparazione",
+                        "title": "Ripara la tua rete Z-Wave",
+                        "traffic_warning": "Il processo di riparazione genera una grande quantità di traffico sulla rete Z-Wave. Ciò potrebbe far sì che i dispositivi rispondano lentamente (o non rispondano affatto) mentre è in corso la riparazione."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} è stato ripristinato.",
+                        "healing_failed": "Impossibile ripristinare {device}.",
+                        "healing_failed_check_logs": "Ulteriori informazioni potrebbero essere disponibili nei registri.",
+                        "in_progress": "il ripristino di {device} è in corso.",
+                        "introduction": "Indica a {device} di aggiornare i suoi percorsi al controller. Questo può aiutare con problemi di comunicazione se hai spostato di recente il dispositivo o il controller.",
+                        "network_heal_in_progress": "È già in corso un ripristino della rete Z-Wave. Attendi che finisca prima di ripristinare un singolo dispositivo.",
+                        "start_heal": "Ripristina il dispositivo",
+                        "title": "Ripristina un dispositivo Z-Wave",
+                        "traffic_warning": "Il processo di riparazione genera una grande quantità di traffico sulla rete Z-Wave. Ciò potrebbe far sì che i dispositivi rispondano lentamente (o non rispondano affatto) mentre è in corso la riparazione."
+                    },
+                    "logs": {
+                        "log_level": "Livello di registro",
+                        "log_level_changed": "Livello di registro modificato in: {level}",
+                        "subscribed_to_logs": "Sottoscrizione al registro dei messaggi di Z-Wave JS ...",
+                        "title": "Registri Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Registri",
+                        "network": "Rete"
+                    },
+                    "network_status": {
+                        "connected": "Connesso",
+                        "connecting": "In collegamento",
+                        "unknown": "Sconosciuto"
+                    },
+                    "node_config": {
+                        "attribution": "I parametri e le descrizioni di configurazione del dispositivo sono forniti da {device_database}",
+                        "battery_device_notice": "I dispositivi batteria devono essere attivi per aggiornare la loro configurazione. Fare riferimento al manuale del dispositivo per istruzioni su come riattivare il dispositivo.",
+                        "error_device_not_found": "Dispositivo non trovato",
+                        "header": "Configurazione del dispositivo Z-Wave",
+                        "introduction": "Gestire e regolare i parametri di configurazione specifici del dispositivo (nodo) per il dispositivo selezionato",
+                        "parameter": "Parametro",
+                        "parameter_is_read_only": "Questo parametro è di sola lettura.",
+                        "set_param_accepted": "Il parametro è stato aggiornato.",
+                        "set_param_error": "Si è verificato un errore.",
+                        "set_param_queued": "La modifica del parametro è stata messa in coda e verrà aggiornata quando il dispositivo si riattiva.",
+                        "zwave_js_device_database": "Database dei dispositivi Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Attivo",
+                        "asleep": "Addormentato",
+                        "awake": "Sveglio",
+                        "dead": "Disattivo",
+                        "unknown": "Sconosciuto"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Sarà necessario riattivare i dispositivi alimentati a batteria prima di iniziare la nuova interrogazione. Fare riferimento al manuale del dispositivo per istruzioni su come riattivare il dispositivo.",
+                        "in_progress": "Il dispositivo viene interrogato. Potrebbe volerci un po' di tempo.",
+                        "interview_complete": "Interrogazione del dispositivo completata.",
+                        "interview_failed": "L'interrogazione al dispositivo non è riuscita. Ulteriori informazioni potrebbero essere disponibili nei registri.",
+                        "introduction": "Interroga nuovamente un dispositivo sulla tua rete Z-Wave. Usa questa funzione se il tuo dispositivo ha funzionalità mancanti o errate.",
+                        "run_in_background": "Puoi chiudere questa finestra di dialogo e l'interrogazione continuerà in background.",
+                        "start_reinterview": "Inizia una nuova interrogazione",
+                        "title": "Re-interroga un dispositivo Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "La rimozione del dispositivo è in corso.",
+                        "introduction": "Rimuovi un dispositivo guasto dalla tua rete Z-Wave. Usalo se non sei in grado di escludere normalmente un dispositivo perché è rotto.",
+                        "removal_failed": "Non è stato possibile rimuovere il dispositivo dalla rete Z-Wave.",
+                        "removal_finished": "Il nodo {id} è stato rimosso dalla tua rete Z-Wave.",
+                        "remove_device": "Rimuovi dispositivo",
+                        "title": "Rimuovere un dispositivo Z-Wave guasto"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Annulla esclusione",
+                        "controller_in_exclusion_mode": "Il tuo controller Z-Wave è ora in modalità di esclusione.",
+                        "exclusion_failed": "Impossibile rimuovere il nodo. Si prega di controllare i registri per ulteriori informazioni.",
+                        "exclusion_finished": "Il nodo {id} è stato rimosso dalla tua rete Z-Wave.",
+                        "follow_device_instructions": "Segui le indicazioni fornite con il tuo dispositivo per attivare l'esclusione sul dispositivo.",
+                        "introduction": "Rimuovi un nodo dalla tua rete Z-Wave e rimuovi il dispositivo e le entità associati da Home Assistant.",
+                        "start_exclusion": "Avvia esclusione",
+                        "title": "Rimuovi un nodo Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3215,31 +3272,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Torna indietro",
-                "supervisor": {
-                    "ask": "Chiedere aiuto",
-                    "observer": "Controlla l'Observer",
-                    "reboot": "Prova a riavviare l'host",
-                    "system_health": "Controlla l'integrità del sistema",
-                    "title": "Impossibile caricare il pannello Supervisor!",
-                    "wait": "Se hai appena avviato, assicurati di aver dato al Supervisor abbastanza tempo per iniziare."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Settimana scorsa",
-                    "this_week": "Questa settimana",
-                    "today": "Oggi",
-                    "yesterday": "Ieri"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Settimana scorsa",
-                    "this_week": "Questa settimana",
-                    "today": "Oggi",
-                    "yesterday": "Ieri"
+            "energy": {
+                "charts": {
+                    "by_device": "Consumo per dispositivo",
+                    "solar": "Solare",
+                    "stat_house_energy_meter": "Consumo totale di energia"
+                },
+                "setup": {
+                    "back": "Indietro",
+                    "done": "Mostrami la mia plancia energetica!",
+                    "next": "Avanti"
                 }
             },
             "lovelace": {
@@ -3353,7 +3395,6 @@
                         "entities": {
                             "description": "La scheda Entità è il tipo di scheda più comune. Raggruppa gli elementi in elenchi.",
                             "edit_special_row": "Visualizza i dettagli di questa riga facendo clic sul pulsante di modifica",
-                            "entity_row_editor": "Editor di riga dell'entità",
                             "entity_row": {
                                 "attribute": "Attributo",
                                 "button": "Pulsante",
@@ -3365,6 +3406,7 @@
                                 "section": "Sezione",
                                 "weblink": "Collegamento Web"
                             },
+                            "entity_row_editor": "Editor di riga dell'entità",
                             "name": "Entità",
                             "secondary_info_values": {
                                 "brightness": "Luminosità",
@@ -3391,6 +3433,7 @@
                         "gauge": {
                             "description": "La scheda Indicatore è una scheda di base che consente di visualizzare i dati di un sensore.",
                             "name": "Indicatore",
+                            "needle_gauge": "Visualizza come indicatore a lancetta?",
                             "severity": {
                                 "define": "Definire l'intensità?",
                                 "green": "Verde",
@@ -3403,6 +3446,7 @@
                             "attribute": "Attributo",
                             "camera_image": "Entità Fotocamera",
                             "camera_view": "Vista fotocamera",
+                            "days_to_show": "Giorni da mostrare",
                             "double_tap_action": "Azione doppio tocco",
                             "entities": "Molte Entità",
                             "entity": "Singola Entità",
@@ -3516,6 +3560,10 @@
                             "integration_not_loaded": "Questa carta richiede l'integrazione \"shopping_list\" per essere configurata.",
                             "name": "Lista della spesa"
                         },
+                        "statistics-graph": {
+                            "description": "La scheda Grafico Statistiche consente di visualizzare un grafico delle statistiche per ciascuna delle entità elencate.",
+                            "name": "Grafico Statistiche"
+                        },
                         "thermostat": {
                             "description": "La scheda Termostato fornisce il controllo della tua entità climatica, consentendo di modificare la temperatura e la modalità dell'entità.",
                             "name": "Termostato"
@@ -3585,6 +3633,12 @@
                         "tab_badges": "Distintivi",
                         "tab_settings": "Impostazioni",
                         "tab_visibility": "Visibilità",
+                        "type": "Tipo di visualizzazione",
+                        "types": {
+                            "masonry": "Muratura (predefinito)",
+                            "panel": "Pannello (1 scheda)",
+                            "sidebar": "Barra laterale"
+                        },
                         "visibility": {
                             "select_users": "Selezionare quali utenti dovrebbero vedere questa vista nella navigazione"
                         }
@@ -3639,7 +3693,6 @@
                         "unsaved_changes": "Modifiche non salvate"
                     },
                     "save_config": {
-                        "cancel": "Rinuncia",
                         "close": "Chiudi",
                         "empty_config": "Iniziare con una plancia vuota",
                         "header": "Prendi il controllo della tua interfaccia utente di Lovelace",
@@ -3668,8 +3721,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Questo renderizza la prima scheda a tutta larghezza. Le altre schede in questa vista e i badge non verranno renderizzati.",
-                            "title": "Modalità pannello?",
                             "warning_multiple_cards": "Questa vista contiene più di una scheda, ma una vista a pannello può mostrare solo una scheda."
                         }
                     }
@@ -3872,8 +3923,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Avanti",
-                    "intro": "Condividi l'analisi dalla tua istanza. Questi dati saranno disponibili pubblicamente all'indirizzo {link}"
+                    "finish": "Avanti"
                 },
                 "core-config": {
                     "button_detect": "Rileva",
@@ -3897,10 +3947,8 @@
                     "confirm_password": "Conferma la password dell'istantanea",
                     "description": "In alternativa è possibile ripristinare da un'istantanea precedente.",
                     "folders": "Cartelle",
-                    "full_snapshot": "Istantanea completa",
                     "hide_log": "Nascondi il registro completo",
                     "in_progress": "Ripristino in corso",
-                    "partial_snapshot": "Istantanea parziale",
                     "password": "Password dell'istantanea",
                     "password_protection": "Protezione con password",
                     "select_type": "Seleziona cosa ripristinare",
@@ -3982,6 +4030,12 @@
                     "prompt_copy_token": "Copia il tuo token di accesso. Non verrà più mostrato.",
                     "prompt_name": "Assegnare un nome al token"
                 },
+                "mfa": {
+                    "confirm_disable": "Sei sicuro di voler disabilitare {name} ?",
+                    "disable": "Disattivare",
+                    "enable": "Abilita",
+                    "header": "Codice di autenticazione a più fattori"
+                },
                 "mfa_setup": {
                     "close": "Chiudi",
                     "step_done": "Installazione completata per {step}",
@@ -3989,12 +4043,6 @@
                     "title_aborted": "Interrotto",
                     "title_success": "Completata con Successo"
                 },
-                "mfa": {
-                    "confirm_disable": "Sei sicuro di voler disabilitare {name} ?",
-                    "disable": "Disattivare",
-                    "enable": "Abilita",
-                    "header": "Codice di autenticazione a più fattori"
-                },
                 "number_format": {
                     "description": "Scegli come vengono formattati i numeri.",
                     "dropdown_label": "Formato numero",
diff --git a/translations/frontend/ja.json b/translations/frontend/ja.json
index ce80408975..3e97742e6d 100644
--- a/translations/frontend/ja.json
+++ b/translations/frontend/ja.json
@@ -17,6 +17,7 @@
         "calendar": "カレンダー",
         "config": "設定",
         "developer_tools": "開発者ツール",
+        "energy": "エネルギー",
         "history": "履歴",
         "logbook": "ログブック",
         "mailbox": "メールボックス",
@@ -26,6 +27,14 @@
         "shopping_list": "買い物リスト",
         "states": "状態"
     },
+    "state": {
+        "default": {
+            "off": "オフ",
+            "on": "オン",
+            "unavailable": "利用不可",
+            "unknown": "不明"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -88,14 +97,6 @@
             "not_home": "外出"
         }
     },
-    "state": {
-        "default": {
-            "off": "オフ",
-            "on": "オン",
-            "unavailable": "利用不可",
-            "unknown": "不明"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -261,6 +262,26 @@
                 "not_installed": "アドオンがインストールされていません"
             }
         },
+        "backup": {
+            "addons": "アドオン",
+            "confirm_password": "スナップショットパスワードの確認",
+            "could_not_create": "スナップショットを作成できませんでした。",
+            "create": "作成",
+            "create_blocked_not_running": "システムが {state} 状態であるため、スナップショットの作成は現在できません。",
+            "created": "作成",
+            "delete_backup_confirm": "削除",
+            "delete_selected": "選択したスナップショットの削除",
+            "enter_password": "パスワードを入力してください。",
+            "failed_to_delete": "削除できませんでした",
+            "folders": "フォルダー",
+            "name": "名前",
+            "password": "パスワード",
+            "password_protection": "パスワード保護",
+            "passwords_not_matching": "パスワードが一致しません",
+            "select_type": "復元する対象を選択する",
+            "selected": "{number}が選択されました",
+            "type": "タイプ"
+        },
         "common": {
             "cancel": "キャンセル",
             "close": "閉じる",
@@ -360,9 +381,6 @@
                 "text": "変更を保存してアドオンを再起動しますか？"
             },
             "update": {
-                "create_snapshot": "更新前に{name}のスナップショットを作成する",
-                "snapshot": "スナップショット",
-                "snapshotting": "{name} のスナップショットの作成",
                 "updating": "{name}をバージョン{version}に更新しています"
             }
         },
@@ -377,48 +395,9 @@
         },
         "panel": {
             "dashboard": "ダッシュボード",
-            "snapshots": "スナップショット",
             "store": "アドオンストア",
             "system": "システム"
         },
-        "snapshot": {
-            "addons": "アドオン",
-            "available_snapshots": "利用可能なスナップショット",
-            "confirm_password": "スナップショットパスワードの確認",
-            "could_not_create": "スナップショットを作成できませんでした。",
-            "create": "作成",
-            "create_blocked_not_running": "システムが {state} 状態であるため、スナップショットの作成は現在できません。",
-            "create_snapshot": "スナップショットの作成",
-            "created": "作成",
-            "delete_selected": "選択したスナップショットの削除",
-            "delete_snapshot_confirm": "削除",
-            "delete_snapshot_text": "{number}を削除しますか？{number, plural,\n  one {snapshot}\n  other {snapshots}\n}?",
-            "delete_snapshot_title": "スナップショットの削除",
-            "description": "スナップショットでは、Home Assistantインスタンスのすべてのデータを簡単にバックアップして復元することができます。",
-            "enter_password": "パスワードを入力してください。",
-            "failed_to_delete": "削除できませんでした",
-            "folder": {
-                "addons/local": "ローカルアドオン",
-                "homeassistant": "HomeAssistantの設定",
-                "media": "メディア",
-                "share": "共有",
-                "ssl": "SSL"
-            },
-            "folders": "フォルダー",
-            "full_snapshot": "フルスナップショット",
-            "name": "名前",
-            "no_snapshots": "スナップショットはまだありません。",
-            "partial_snapshot": "部分的なスナップショット",
-            "password": "パスワード",
-            "password_protected": "パスワードで保護されています",
-            "password_protection": "パスワード保護",
-            "passwords_not_matching": "パスワードが一致しません",
-            "security": "セキュリティ",
-            "select_type": "復元する対象を選択する",
-            "selected": "{number}が選択されました",
-            "type": "タイプ",
-            "upload_snapshot": "スナップショットのアップロード"
-        },
         "store": {
             "missing_addons": "アドオンがありませんか？ユーザープロファイルページで詳細モードを有効にする",
             "no_results_found": "{repository}に結果が見つかりません。",
@@ -516,7 +495,9 @@
         },
         "card": {
             "alarm_control_panel": {
+                "arm_away": "外出する",
                 "arm_custom_bypass": "カスタム バイパス",
+                "arm_home": "ホームに戻る",
                 "arm_night": "夜",
                 "clear_code": "削除",
                 "code": "パスワード",
@@ -752,6 +733,12 @@
             },
             "date-range-picker": {
                 "end_date": "終了日",
+                "ranges": {
+                    "last_week": "先週",
+                    "this_week": "今週",
+                    "today": "今日",
+                    "yesterday": "昨日"
+                },
                 "select": "選択",
                 "start_date": "開始日"
             },
@@ -796,9 +783,9 @@
                     "set": "セット",
                     "turned_off": "オフになりました",
                     "turned_on": "オンになりました",
-                    "was_at_home": "在宅中",
+                    "was_at_home": "帰宅しました",
                     "was_at_state": "{state}でした",
-                    "was_away": "外出中",
+                    "was_away": "外出しました",
                     "was_closed": "閉鎖されました",
                     "was_connected": "接続されました",
                     "was_disconnected": "切断されました",
@@ -843,10 +830,10 @@
                 "documentation": "ドキュメント",
                 "learn_adding_local_media": "メディアの追加の詳細については、{ドキュメント}を参照してください。",
                 "local_media_files": "ビデオ、オーディオ、画像ファイルをメディアディレクトリに配置して、ブラウザやサポートされているメディアプレーヤーで参照して再生できるようにします。",
+                "media-player-browser": "メディアプレーヤーブラウザ",
                 "media_browsing_error": "メディア参照エラー",
                 "media_not_supported": "ブラウザ メディア プレーヤーはこの種類のメディアをサポートしていません",
                 "media_player": "メディアプレーヤー",
-                "media-player-browser": "メディアプレーヤーブラウザ",
                 "no_items": "アイテムなし",
                 "no_local_media_found": "ローカルメディアが見つかりません",
                 "no_media_folder": "メディアディレクトリをまだ作成していないようです。",
@@ -916,6 +903,23 @@
             "service-picker": {
                 "service": "サービス"
             },
+            "statistic-picker": {
+                "learn_more": "統計の詳細",
+                "missing_entity": "自分のエンティティが一覧に表示されないのはなぜですか?",
+                "no_match": "一致する統計が見つかりません",
+                "no_statistics": "統計がありません",
+                "statistic": "統計"
+            },
+            "statistics_charts": {
+                "loading_statistics": "統計を読み込んでいます...",
+                "no_statistics_found": "統計情報が見つかりません。",
+                "statistic_types": {
+                    "max": "最大",
+                    "mean": "平均",
+                    "min": "分",
+                    "sum": "合計"
+                }
+            },
             "target-picker": {
                 "add_area_id": "エリアを選択",
                 "add_device_id": "デバイスを選択",
@@ -1104,6 +1108,10 @@
                 "form": {
                     "header": "オプション"
                 },
+                "loading": {
+                    "loading_flow": "{integration}オプションが初期化されるまでお待ちください",
+                    "loading_step": "{integration}次のステップをロードする"
+                },
                 "success": {
                     "description": "オプションを保存しました。"
                 }
@@ -1117,13 +1125,13 @@
                         "core": "一般",
                         "customize": "カスタマイズ",
                         "devices": "デバイス",
+                        "energy": "エネルギー",
                         "entities": "エンティティ",
                         "helpers": "ヘルパー",
                         "info": "詳細",
                         "integrations": "インテグレーション",
                         "logs": "ログ",
                         "lovelace": "Lovelaceダッシュボード",
-                        "navigate_to": "{panel}に移動します",
                         "person": "人々",
                         "scene": "シーン",
                         "script": "スクリプト",
@@ -1279,12 +1287,12 @@
         "notification_toast": {
             "connection_lost": "接続が切れました。再接続中...",
             "dismiss": "閉じる",
-            "integration_starting": "{integration}の開始、完了するまですべてが利用できるわけではありません。",
+            "integration_starting": "{integration}の開始、完了するまで一部の機能は利用できません。",
             "service_call_failed": "サービス{service}の呼び出しに失敗しました。",
             "started": "ホームアシスタントが開始されました！",
             "starting": "Home Assistantが起動中です。全て利用可能なるまでもうしばらくお待ち下さい。",
             "triggered": "トリガーしました {name}",
-            "wrapping_up_startup": "起動開始、起動完了するまですべてが利用できるわけではありません。"
+            "wrapping_up_startup": "起動の最終処理中、完了するまで一部の機能は利用できません。"
         },
         "panel": {
             "config": {
@@ -1352,7 +1360,6 @@
                             "introduction": "アクションは、オートメーションがトリガーされたときにHome Assistantが実行するものです。\n\n [アクションの詳細]（https://home-assistant.io/docs/automation/action/）",
                             "learn_more": "アクションの詳細",
                             "name": "アクション",
-                            "type_select": "アクションの種類",
                             "type": {
                                 "choose": {
                                     "add_option": "オプションを追加",
@@ -1393,7 +1400,6 @@
                                 "repeat": {
                                     "label": "繰り返す",
                                     "sequence": "アクション",
-                                    "type_select": "繰り返しのタイプ",
                                     "type": {
                                         "count": {
                                             "label": "カウント"
@@ -1406,7 +1412,8 @@
                                             "conditions": "条件",
                                             "label": "しばらくの間"
                                         }
-                                    }
+                                    },
+                                    "type_select": "繰り返しのタイプ"
                                 },
                                 "scene": {
                                     "label": "シーンをアクティブにする"
@@ -1426,6 +1433,7 @@
                                     "wait_template": "待機テンプレート"
                                 }
                             },
+                            "type_select": "アクションの種類",
                             "unsupported_action": "未サポートのアクション：{action}"
                         },
                         "alias": "名前",
@@ -1444,7 +1452,6 @@
                             "introduction": "条件はオプションであり、すべての条件が満たされない限り、それ以上の実行を防ぎます。",
                             "learn_more": "条件の詳細",
                             "name": "条件",
-                            "type_select": "条件の種類",
                             "type": {
                                 "and": {
                                     "label": "AND"
@@ -1505,12 +1512,18 @@
                                         "wed": "水曜日"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "トリガーID",
+                                    "label": "トリガー",
+                                    "no_triggers": "利用可能なトリガーはありません。"
+                                },
                                 "zone": {
                                     "entity": "場所に対応するエンティティ",
                                     "label": "ゾーン",
                                     "zone": "ゾーン"
                                 }
                             },
+                            "type_select": "条件の種類",
                             "unsupported_condition": "未サポートの条件：{condition}"
                         },
                         "copy_to_clipboard": "クリップボードにコピー",
@@ -1548,10 +1561,10 @@
                             "delete_confirm": "本当に削除しますか？",
                             "duplicate": "複製",
                             "header": "トリガー",
+                            "id": "トリガーID（トリガー条件で使用）",
                             "introduction": "トリガーはオートメーションルールの処理を開始させます。同じルールに対して複数のトリガーを指定することが可能です。トリガーが開始されると、Home Assistantは条件があれば確認し、アクションを呼び出します。\n\n[トリガーについて](https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "トリガーの詳細",
                             "name": "トリガー",
-                            "type_select": "トリガーの種類",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1564,7 +1577,7 @@
                                     "trigger": "トリガー"
                                 },
                                 "event": {
-                                    "context_user_pick": "ユーザーを追加",
+                                    "context_user_pick": "ユーザーを選択",
                                     "context_user_picked": "ユーザー起動イベント",
                                     "context_users": "トリガーされるイベントの制限",
                                     "event_data": "イベントのデータ",
@@ -1617,18 +1630,18 @@
                                     "label": "テンプレート",
                                     "value_template": "バリューテンプレート"
                                 },
-                                "time_pattern": {
-                                    "hours": "時間",
-                                    "label": "タイムパターン",
-                                    "minutes": "分",
-                                    "seconds": "秒"
-                                },
                                 "time": {
                                     "at": "時期",
                                     "label": "時刻",
                                     "type_input": "日付/時刻ヘルパーの値",
                                     "type_value": "定刻"
                                 },
+                                "time_pattern": {
+                                    "hours": "時間",
+                                    "label": "タイムパターン",
+                                    "minutes": "分",
+                                    "seconds": "秒"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1642,6 +1655,7 @@
                                     "zone": "ゾーン"
                                 }
                             },
+                            "type_select": "トリガーの種類",
                             "unsupported_platform": "サポートされていないプラットフォーム： {platform}"
                         },
                         "unsaved_confirm": "未保存の変更があります。本当に出て行きますか？"
@@ -1651,7 +1665,7 @@
                         "delete_automation": "オートメーションを削除",
                         "delete_confirm": "このオートメーションを削除してもよろしいですか？",
                         "dev_automation": "デバッグの自動化",
-                        "dev_only_editable": "automations.yaml で定義されたオートメーションのみがデバッグ可能です。",
+                        "dev_only_editable": "unique ID が定義されたオートメーションのみがデバッグ可能です。",
                         "duplicate": "複製",
                         "duplicate_automation": "オートメーションを複製",
                         "edit_automation": "オートメーションを編集",
@@ -1692,10 +1706,10 @@
                         "import_btn": "設計図をインポートする",
                         "import_header": "インポート{name} （ {domain} ）",
                         "import_introduction_link": "他のユーザーの設計図をGithubと{community_link}からインポートできます。以下に設計図のURLを入力します。",
-                        "importing": "設計図をインポートしています...",
+                        "importing": "設計図を読み込んでいます...",
                         "raw_blueprint": "設計図コンテンツ",
                         "save_btn": "設計図の保存",
-                        "saving": "設計図を保存しています...",
+                        "saving": "設計図をインポートしています...",
                         "unsupported_blueprint": "この設計図はサポートされていません",
                         "url": "設計図のURL"
                     },
@@ -1804,9 +1818,9 @@
                             "loading": "読み込み中...",
                             "manage": "管理",
                             "no_hooks_yet": "まだwebhookがないようです。はじめに",
+                            "no_hooks_yet2": "または作成することによって",
                             "no_hooks_yet_link_automation": "Webhookオートメーション",
                             "no_hooks_yet_link_integration": "Webhook ベースのインテグレーション",
-                            "no_hooks_yet2": "または作成することによって",
                             "title": "ウェブフック"
                         }
                     },
@@ -1921,41 +1935,13 @@
                     "description": "ホームの場所、タイムゾーン、単位など一般的な設定",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "この機能を有効にする前に、アナリティクスのドキュメントページ{link}をご覧になり、何を送信するのか、どのように保存されるのかをご確認ください。",
-                                "header": "アナリティクス",
-                                "instance_id": "インスタンス ID: {huuid}",
-                                "introduction": "インスタンスからの分析を共有します。 {link}で公開されます",
-                                "learn_more": "データの処理方法",
-                                "needs_base": "このオプションを有効にするには、ベースアナリティクスを有効にする必要があります。",
-                                "preference": {
-                                    "base": {
-                                        "description": "これには、インスタンスID、バージョン、インストールタイプが含まれます。",
-                                        "title": "ベーシック・アナリティクス"
-                                    },
-                                    "diagnostics": {
-                                        "description": "クラッシュ レポートと診断情報を共有する",
-                                        "title": "診断"
-                                    },
-                                    "statistics": {
-                                        "description": "これには、インストールされている要素の数が含まれます。完全なリストは、ドキュメントを参照してください。",
-                                        "title": "使用統計"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "これには、インテグレーション\nやアドオンの名前と機能が含まれます。",
-                                        "title": "使用したインテグレーションやアドオン"
-                                    },
-                                    "usage": {
-                                        "description": "これには、インテグレーションの名前が含まれます",
-                                        "title": "使用されるインテグレーション"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "通貨",
                                 "edit_requires_storage": "設定がconfiguration.yamlに保存されているため、エディターが無効になっています。",
                                 "elevation": "高度",
                                 "elevation_meters": "メートル",
                                 "external_url": "外部 URL",
+                                "find_currency_value": "自分の価値を見つける",
                                 "imperial_example": "華氏、ポンド",
                                 "internal_url": "内部 URL",
                                 "latitude": "緯度",
@@ -2084,6 +2070,63 @@
                     "update": "更新",
                     "update_device_error": "デバイスの更新に失敗しました"
                 },
+                "energy": {
+                    "caption": "エネルギー",
+                    "description": "エネルギーの生産と消費を監視する",
+                    "device_consumption": {
+                        "add_stat": "エネルギーを追跡するエンティティを選択します",
+                        "dialog": {
+                            "selected_stat_intro": "デバイスのエネルギー使用量を表すエンティティを選択します。"
+                        },
+                        "learn_more": "詳細はこちらをご覧ください。",
+                        "selected_stat": "エネルギーの追跡",
+                        "sub": "個々の機器のエネルギー使用量を追跡することで、Home Assistantは機器ごとのエネルギー使用量を把握することができます。",
+                        "title": "個々のデバイス"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "現在の価格のエンティティを使用する",
+                                "cost_entity_input": "現在の価格のエンティティ",
+                                "cost_number": "静的価格を使用する",
+                                "cost_number_input": "kWh あたりの価格",
+                                "cost_number_suffix": "{currency} / kWh",
+                                "cost_para": "HomeAssistantが消費エネルギーのコストを追跡する方法を選択します。",
+                                "cost_stat": "総コストを追跡するエンティティを使用する",
+                                "cost_stat_input": "総コストエンティティ",
+                                "energy_stat": "消費エネルギー (kWh)",
+                                "header": "グリッド消費の設定",
+                                "no_cost": "コストを追跡しない",
+                                "paragraph": "グリッド消費はエネルギーグリッドから家庭に流れるエネルギーです。"
+                            },
+                            "to": {
+                                "cost_entity": "現在のレートのエンティティを使用",
+                                "cost_entity_input": "現在のレートを持つエンティティ",
+                                "cost_number": "固定レートを使用する",
+                                "cost_number_input": "1kWhあたりの料金",
+                                "cost_number_suffix": "{currency} / kWh",
+                                "cost_para": "エネルギーをグリッドに戻すと、お金を取り戻すことができますか？",
+                                "cost_stat": "受け取った合計金額を追跡するエンティティを使用する",
+                                "cost_stat_input": "報酬エンティティの合計",
+                                "energy_stat": "グリッドに戻されたエネルギー (kWh)",
+                                "header": "グリッド生産の設定",
+                                "no_cost": "私はお金を取り戻さない",
+                                "paragraph": "グリッドの生産は、ソーラーパネルからグリッドに流れるエネルギーです。"
+                            }
+                        },
+                        "learn_more": "詳細はこちらをご覧ください。",
+                        "sub": "グリッドから消費するエネルギー量を設定し、エネルギーを生成する場合はグリッドに戻ります。これにより、ホームアシスタントは、あなたの全体の家庭のエネルギー使用量を追跡することができます。",
+                        "title": "電力網"
+                    },
+                    "solar": {
+                        "learn_more": "詳細はこちらをご覧ください。",
+                        "stat_predicted_production": "太陽エネルギー生産の予測",
+                        "stat_production": "あなたの太陽光発電",
+                        "stat_return_to_grid": "太陽エネルギーをグリッドに戻す",
+                        "sub": "ホームアシスタントがソーラーパネルを監視し、その性能を把握することができます。",
+                        "title": "ソーラーパネル"
+                    }
+                },
                 "entities": {
                     "caption": "エンティティ",
                     "description": "すべて既知のエンティティの一覧",
@@ -2134,14 +2177,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "消去",
-                    "filtering_by": "フィルタリング",
-                    "show": "表示"
-                },
-                "hassio": {
-                    "button": "設定"
-                },
                 "header": "Home Assistant の設定",
                 "helpers": {
                     "caption": "ヘルパー",
@@ -2191,16 +2226,11 @@
                     "server": "サーバー",
                     "setup_time": "設定時間",
                     "source": "ソース：",
-                    "system_health_error": "「システムの正常性」コンポーネントが有効されていません、configuration.yaml に 'system_health:' を追加してください。",
                     "system_health": {
                         "manage": "管理",
                         "more_info": "詳細情報"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "インテグレーションページ",
-                    "missing_zha": "ZHA設定パネルがありませんか？ {integrations_page} ZHAエントリに移動されました。",
-                    "missing_zwave": "Z-Wave設定パネルがありませんか？ {integrations_page}のZ-Waveエントリに移動されました。"
+                    },
+                    "system_health_error": "「システムの正常性」コンポーネントが有効されていません、configuration.yaml に 'system_health:' を追加してください。"
                 },
                 "integrations": {
                     "add_integration": "インテグレーションを追加",
@@ -2215,8 +2245,6 @@
                         "depends_on_cloud": "クラウドに依存",
                         "device_unavailable": "デバイスを利用できません",
                         "devices": "{count} {count, plural,\n  one {デバイス}\n  other {デバイス}\n}",
-                        "disable_error": "統合の有効化または無効化に失敗しました",
-                        "disable_restart_confirm": "Homeassistantを再起動して、このintegrationを無効にします。",
                         "disable": {
                             "disable_confirm": "この設定項目を無効にしてよろしいですか？そのデバイスやエンティティは無効になります。",
                             "disabled": "無効",
@@ -2227,6 +2255,8 @@
                             },
                             "disabled_cause": "{cause}によって無効化"
                         },
+                        "disable_error": "統合の有効化または無効化に失敗しました",
+                        "disable_restart_confirm": "Homeassistantを再起動して、このintegrationを無効にします。",
                         "disabled_polling": "更新されたデータの自動ポーリングが無効",
                         "documentation": "ドキュメント",
                         "enable_restart_confirm": "Home Assistantを再起動して、このintegrationを有効にします",
@@ -2234,11 +2264,9 @@
                         "entity_unavailable": "エンティティは利用できません",
                         "firmware": "ファームウェア： {version}",
                         "hub": "経由で接続",
-                        "logs": "ログ",
                         "manuf": "{manufacturer}",
                         "no_area": "エリアなし",
                         "not_loaded": "読み込まれていない場合は{logs_link} を確認してください",
-                        "options": "オプション",
                         "provided_by_custom_integration": "カスタムインテグレーションによる提供",
                         "reload": "再読込",
                         "reload_confirm": "インテグレーションが再読み込みされました",
@@ -2270,7 +2298,11 @@
                             "open_site": "ウェブサイトを開く"
                         },
                         "finish": "完了",
-                        "loading_first_time": "インテグレーションのインストールを完了するまでお待ちください",
+                        "loading": {
+                            "fallback_title": "統合",
+                            "loading_flow": "{integration}がセットアップされている間お待ちください",
+                            "loading_step": "{integration}次のステップを読み込んでいます"
+                        },
                         "next": "次",
                         "not_all_required_fields": "必須フィールドの一覧に入力するわけではありません。",
                         "not_loaded": "インテグレーションファイルを読み込めませんでした。ホームアシスタントを再起動してください。",
@@ -2287,7 +2319,6 @@
                     "details": "インテグレーションの詳細",
                     "disable": {
                         "disabled_integrations": "{number}は無効",
-                        "hide_disabled": "無視されたインテグレーションを表示",
                         "show": "表示",
                         "show_disabled": "無効なintegrationを表示"
                     },
@@ -2298,7 +2329,6 @@
                         "confirm_delete_ignore_title": "{name} の無視を停止しますか？",
                         "confirm_ignore": "この統合を設定しないでよろしいですか？右上のオーバーフローメニューで[無視された統合を表示]をクリックすると、これを元に戻すことができます。",
                         "confirm_ignore_title": "{name} の検出を無視しますか？",
-                        "hide_ignored": "無視されたインテグレーションを非表示にする",
                         "ignore": "無視する",
                         "ignored": "無視しました",
                         "show_ignored": "無視されたインテグレーションを表示",
@@ -2311,7 +2341,7 @@
                     "none": "まだ設定されていません",
                     "none_found": "インテグレーションが見つかりません。",
                     "none_found_detail": "別の検索基準をためしてみます。",
-                    "note_about_integrations": "まだすべての統合をUI経由で設定できるわけではありません。",
+                    "note_about_integrations": "検索に一致する統合がありません。セットアップする統合は、UI によるセットアップができない可能性があります。",
                     "note_about_website_reference": "より多くが利用可能です",
                     "reconfigure": "再設定",
                     "rename_dialog": "このコンフィグレーションエントリーの名前を変更",
@@ -2418,7 +2448,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "設定",
                     "description_listen": "トピックをリッスン",
                     "description_publish": "パケットをパブリッシュ",
                     "listening_to": "リッスンします",
@@ -2432,7 +2461,6 @@
                     "topic": "トピック"
                 },
                 "ozw": {
-                    "button": "設定",
                     "common": {
                         "controller": "コントローラ",
                         "instance": "インスタンス",
@@ -2457,6 +2485,11 @@
                         "nodes": "ノード",
                         "select_instance": "インスタンスを選択"
                     },
+                    "network": {
+                        "header": "ネットワーク管理",
+                        "introduction": "接続されたデバイスの管理",
+                        "node_count": "{count}ノード"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "すべての稼働中のノードが照会されました",
@@ -2477,10 +2510,9 @@
                         "starting": "開始",
                         "unknown": "不明"
                     },
-                    "network": {
-                        "header": "ネットワーク管理",
-                        "introduction": "接続されたデバイスの管理",
-                        "node_count": "{count}ノード"
+                    "node": {
+                        "button": "ノードの詳細",
+                        "not_found": "ノードが見つかりません"
                     },
                     "node_config": {
                         "header": "ノード設定",
@@ -2510,10 +2542,6 @@
                         "versions": "ファームウェアおよびコマンドクラスのバージョンに関する情報の取得",
                         "wakeup": "ウェイクアップ キューとメッセージのサポートのセットアップ"
                     },
-                    "node": {
-                        "button": "ノードの詳細",
-                        "not_found": "ノードが見つかりません"
-                    },
                     "nodes_table": {
                         "failed": "失敗しました",
                         "id": "ID",
@@ -2656,10 +2684,12 @@
                         },
                         "save_script": "スクリプトを保存",
                         "sequence": "シーケンス",
-                        "sequence_sentence": "このスクリプトのアクションのシーケンス。"
+                        "sequence_sentence": "このスクリプトのアクションのシーケンス。",
+                        "show_trace": "トレースを表示"
                     },
                     "picker": {
                         "add_script": "スクリプトを追加",
+                        "dev_script": "スクリプトをデバグ",
                         "duplicate": "複製",
                         "duplicate_script": "スクリプトの複製",
                         "edit_script": "スクリプトを編集",
@@ -2695,7 +2725,7 @@
                             "input_number": "入力番号を再読み込み",
                             "input_select": "入力選択の再読み込み",
                             "input_text": "入力テキストを再読み込み",
-                            "introduction": "Home Assistant の一部は、再起動を必要とせずに再読込できます。再読込を押すと、現在の設定をアンロードし、新しい設定を読み込みます。",
+                            "introduction": "Home Assistant の一部は、再起動を必要とせずに再読込できます。以下のオプションのいずれかをクリックすると、現在の設定をアンロードし、新しい設定を読み込みます。",
                             "min_max": "最小/最大エンティティを再読み込み",
                             "mqtt": "mqtt エンティティの再読み込み",
                             "person": "人",
@@ -2816,7 +2846,6 @@
                         "search_again": "もう一度検索",
                         "spinner": "ZHA Zigbeeデバイスを検索しています..."
                     },
-                    "button": "設定",
                     "cluster_attributes": {
                         "attributes_of_cluster": "選択したクラスターの属性",
                         "get_zigbee_attribute": "Zigbee属性を取得",
@@ -2846,12 +2875,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "ショートカット",
-                        "update_button": "構成の更新",
-                        "zha_options": {
-                            "default_light_transition": "デフォルトのライト遷移時間(秒)",
-                            "enable_identify_on_join": "デバイスがネットワークに参加する際に、識別効果を有効にする",
-                            "title": "グローバルオプション"
-                        }
+                        "update_button": "構成の更新"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "設定の完了",
@@ -2933,123 +2957,7 @@
                     "introduction": "ゾーンを使用すると、地球上の特定の地域を指定できます。人がゾーン内にいるとき、州はゾーンから名前を取ります。ゾーンは、オートメーション設定内のトリガーまたは条件として使用することもできます。",
                     "no_zones_created_yet": "まだゾーンを作成していないようです。"
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "インクルージョンをキャンセルする",
-                        "controller_in_inclusion_mode": "これで、Z-Waveコントローラーはインクルージョンモードになります。",
-                        "follow_device_instructions": "デバイスに付属の指示に従って、デバイスでペアリングを開始します。",
-                        "inclusion_failed": "ノードを追加できませんでした。詳細については、ログを確認してください。",
-                        "inclusion_finished": "ノードが追加されました。ノードのバックグラウンドでの設定が完了すると、すべてのエンティティが表示されるまで数分かかる場合があります。",
-                        "interview_failed": "デバイスのインタビューに失敗しました。追加情報がログに残っている場合があります。",
-                        "interview_started": "デバイスはインタビュー中です。これには時間がかかる場合があります。",
-                        "introduction": "このウィザードでは、Z-Wave ネットワークにノードを追加する手順を説明します。",
-                        "secure_inclusion_warning": "セキュアなデバイスには、追加の帯域幅が必要です。安全なデバイスが多すぎると、Z-Waveネットワークが遅くなる可能性があります。ロックやガレージドアオープナーなど、必要なデバイスにのみ安全な組み込みを使用することをお勧めします。",
-                        "start_inclusion": "インクルージョンを開始",
-                        "start_secure_inclusion": "セキュアインクルージョンの開始",
-                        "title": "Z-Waveノードを追加",
-                        "use_secure_inclusion": "安全なインクルージョンを使用する",
-                        "view_device": "デバイスを表示"
-                    },
-                    "button": "設定",
-                    "common": {
-                        "add_node": "ノードの追加",
-                        "close": "閉じる",
-                        "heal_network": "ネットワークの修復",
-                        "home_id": "ホームID",
-                        "network": "ネットワーク",
-                        "node_id": "ノードID",
-                        "reconfigure_server": "サーバーの再設定",
-                        "remove_node": "ノードの削除"
-                    },
-                    "dashboard": {
-                        "driver_version": "ドライバーバージョン",
-                        "dump_dead_nodes_text": "一部のノードが応答せず、停止していると見なされます。これらは完全にはエクスポートされません。",
-                        "dump_dead_nodes_title": "一部のノードが停止しています",
-                        "dump_debug": "ネットワークのダンプをダウンロードして、問題の診断に役立ててください",
-                        "dump_not_ready_confirm": "ダウンロード",
-                        "dump_not_ready_text": "すべてのノードの準備が整っていない状態でエクスポートを作成すると、必要なデータが見逃される可能性があります。ネットワークにすべてのノードを照会する時間を与えます。ダンプを続行しますか?",
-                        "dump_not_ready_title": "すべてのノードが照会されました。",
-                        "header": "Z-Wave ネットワークの管理",
-                        "home_id": "ホームID",
-                        "introduction": "Z-WaveネットワークとZ-Waveノードを管理する",
-                        "nodes_ready": "ノードの準備完了",
-                        "server_version": "サーバーバージョン"
-                    },
-                    "device_info": {
-                        "device_config": "デバイスの設定",
-                        "node_ready": "ノードの準備完了",
-                        "node_status": "ノードの状態",
-                        "zwave_info": "Z-Wave情報"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "ネットワークの修復がキャンセルされました。",
-                        "healing_complete": "ネットワークの修復が完了しました。",
-                        "healing_failed": "修復に失敗しました。追加情報はログで利用できる場合があります。",
-                        "in_progress": "ネットワークの修復が進行中です。これには少し時間がかかります。",
-                        "introduction": "Z-Wave ネットワークでネットワーク修復を開始します。ネットワークの修復は、すべてのデバイスがコントローラに戻ってルートを再計算し、最近デバイスまたはコントローラを移動した場合に推奨されます。",
-                        "run_in_background": "このダイアログを閉じると、ネットワークの修復がバックグラウンドで続行されます。",
-                        "start_heal": "修復を開始する",
-                        "stop_heal": "修復をやめる",
-                        "title": "Z-Waveネットワークの修復",
-                        "traffic_warning": "この修復プロセスでは、Z-Wave ネットワーク上に大量のトラフィックが生成されます。これにより、修復が進行中のデバイスの応答が遅くなる (またはまったく反応しない) ことがあります。"
-                    },
-                    "logs": {
-                        "log_level": "ログレベル",
-                        "log_level_changed": "ログレベルが変更されました。{level}に変更されました。",
-                        "subscribed_to_logs": "Z-WaveJSログメッセージを購読しました...",
-                        "title": "Z-WaveJSログ"
-                    },
-                    "navigation": {
-                        "logs": "ログ",
-                        "network": "ネットワーク"
-                    },
-                    "network_status": {
-                        "connected": "接続済み",
-                        "connecting": "接続",
-                        "unknown": "不明"
-                    },
-                    "node_config": {
-                        "attribution": "デバイスの構成パラメータと説明は、{device_database}で提供されます。",
-                        "battery_device_notice": "バッテリ デバイスは、設定を更新するためにスリープ状態にする必要があります。デバイスのスリープ解除方法については、デバイスのマニュアルを参照してください。",
-                        "error_device_not_found": "デバイスが見つかりません",
-                        "header": "Z-Waveデバイスの設定",
-                        "introduction": "選択したデバイスのデバイス(ノード)固有の設定パラメータを管理および調整する",
-                        "parameter_is_read_only": "このパラメータは読み取り専用です。",
-                        "set_param_accepted": "パラメータが更新されました。",
-                        "set_param_error": "エラーが発生しました。",
-                        "set_param_queued": "パラメーターの変更はキューに入れられており、デバイスがスリープ解除されると更新されます。",
-                        "zwave_js_device_database": "Z-Wave JSデバイスデータベース"
-                    },
-                    "node_status": {
-                        "alive": "作動中",
-                        "asleep": "スリープ",
-                        "awake": "起きている",
-                        "dead": "停止中",
-                        "unknown": "不明"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "再会する前に、バッテリー駆動のデバイスをスリープ解除する必要があります。デバイスをウェイクアップする方法については、デバイスのマニュアルを参照してください。",
-                        "in_progress": "デバイスがインタビュー中です。これには時間がかかる場合があります。",
-                        "interview_complete": "デバイスのインタビューが完了しました。",
-                        "interview_failed": "デバイスのインタビューに失敗しました。追加情報がログに残っている場合があります。",
-                        "introduction": "Z-Wave ネットワーク上のデバイスに再インタビューします。デバイスの機能が不足している場合や、機能が正しくない場合は、この機能を使用します。",
-                        "run_in_background": "このダイアログを閉じても、インタビューはバックグラウンドで継続されます。",
-                        "start_reinterview": "再インタビューを開始",
-                        "title": "Z-Waveデバイスへの再インタビュー"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "除外をキャンセルする",
-                        "controller_in_exclusion_mode": "Z-Wave コントローラが除外モードになりました。",
-                        "exclusion_failed": "ノードを削除できませんでした。詳細については、ログを確認してください。",
-                        "exclusion_finished": "ノード{id}がZ-Waveネットワークから削除されました。",
-                        "follow_device_instructions": "デバイスに付属の指示に従って、デバイスの除外をトリガーします。",
-                        "introduction": "Z-Waveネットワークからノードを削除し、関連するデバイスとエンティティをHomeAssistantから削除します。",
-                        "start_exclusion": "除外を開始する",
-                        "title": "Z-Waveノードを削除します"
-                    }
-                },
                 "zwave": {
-                    "button": "設定",
                     "common": {
                         "index": "インデックス",
                         "instance": "インスタンス",
@@ -3138,6 +3046,144 @@
                     "values": {
                         "header": "ノード値"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "インクルージョンをキャンセルする",
+                        "controller_in_inclusion_mode": "これで、Z-Waveコントローラーはインクルージョンモードになります。",
+                        "follow_device_instructions": "デバイスに付属の指示に従って、デバイスでペアリングを開始します。",
+                        "inclusion_failed": "ノードを追加できませんでした。詳細については、ログを確認してください。",
+                        "inclusion_finished": "ノードが追加されました。ノードのバックグラウンドでの設定が完了すると、すべてのエンティティが表示されるまで数分かかる場合があります。",
+                        "interview_failed": "デバイスのインタビューに失敗しました。追加情報がログに残っている場合があります。",
+                        "interview_started": "デバイスはインタビュー中です。これには時間がかかる場合があります。",
+                        "introduction": "このウィザードでは、Z-Wave ネットワークにノードを追加する手順を説明します。",
+                        "secure_inclusion_warning": "セキュアなデバイスには、追加の帯域幅が必要です。安全なデバイスが多すぎると、Z-Waveネットワークが遅くなる可能性があります。ロックやガレージドアオープナーなど、必要なデバイスにのみ安全な組み込みを使用することをお勧めします。",
+                        "start_inclusion": "インクルージョンを開始",
+                        "start_secure_inclusion": "セキュアインクルージョンの開始",
+                        "title": "Z-Waveノードを追加",
+                        "use_secure_inclusion": "安全なインクルージョンを使用する",
+                        "view_device": "デバイスを表示"
+                    },
+                    "common": {
+                        "add_node": "ノードの追加",
+                        "close": "閉じる",
+                        "heal_network": "ネットワークの修復",
+                        "home_id": "ホームID",
+                        "network": "ネットワーク",
+                        "node_id": "ノードID",
+                        "reconfigure_server": "サーバーの再設定",
+                        "remove_node": "ノードの削除",
+                        "source": "ソース"
+                    },
+                    "dashboard": {
+                        "driver_version": "ドライバーバージョン",
+                        "dump_dead_nodes_text": "一部のノードが応答せず、停止していると見なされます。これらは完全にはエクスポートされません。",
+                        "dump_dead_nodes_title": "一部のノードが停止しています",
+                        "dump_debug": "ネットワークのダンプをダウンロードして、問題の診断に役立ててください",
+                        "dump_not_ready_confirm": "ダウンロード",
+                        "dump_not_ready_text": "すべてのノードの準備が整っていない状態でエクスポートを作成すると、必要なデータが見逃される可能性があります。ネットワークにすべてのノードを照会する時間を与えます。ダンプを続行しますか?",
+                        "dump_not_ready_title": "すべてのノードが照会されました。",
+                        "header": "Z-Wave ネットワークの管理",
+                        "home_id": "ホームID",
+                        "introduction": "Z-WaveネットワークとZ-Waveノードを管理する",
+                        "nodes_ready": "ノードの準備完了",
+                        "server_version": "サーバーバージョン"
+                    },
+                    "device_info": {
+                        "device_config": "デバイスの設定",
+                        "heal_node": "ヒール ノード",
+                        "node_ready": "ノードの準備完了",
+                        "node_status": "ノードの状態",
+                        "reinterview_device": "再インタビューデバイス",
+                        "remove_failed": "故障したデバイスを削除する",
+                        "zwave_info": "Z-Wave情報"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "ネットワークの修復がキャンセルされました。",
+                        "healing_complete": "ネットワークの修復が完了しました。",
+                        "healing_failed": "修復に失敗しました。追加情報はログで利用できる場合があります。",
+                        "in_progress": "ネットワークの修復が進行中です。これには少し時間がかかります。",
+                        "introduction": "Z-Wave ネットワークでネットワーク修復を開始します。ネットワークの修復は、すべてのデバイスがコントローラに戻ってルートを再計算し、最近デバイスまたはコントローラを移動した場合に推奨されます。",
+                        "run_in_background": "このダイアログを閉じると、ネットワークの修復がバックグラウンドで続行されます。",
+                        "start_heal": "修復を開始する",
+                        "stop_heal": "修復をやめる",
+                        "title": "Z-Waveネットワークの修復",
+                        "traffic_warning": "この修復プロセスでは、Z-Wave ネットワーク上に大量のトラフィックが生成されます。これにより、修復が進行中のデバイスの応答が遅くなる (またはまったく反応しない) ことがあります。"
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device}が修復されました。",
+                        "healing_failed": "{device} を修復できませんでした。",
+                        "healing_failed_check_logs": "追加情報は過去ログにあるかもしれません。",
+                        "in_progress": "{device}修復が進行中です。",
+                        "introduction": "{device} に、コントローラへのルートを更新するように指示します。これは、デバイスまたはコントローラを最近移動した場合に、通信の問題に役立ちます。",
+                        "network_heal_in_progress": "Z-Wave ネットワークの修復は既に進行中です。個々のデバイスを修復する前に、それが終了するのを待ってください。",
+                        "start_heal": "ヒールデバイス",
+                        "title": "Z-Waveデバイスを修復する",
+                        "traffic_warning": "この修復プロセスでは、Z-Wave ネットワーク上に大量のトラフィックが生成されます。これにより、修復が進行中のデバイスの応答が遅くなる (またはまったく反応しない) ことがあります。"
+                    },
+                    "logs": {
+                        "log_level": "ログレベル",
+                        "log_level_changed": "ログレベルが {level} に変更されました。",
+                        "subscribed_to_logs": "Z-WaveJSログメッセージを購読しました...",
+                        "title": "Z-WaveJSログ"
+                    },
+                    "navigation": {
+                        "logs": "ログ",
+                        "network": "ネットワーク"
+                    },
+                    "network_status": {
+                        "connected": "接続済み",
+                        "connecting": "接続",
+                        "unknown": "不明"
+                    },
+                    "node_config": {
+                        "attribution": "デバイスの構成パラメータと説明は、{device_database}で提供されます。",
+                        "battery_device_notice": "バッテリ デバイスは、設定を更新するためにスリープ状態にする必要があります。デバイスのスリープ解除方法については、デバイスのマニュアルを参照してください。",
+                        "error_device_not_found": "デバイスが見つかりません",
+                        "header": "Z-Waveデバイスの設定",
+                        "introduction": "選択したデバイスのデバイス(ノード)固有の設定パラメータを管理および調整する",
+                        "parameter": "パラメータ",
+                        "parameter_is_read_only": "このパラメータは読み取り専用です。",
+                        "set_param_accepted": "パラメータが更新されました。",
+                        "set_param_error": "エラーが発生しました。",
+                        "set_param_queued": "パラメーターの変更はキューに入れられており、デバイスがスリープ解除されると更新されます。",
+                        "zwave_js_device_database": "Z-Wave JSデバイスデータベース"
+                    },
+                    "node_status": {
+                        "alive": "作動中",
+                        "asleep": "スリープ",
+                        "awake": "起きている",
+                        "dead": "停止中",
+                        "unknown": "不明"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "再会する前に、バッテリー駆動のデバイスをスリープ解除する必要があります。デバイスをウェイクアップする方法については、デバイスのマニュアルを参照してください。",
+                        "in_progress": "デバイスがインタビュー中です。これには時間がかかる場合があります。",
+                        "interview_complete": "デバイスのインタビューが完了しました。",
+                        "interview_failed": "デバイスのインタビューに失敗しました。追加情報がログに残っている場合があります。",
+                        "introduction": "Z-Wave ネットワーク上のデバイスに再インタビューします。デバイスの機能が不足している場合や、機能が正しくない場合は、この機能を使用します。",
+                        "run_in_background": "このダイアログを閉じても、インタビューはバックグラウンドで継続されます。",
+                        "start_reinterview": "再インタビューを開始",
+                        "title": "Z-Waveデバイスへの再インタビュー"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "デバイスの削除が進行中です。",
+                        "introduction": "Z-Wave ネットワークから障害が発生したデバイスを削除します。デバイスが壊れているために通常は除外できない場合に使用します。",
+                        "removal_failed": "デバイスをZ-Waveネットワークから削除できませんでした。",
+                        "removal_finished": "ノード{id}は、Z-Waveネットワークから削除されました。",
+                        "remove_device": "デバイスを削除",
+                        "title": "故障したZ-Waveデバイスを削除する"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "除外をキャンセルする",
+                        "controller_in_exclusion_mode": "Z-Wave コントローラが除外モードになりました。",
+                        "exclusion_failed": "ノードを削除できませんでした。詳細については、ログを確認してください。",
+                        "exclusion_finished": "ノード{id}がZ-Waveネットワークから削除されました。",
+                        "follow_device_instructions": "デバイスに付属の指示に従って、デバイスの除外をトリガーします。",
+                        "introduction": "Z-Waveネットワークからノードを削除し、関連するデバイスとエンティティをHomeAssistantから削除します。",
+                        "start_exclusion": "除外を開始する",
+                        "title": "Z-Waveノードを削除します"
+                    }
                 }
             },
             "custom": {
@@ -3220,31 +3266,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "戻る",
-                "supervisor": {
-                    "ask": "助けを求める",
-                    "observer": "オブザーバーの確認",
-                    "reboot": "ホストの再起動を試みる",
-                    "system_health": "システムの状態の確認",
-                    "title": "Supervisorパネルを読み込めませんでした。",
-                    "wait": "開始したばかりの場合は、開始するのに十分な時間をsupervisorに与えていることを確認してください。"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "先週",
-                    "this_week": "今週",
-                    "today": "今日",
-                    "yesterday": "昨日"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "先週",
-                    "this_week": "今週",
-                    "today": "今日",
-                    "yesterday": "昨日"
+            "energy": {
+                "charts": {
+                    "by_device": "デバイス別消費量",
+                    "solar": "ソーラー",
+                    "stat_house_energy_meter": "総エネルギー消費量"
+                },
+                "setup": {
+                    "back": "戻る",
+                    "done": "私のエネルギーダッシュボードを表示",
+                    "next": "次"
                 }
             },
             "lovelace": {
@@ -3358,7 +3389,6 @@
                         "entities": {
                             "description": "エンティティ カードは、最も一般的な種類のカードです。アイテムをリストにまとめます。",
                             "edit_special_row": "コードエディタを使用して編集する",
-                            "entity_row_editor": "エンティティエディタ",
                             "entity_row": {
                                 "attribute": "属性",
                                 "button": "ボタン",
@@ -3370,6 +3400,7 @@
                                 "section": "セクション",
                                 "weblink": "ウェブリンク"
                             },
+                            "entity_row_editor": "エンティティエディタ",
                             "name": "エンティティ",
                             "secondary_info_values": {
                                 "brightness": "明るさ",
@@ -3396,6 +3427,7 @@
                         "gauge": {
                             "description": "ゲージカードは、センサーデータを視覚的に見ることができる基本カードです。",
                             "name": "ゲージ",
+                            "needle_gauge": "ニードルゲージとして表示しますか？",
                             "severity": {
                                 "define": "重大度を定義しますか?",
                                 "green": "緑",
@@ -3408,6 +3440,7 @@
                             "attribute": "属性",
                             "camera_image": "カメラエンティティ",
                             "camera_view": "カメラビュー",
+                            "days_to_show": "表示までの日数",
                             "double_tap_action": "ダブルタップアクション",
                             "entities": "エンティティ",
                             "entity": "エンティティ",
@@ -3521,6 +3554,10 @@
                             "integration_not_loaded": "このカードを設定するには、「shopping_list」インテグレーションが必要です。",
                             "name": "買い物リスト"
                         },
+                        "statistics-graph": {
+                            "description": "統計グラフカードを使用すると、リストされている各エンティティの統計のグラフを表示できます。",
+                            "name": "統計グラフ"
+                        },
                         "thermostat": {
                             "description": "サーモスタットカードは、気候エンティティを制御します。エンティティの温度とモードを変更できます。",
                             "name": "サーモスタット"
@@ -3590,6 +3627,12 @@
                         "tab_badges": "バッジ",
                         "tab_settings": "設定",
                         "tab_visibility": "可視性",
+                        "type": "ビュータイプ",
+                        "types": {
+                            "masonry": "組積造（デフォルト）",
+                            "panel": "パネル(1枚)",
+                            "sidebar": "サイドバー"
+                        },
                         "visibility": {
                             "select_users": "ナビゲーションでこのビューを表示するユーザーを選択します。"
                         }
@@ -3644,7 +3687,6 @@
                         "unsaved_changes": "保存されていない変更"
                     },
                     "save_config": {
-                        "cancel": "気にしないで",
                         "close": "閉じる",
                         "empty_config": "新しいダッシュボードから開始する",
                         "header": "Lovelace UIを制御する",
@@ -3673,8 +3715,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "これにより、最初のカードが全幅でレンダリングされます。このビューの他のカードはレンダリングされません。",
-                            "title": "パネルモード？",
                             "warning_multiple_cards": "このビューには複数のカードが含まれていますが、パネルビューでは 1 枚のカードしか表示できません。"
                         }
                     }
@@ -3877,8 +3917,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "次",
-                    "intro": "インスタンスのアナリティクスを共有する。このデータは{link}で公開されます。"
+                    "finish": "次"
                 },
                 "core-config": {
                     "button_detect": "検出",
@@ -3901,16 +3940,14 @@
                     "addons": "アドオン",
                     "confirm_password": "スナップショットパスワードの確認",
                     "description": "以前のスナップショットから復元することもできます。",
-                    "folders": "フォルダ",
-                    "full_snapshot": "フルスナップショット",
+                    "folders": "フォルダー",
                     "hide_log": "ログ全体を非表示",
                     "in_progress": "復元中",
-                    "partial_snapshot": "部分的スナップショット",
-                    "password": "スナップショットパスワード",
+                    "password": "パスワード",
                     "password_protection": "パスワード保護",
-                    "select_type": "何を復元するかを選択します",
+                    "select_type": "復元する対象を選択する",
                     "show_log": "ログ全体を表示",
-                    "type": "スナップショットタイプ"
+                    "type": "タイプ"
                 },
                 "user": {
                     "create_account": "アカウントの作成",
@@ -3977,7 +4014,7 @@
                     "confirm_delete": "{name} のアクセス トークンを削除しますか?",
                     "create": "トークンの作成",
                     "create_failed": "アクセス トークンを作成できませんでした。",
-                    "created": "{日付} に作成されました",
+                    "created": "{date} に作成されました",
                     "delete_failed": "アクセス トークンを削除できませんでした。",
                     "description": "スクリプトがホーム アシスタント インスタンスと対話できるように、長期間使用できるアクセス トークンを作成します。各トークンは作成から10年間有効です。次の長期アクセス トークンは現在アクティブです。",
                     "empty_state": "長期間使用されるアクセス トークンはまだありません。",
@@ -3987,6 +4024,12 @@
                     "prompt_copy_token": "アクセス トークンをコピーします。再び表示されません。",
                     "prompt_name": "名前？"
                 },
+                "mfa": {
+                    "confirm_disable": "{name}を無効にしてもよろしいですか？",
+                    "disable": "無効",
+                    "enable": "有効",
+                    "header": "多要素認証モジュール"
+                },
                 "mfa_setup": {
                     "close": "閉じる",
                     "step_done": "{step}セットアップが完了しました",
@@ -3994,12 +4037,6 @@
                     "title_aborted": "中止されました",
                     "title_success": "成功！"
                 },
-                "mfa": {
-                    "confirm_disable": "{name}を無効にしてもよろしいですか？",
-                    "disable": "無効",
-                    "enable": "有効",
-                    "header": "多要素認証モジュール"
-                },
                 "number_format": {
                     "description": "数値の書式を選択します。",
                     "dropdown_label": "数値の書式",
@@ -4027,7 +4064,7 @@
                 },
                 "refresh_tokens": {
                     "confirm_delete": "{name} の更新トークンを削除しますか?",
-                    "created_at": "{日付} に作成されました",
+                    "created_at": "{date} に作成されました",
                     "current_token_tooltip": "現在の更新トークンを削除できません",
                     "delete_failed": "更新トークンを削除できませんでした。",
                     "description": "各更新トークンはログインセッションを表します。ログアウトをクリックすると、更新トークンが自動的に削除されます。現在、次の更新トークンがアカウントでアクティブになっています。",
diff --git a/translations/frontend/ko.json b/translations/frontend/ko.json
index e2f7504388..cadf6e2976 100644
--- a/translations/frontend/ko.json
+++ b/translations/frontend/ko.json
@@ -17,6 +17,7 @@
         "calendar": "캘린더",
         "config": "구성하기",
         "developer_tools": "개발자 도구",
+        "energy": "에너지",
         "history": "기록 그래프",
         "logbook": "로그북",
         "mailbox": "메일함",
@@ -26,6 +27,14 @@
         "shopping_list": "장보기 목록",
         "states": "둘러보기"
     },
+    "state": {
+        "default": {
+            "off": "끄기",
+            "on": "켜기",
+            "unavailable": "사용 불가",
+            "unknown": "알 수 없음"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "외출"
         }
     },
-    "state": {
-        "default": {
-            "off": "끄기",
-            "on": "켜기",
-            "unavailable": "사용 불가",
-            "unknown": "알 수 없음"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -241,9 +242,9 @@
                 },
                 "ram_usage": "애드온 RAM 사용량",
                 "rebuild": "다시 빌드하기",
-                "restart": "다시 시작하기",
+                "restart": "다시 시작",
                 "start": "시작하기",
-                "stop": "중지하기",
+                "stop": "중지",
                 "uninstall": "제거하기",
                 "visit_addon_page": "자세한 내용은 {name} 페이지를 참조해주세요"
             },
@@ -267,6 +268,26 @@
                 "not_installed": "애드온이 설치되지 않았습니다"
             }
         },
+        "backup": {
+            "addons": "애드온",
+            "confirm_password": "스냅샷 비밀번호 확인",
+            "could_not_create": "스냅숏을 만들 수 없습니다",
+            "create": "생성하기",
+            "create_blocked_not_running": "시스템이 {state} 상태이기 때문에 지금은 스냅숏을 생성할 수 없습니다.",
+            "created": "생성됨",
+            "delete_backup_confirm": "삭제",
+            "delete_selected": "선택한 스냅샷 삭제",
+            "enter_password": "비밀번호를 입력해주세요.",
+            "failed_to_delete": "삭제하지 못했습니다.",
+            "folders": "폴더",
+            "name": "이름",
+            "password": "비밀번호",
+            "password_protection": "비밀번호 보호",
+            "passwords_not_matching": "비밀번호가 일치하지 않습니다",
+            "select_type": "복원 할 항목 선택",
+            "selected": "{number}개 선택됨",
+            "type": "유형"
+        },
         "common": {
             "cancel": "취소",
             "close": "닫기",
@@ -286,8 +307,8 @@
             "reload": "다시 읽어오기",
             "reset_defaults": "기본값으로 재설정하기",
             "reset_options": "옵션 재설정하기",
-            "restart": "다시 시작하기",
-            "restart_name": "{name} 다시 시작하기",
+            "restart": "다시 시작",
+            "restart_name": "{name} 다시 시작",
             "running_version": "현재 {version} 버전을 실행 중입니다",
             "save": "저장하기",
             "show_more": "자세한 정보 표시하기",
@@ -303,7 +324,7 @@
             },
             "restart": {
                 "text": "{name}을(를) 다시 시작하시겠습니까?",
-                "title": "{name} 다시 시작하기"
+                "title": "{name} 다시 시작"
             },
             "update": {
                 "text": "{name}을(를) 버전 {version}(으)로 업데이트하시겠습니까?",
@@ -366,9 +387,6 @@
                 "text": "변경 사항과 함께 애드온을 다시 시작하시겠습니까?"
             },
             "update": {
-                "create_snapshot": "업데이트하기 전에 {name}의 스냅숏 만들기",
-                "snapshot": "스냅숏",
-                "snapshotting": "{name} 스냅숏을 만드는 중",
                 "updating": "{name}을(를) {version} 버전으로 업데이트하는 중"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "대시보드",
-            "snapshots": "스냅숏",
             "store": "애드온 스토어",
             "system": "시스템"
         },
-        "snapshot": {
-            "addons": "애드온",
-            "available_snapshots": "사용 가능한 스냅숏",
-            "confirm_password": "스냅샷 비밀번호 확인",
-            "could_not_create": "스냅숏을 만들 수 없습니다",
-            "create": "생성하기",
-            "create_blocked_not_running": "시스템이 {state} 상태이기 때문에 지금은 스냅숏을 생성할 수 없습니다.",
-            "create_snapshot": "스냅숏 생성하기",
-            "created": "생성됨",
-            "delete_selected": "선택한 스냅샷 삭제",
-            "delete_snapshot_confirm": "삭제",
-            "delete_snapshot_text": "{number} {number, plural,\n  one{개의 스냅샷}\n  other{개의 스냅샷}\n} 삭제하시겠습니까?",
-            "delete_snapshot_title": "스냅샷 삭제",
-            "description": "스냅숏을 사용하면 Home Assistant 인스턴스의 모든 데이터를 쉽게 백업하고 복원할 수 있습니다.",
-            "enter_password": "비밀번호를 입력해주세요.",
-            "failed_to_delete": "삭제하지 못했습니다.",
-            "folder": {
-                "addons/local": "로컬 애드온",
-                "homeassistant": "Home Assistant 구성 내용",
-                "media": "미디어",
-                "share": "공유 내용",
-                "ssl": "SSL 인증서"
-            },
-            "folders": "폴더",
-            "full_snapshot": "전체 스냅숏",
-            "name": "이름",
-            "no_snapshots": "스냅숏이 존재하지 않습니다.",
-            "partial_snapshot": "부분 스냅숏",
-            "password": "비밀번호",
-            "password_protected": "비밀번호로 보호됨",
-            "password_protection": "비밀번호 보호",
-            "passwords_not_matching": "비밀번호가 일치하지 않습니다",
-            "security": "보안",
-            "select_type": "복원 할 항목 선택",
-            "selected": "{number}개 선택됨",
-            "type": "유형",
-            "upload_snapshot": "스냅숏 올리기"
-        },
         "store": {
             "missing_addons": "애드온이 보이지 않으신가요? 사용자 프로필 페이지에서 고급 모드를 활성화해보세요",
             "no_results_found": "{repository}에 결과가 존재하지 않습니다",
@@ -437,8 +416,8 @@
                 "ram_usage": "코어 RAM 사용량"
             },
             "host": {
-                "change": "변경하기",
-                "change_hostname": "호스트 이름 변경하기",
+                "change": "변경",
+                "change_hostname": "호스트 이름 변경",
                 "confirm_reboot": "호스트를 재부팅하시겠습니까?",
                 "confirm_shutdown": "호스트를 종료하시겠습니까?",
                 "deployment": "배포 버전",
@@ -455,8 +434,8 @@
                 "ip_address": "IP 주소",
                 "new_hostname": "새로운 호스트 이름을 입력해주세요:",
                 "operating_system": "운영 체제",
-                "reboot_host": "호스트 재부팅하기",
-                "shutdown_host": "호스트 종료하기",
+                "reboot_host": "호스트 재부팅",
+                "shutdown_host": "호스트 종료",
                 "used_space": "사용된 공간"
             },
             "log": {
@@ -473,12 +452,12 @@
                 "failed_to_reload": "Supervisor를 다시 읽어오지 못했습니다",
                 "failed_to_set_option": "Supervisor 옵션을 설정하지 못했습니다",
                 "failed_to_update": "Supervisor를 업데이트하지 못했습니다",
-                "join_beta_action": "베타 채널에 가입하기",
+                "join_beta_action": "베타 채널에 가입",
                 "join_beta_description": "Home Assistant (출시 직전버전), Supervisor 및 호스트의 베타 업데이트를 가져옵니다",
-                "leave_beta_action": "베타 채널에서 탈퇴하기",
+                "leave_beta_action": "베타 채널에서 탈퇴",
                 "leave_beta_description": "Home Assistant, Supervisor 및 호스트의 공식 업데이트를 가져옵니다",
                 "ram_usage": "Supervisor RAM 사용량",
-                "reload_supervisor": "Supervisor 다시 읽어오기",
+                "reload_supervisor": "Supervisor 다시 읽기",
                 "search": "검색",
                 "share_diagnostics": "진단 정보 공유하기",
                 "share_diagnostics_description": "충돌 보고서 및 진단 정보를 공유합니다.",
@@ -509,7 +488,7 @@
                     "systemd": "Systemd"
                 },
                 "unsupported_title": "지원되지 않는 설치방법으로 실행 중입니다",
-                "update_supervisor": "Supervisor 업데이트하기",
+                "update_supervisor": "Supervisor 업데이트",
                 "warning": "경고"
             }
         }
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "종료 날짜",
+                "ranges": {
+                    "last_week": "지난 주",
+                    "this_week": "이번 주",
+                    "today": "오늘",
+                    "yesterday": "어제"
+                },
                 "select": "선택",
                 "start_date": "시작 날짜"
             },
@@ -851,10 +836,10 @@
                 "documentation": "관련 문서",
                 "learn_adding_local_media": "{documentation}에서 미디어 추가에 대해 자세히 알아보세요.",
                 "local_media_files": "브라우저 또는 지원되는 미디어 플레이어에서 탐색하고 재생할 수 있도록 비디오, 오디오 및 이미지 파일을 미디어 디렉터리에 넣어주세요.",
+                "media-player-browser": "미디어 플레이어 브라우저",
                 "media_browsing_error": "미디어 탐색 오류",
                 "media_not_supported": "브라우저 미디어 플레이어에서 이 유형의 미디어를 지원하지 않습니다",
                 "media_player": "미디어 플레이어",
-                "media-player-browser": "미디어 플레이어 브라우저",
                 "no_items": "항목 없음",
                 "no_local_media_found": "로컬 미디어를 찾을 수 없습니다",
                 "no_media_folder": "아직 생성된 미디어 디렉터리가 없는 것 같습니다.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "서비스"
             },
+            "statistic-picker": {
+                "learn_more": "통계에 대해 자세히 알아보기",
+                "missing_entity": "왜 구성요소가 목록에 없나요?",
+                "no_match": "일치하는 통계를 찾을 수 없습니다.",
+                "no_statistics": "통계가 없습니다.",
+                "statistic": "통계"
+            },
+            "statistics_charts": {
+                "loading_statistics": "통계 불러오는 중...",
+                "no_statistics_found": "통계를 찾을 수 없습니다.",
+                "statistic_types": {
+                    "max": "최대",
+                    "mean": "평균",
+                    "min": "최소",
+                    "sum": "합계"
+                }
+            },
             "target-picker": {
                 "add_area_id": "영역 선택하기",
                 "add_device_id": "기기 선택하기",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "옵션"
                 },
+                "loading": {
+                    "loading_flow": "{integration} 옵션이 준비되는 동안 잠시 기다려 주십시오.",
+                    "loading_step": "{integration} 다음 단계 로드 중"
+                },
                 "success": {
                     "description": "옵션이 성공적으로 저장되었습니다."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "일반",
                         "customize": "사용자화",
                         "devices": "기기",
+                        "energy": "에너지",
                         "entities": "구성요소",
                         "helpers": "도우미",
                         "info": "정보",
                         "integrations": "통합 구성요소",
                         "logs": "로그",
                         "lovelace": "Lovelace 대시보드",
-                        "navigate_to": "{panel}(으)로 이동하기",
                         "person": "구성원",
                         "scene": "씬",
                         "script": "스크립트",
@@ -1360,7 +1366,6 @@
                             "introduction": "동작은 자동화가 트리거 될 때 Home Assistant가 수행할 작업입니다.",
                             "learn_more": "동작에 대해 더 알아보기",
                             "name": "동작",
-                            "type_select": "동작 유형",
                             "type": {
                                 "choose": {
                                     "add_option": "옵션 추가하기",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "반복",
                                     "sequence": "동작",
-                                    "type_select": "반복 유형",
                                     "type": {
                                         "count": {
                                             "label": "횟수"
@@ -1414,7 +1418,8 @@
                                             "conditions": "~인 동안 조건",
                                             "label": "~인 동안"
                                         }
-                                    }
+                                    },
+                                    "type_select": "반복 유형"
                                 },
                                 "scene": {
                                     "label": "씬 활성화"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "대기 템플릿"
                                 }
                             },
+                            "type_select": "동작 유형",
                             "unsupported_action": "비주얼 편집기에서 지원하지 않는 동작입니다: {action}"
                         },
                         "alias": "이름",
@@ -1452,7 +1458,6 @@
                             "introduction": "조건은 선택 사항이며 자동화가 트리거 될 때 설정된 모든 조건이 충족되지 않으면 동작되지 않도록 할 수 있습니다.",
                             "learn_more": "조건에 대해 더 알아보기",
                             "name": "조건",
-                            "type_select": "조건 유형",
                             "type": {
                                 "and": {
                                     "label": "다중조건 (And)"
@@ -1513,12 +1518,18 @@
                                         "wed": "수요일"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "트리거 ID",
+                                    "label": "트리거",
+                                    "no_triggers": "사용 가능한 트리거 없음"
+                                },
                                 "zone": {
                                     "entity": "위치기반 구성요소",
                                     "label": "지역",
                                     "zone": "지역"
                                 }
                             },
+                            "type_select": "조건 유형",
                             "unsupported_condition": "비주얼 편집기에서 지원하지 않는 조건입니다: {condition}"
                         },
                         "copy_to_clipboard": "클립보드에 복사",
@@ -1556,10 +1567,10 @@
                             "delete_confirm": "정말 삭제하시겠습니까?",
                             "duplicate": "복제하기",
                             "header": "트리거",
+                            "id": "트리거 ID(트리거 조건에서 사용)",
                             "introduction": "트리거는 자동화 규칙을 처리하는 시작점입니다. 같은 자동화 규칙에 여러 개의 트리거를 지정할 수 있습니다. 트리거가 발동되면 Home Assistant는 조건을 확인하고 동작을 호출합니다.",
                             "learn_more": "트리거에 대해 더 알아보기",
                             "name": "트리거",
-                            "type_select": "트리거 유형",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1625,18 +1636,18 @@
                                     "label": "템플릿",
                                     "value_template": "값 템플릿"
                                 },
-                                "time_pattern": {
-                                    "hours": "시",
-                                    "label": "시간 패턴",
-                                    "minutes": "분",
-                                    "seconds": "초"
-                                },
                                 "time": {
                                     "at": "시각",
                                     "label": "시간",
                                     "type_input": "날짜 / 시간 입력 도우미 값",
                                     "type_value": "정해진 시간"
                                 },
+                                "time_pattern": {
+                                    "hours": "시",
+                                    "label": "시간 패턴",
+                                    "minutes": "분",
+                                    "seconds": "초"
+                                },
                                 "webhook": {
                                     "label": "웹 훅",
                                     "webhook_id": "웹 훅 ID"
@@ -1650,6 +1661,7 @@
                                     "zone": "지역"
                                 }
                             },
+                            "type_select": "트리거 유형",
                             "unsupported_platform": "비주얼 편집기에서 지원하지 않는 플랫폼입니다: {platform}"
                         },
                         "unsaved_confirm": "변경된 내용을 저장하지 않았습니다. 정말 이 페이지를 떠나시겠습니까?"
@@ -1782,6 +1794,7 @@
                             "instance_will_be_available": "토글을 활성화하여 다음의 주소에서 구성요소를 사용해보세요.",
                             "link_learn_how_it_works": "작동 방식에 대해 알아보기",
                             "not_connected": "연결되지 않음",
+                            "reconnecting": "재연결",
                             "remote_enabled": {
                                 "caption": "자동 연결",
                                 "description": "이 옵션을 활성화하면 Home Assistant 인스턴스에 항상 원격으로 액세스 할 수 있습니다."
@@ -1812,9 +1825,9 @@
                             "loading": "읽는 중 ...",
                             "manage": "관리",
                             "no_hooks_yet": "아직 웹 훅이 없는 것 같습니다. 다음을 구성하여 시작하실 수 있습니다. ",
+                            "no_hooks_yet2": " 또는 다음을 작성할 수 있습니다. ",
                             "no_hooks_yet_link_automation": "웹 훅 자동화",
                             "no_hooks_yet_link_integration": "웹 훅 기반 연동",
-                            "no_hooks_yet2": " 또는 다음을 작성할 수 있습니다. ",
                             "title": "웹 훅"
                         }
                     },
@@ -1929,37 +1942,8 @@
                     "description": "도량형 단위, 위치, 시간대 및 기타 일반적인 매개 변수를 관리합니다",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "이 옵션을 활성화하기 전에 분석 관련 문서 페이지 {link}을(를) 방문하여 어떤 데이터를 보내고 어떻게 저장되는지 알아보세요.",
-                                "header": "분석",
-                                "instance_id": "인스턴스 ID: {huuid}",
-                                "introduction": "설치 정보를 공유하여 Home Assistant를 개선하고 제조업체가 로컬 제어 및 개인 정보 보호 기능을 추가하도록 설득하는 데 도움이됩니다.",
-                                "learn_more": "수집된 데이터가 어떻게 처리되는지 알아보기",
-                                "needs_base": "이 옵션을 사용하려면 기본 분석을 활성화해야 합니다",
-                                "preference": {
-                                    "base": {
-                                        "description": "인스턴스 ID, 버전과 설치 방법.",
-                                        "title": "기본 분석"
-                                    },
-                                    "diagnostics": {
-                                        "description": "예기치 않은 오류가 발생할 경우 충돌 보고서를 공유합니다.",
-                                        "title": "진단"
-                                    },
-                                    "statistics": {
-                                        "description": "사용된 구성요소와 사용자계정 갯수 외 기타 요소.",
-                                        "title": "사용 통계"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "이름, 버전 그리고 기타 정보.",
-                                        "title": "사용된 통합구성요소 및 애드온"
-                                    },
-                                    "usage": {
-                                        "description": "이름과 버전 정보.",
-                                        "title": "사용된 통합구성요소"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "통화",
                                 "edit_requires_storage": "구성내용이 configuration.yaml에 저장되어 있기 때문에 편집기가 비활성화되었습니다.",
                                 "elevation": "고도",
                                 "elevation_meters": "미터",
@@ -2092,6 +2076,60 @@
                     "update": "업데이트",
                     "update_device_error": "장치 업데이트 실패"
                 },
+                "energy": {
+                    "caption": "에너지",
+                    "description": "에너지 생산 및 소비 모니터링",
+                    "device_consumption": {
+                        "add_stat": "에너지를 추적할 항목 선택",
+                        "dialog": {
+                            "selected_stat_intro": "장치 에너지 사용량을 나타내는 구성요소를 선택합니다."
+                        },
+                        "learn_more": "시작하는 방법에 대한 추가 정보.",
+                        "selected_stat": "에너지 추적",
+                        "sub": "개별 기기의 에너지 사용량을 추적하면 Home Assistant가 기기별로 에너지 사용량을 분석할 수 있습니다.",
+                        "title": "개별 장치"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "현재 가격이 있는 구성요소 사용",
+                                "cost_entity_input": "현재 가격이 있는 구성요소",
+                                "cost_number": "고정 가격 사용",
+                                "cost_number_input": "kWh당 가격",
+                                "cost_number_suffix": "{currency} /kWh",
+                                "cost_para": "Home Assistant가 소비된 에너지 비용을 계산하는 방법을 선택합니다.",
+                                "cost_stat": "총 비용을 계산하는 구성요소 사용",
+                                "cost_stat_input": "총 비용 구성요소",
+                                "energy_stat": "소비 에너지 (kWh)",
+                                "header": "그리드 소비량 설정",
+                                "no_cost": "비용을 계산하지 마십시오",
+                                "paragraph": "그리드 소비량은 분전반에서 가정으로 흐르는 에너지입니다."
+                            },
+                            "to": {
+                                "cost_number": "고정 요금 사용",
+                                "cost_number_input": "kWh당 요금",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "분전반에 에너지를 반환하면 돈을 돌려받습니까?",
+                                "cost_stat": "받은 총 금액을 계산하는 구성요소 사용",
+                                "energy_stat": "그리드로 반환된 에너지(kWh)",
+                                "header": "그리드 생산량 설정",
+                                "no_cost": "돈을 돌려받지 않습니다",
+                                "paragraph": "그리드 생산량은 태양광 패널에서 분전반으로 흐르는 에너지입니다."
+                            }
+                        },
+                        "learn_more": "시작하는 방법에 대한 추가 정보.",
+                        "sub": "그리드에서 소비하는 에너지에 대해 다른 요금체계를 구성하고 에너지를 그리드에 반환하는 경우 그리드에 반환하는 에너지를 구성합니다.",
+                        "title": "전력 그리드"
+                    },
+                    "solar": {
+                        "learn_more": "시작하는 방법에 대한 추가 정보.",
+                        "stat_predicted_production": "태양 에너지 생산 예측",
+                        "stat_production": "태양 에너지 생산 현황",
+                        "stat_return_to_grid": "그리드로 반환되는 태양 에너지",
+                        "sub": "Home Assistant를 통해 태양광 패널을 모니터링하고 성능을 한눈에 볼 수 있습니다",
+                        "title": "태양광 패널"
+                    }
+                },
                 "entities": {
                     "caption": "구성요소",
                     "description": "등록된 구성요소를 관리합니다",
@@ -2142,14 +2180,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "지우기",
-                    "filtering_by": "필터링",
-                    "show": "표시하기"
-                },
-                "hassio": {
-                    "button": "구성"
-                },
                 "header": "Home Assistant 구성하기",
                 "helpers": {
                     "caption": "도우미",
@@ -2199,16 +2229,11 @@
                     "server": "서버",
                     "setup_time": "설정 시간",
                     "source": "소스:",
-                    "system_health_error": "시스템 상태보기 구성요소가 로드되지 않았습니다. configuration.yaml에 'system_health:'를 추가해주세요.",
                     "system_health": {
                         "manage": "관리하기",
                         "more_info": "추가 정보"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "통합 구성요소 페이지",
-                    "missing_zha": "ZHA 구성 패널이 보이지 않으신가요? {integrations_page}의 ZHA 항목으로 이동되었습니다.",
-                    "missing_zwave": "Z-Wave 구성 패널이 보이지 않으신가요? {integrations_page}의 ZHA 항목으로 이동되었습니다."
+                    },
+                    "system_health_error": "시스템 상태보기 구성요소가 로드되지 않았습니다. configuration.yaml에 'system_health:'를 추가해주세요."
                 },
                 "integrations": {
                     "add_integration": "통합 구성요소 추가하기",
@@ -2223,8 +2248,6 @@
                         "depends_on_cloud": "클라우드 서비스",
                         "device_unavailable": "기기 사용불가",
                         "devices": "{count} {count, plural,\none{개의 기기}\nother{개의 기기}\n}",
-                        "disable_error": "통합구성요소 활성화 혹은 비활성화 실패",
-                        "disable_restart_confirm": "이 통합 구성요소를 비활성화하려면 Home Assistant를 다시 시작해주세요",
                         "disable": {
                             "disable_confirm": "이 구성 항목을 비활성화하시겠습니까? 해당 기기 및 구성요소가 비활성화됩니다.",
                             "disabled": "비활성화됨",
@@ -2235,6 +2258,8 @@
                             },
                             "disabled_cause": "{cause}에 의해 비활성화되었습니다"
                         },
+                        "disable_error": "통합구성요소 활성화 혹은 비활성화 실패",
+                        "disable_restart_confirm": "이 통합 구성요소를 비활성화하려면 Home Assistant를 다시 시작해주세요",
                         "disabled_polling": "데이터 업데이트를 위한 자동 폴링 비활성화",
                         "documentation": "관련 문서",
                         "enable_restart_confirm": "이 통합 구성요소를 활성화하려면 Home Assistant를 다시 시작해주세요",
@@ -2242,11 +2267,9 @@
                         "entity_unavailable": "구성요소 사용불가",
                         "firmware": "펌웨어: {version}",
                         "hub": "연결 경유 대상",
-                        "logs": "로그",
                         "manuf": "{manufacturer} 제조",
                         "no_area": "영역 없음",
                         "not_loaded": "로드되지 않음",
-                        "options": "옵션",
                         "provided_by_custom_integration": "사용자 통합구성요소",
                         "reload": "다시 읽어오기",
                         "reload_confirm": "통합 구성요소를 다시 읽어 들였습니다",
@@ -2278,7 +2301,11 @@
                             "open_site": "웹사이트 열기"
                         },
                         "finish": "완료",
-                        "loading_first_time": "통합 구성요소가 설치되는 동안 기다려주세요",
+                        "loading": {
+                            "fallback_title": "통합구성요소",
+                            "loading_flow": "{integration} 을 설정하는 동안 잠시 기다려 주십시오.",
+                            "loading_step": "{integration} 다음 단계 로드 중"
+                        },
                         "next": "다음",
                         "not_all_required_fields": "필수 입력란이 모두 채워지지 않았습니다.",
                         "not_loaded": "통합 구성요소를 불러올 수 없습니다. Home Assistant를 다시 시작해주세요.",
@@ -2295,7 +2322,6 @@
                     "details": "통합 구성요소 상세정보",
                     "disable": {
                         "disabled_integrations": "{number}개의 비활성화된 통합 구성요소",
-                        "hide_disabled": "비활성화된 통합 구성요소 숨기기",
                         "show": "표시하기",
                         "show_disabled": "비활성화된 통합 구성요소 표시하기"
                     },
@@ -2306,7 +2332,6 @@
                         "confirm_delete_ignore_title": "{name} 무시를 중지하시겠습니까?",
                         "confirm_ignore": "이 통합 구성요소를 설정하지 않으시겠습니까? 오른쪽 상단의 오버플로 메뉴에서 '무시된 통합 구성요소 표시하기'를 클릭하여 이 작업을 취소할 수 있습니다.",
                         "confirm_ignore_title": "발견된 {name} 기기를 무시하시겠습니까?",
-                        "hide_ignored": "무시된 통합 구성요소 숨기기",
                         "ignore": "무시",
                         "ignored": "무시된 통합 구성요소",
                         "show_ignored": "무시된 통합 구성요소 표시하기",
@@ -2426,7 +2451,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "구성하기",
                     "description_listen": "토픽 내용 들어보기",
                     "description_publish": "패킷 발행",
                     "listening_to": "토픽 청취 중",
@@ -2440,7 +2464,6 @@
                     "topic": "토픽"
                 },
                 "ozw": {
-                    "button": "구성하기",
                     "common": {
                         "controller": "컨트롤러",
                         "instance": "인스턴스",
@@ -2465,6 +2488,11 @@
                         "nodes": "노드",
                         "select_instance": "인스턴스 선택하기"
                     },
+                    "network": {
+                        "header": "네트워크 관리",
+                        "introduction": "네트워크 전체 기능을 관리합니다.",
+                        "node_count": "{count}개 노드"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "모든 노드가 쿼리되었습니다",
@@ -2485,10 +2513,9 @@
                         "starting": "시작 중",
                         "unknown": "알 수 없음"
                     },
-                    "network": {
-                        "header": "네트워크 관리",
-                        "introduction": "네트워크 전체 기능을 관리합니다.",
-                        "node_count": "{count}개 노드"
+                    "node": {
+                        "button": "노드 세부 정보",
+                        "not_found": "노드를 찾을 수 없습니다"
                     },
                     "node_config": {
                         "header": "노드 구성",
@@ -2518,10 +2545,6 @@
                         "versions": "펌웨어 및 명령 클래스 버전에 대한 정보 가져오기",
                         "wakeup": "절전 해제 대기열 및 메시지에 대한 지원 설정"
                     },
-                    "node": {
-                        "button": "노드 세부 정보",
-                        "not_found": "노드를 찾을 수 없습니다"
-                    },
                     "nodes_table": {
                         "failed": "실패함",
                         "id": "ID",
@@ -2664,10 +2687,12 @@
                         },
                         "save_script": "스크립트 저장",
                         "sequence": "시퀀스",
-                        "sequence_sentence": "이 스크립트의 동작 시퀀스."
+                        "sequence_sentence": "이 스크립트의 동작 시퀀스.",
+                        "show_trace": "추적 표시하기"
                     },
                     "picker": {
                         "add_script": "스크립트 추가하기",
+                        "dev_script": "스크립트 디버그",
                         "duplicate": "복제하기",
                         "duplicate_script": "스크립트 복제하기",
                         "edit_script": "스크립트 편집하기",
@@ -2824,7 +2849,6 @@
                         "search_again": "다시 찾기",
                         "spinner": "ZHA Zigbee 기기를 찾고있습니다..."
                     },
-                    "button": "구성하기",
                     "cluster_attributes": {
                         "attributes_of_cluster": "선택된 클러스터의 속성",
                         "get_zigbee_attribute": "Zigbee 속성 가져오기",
@@ -2854,12 +2878,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "바로 가기",
-                        "update_button": "구성 업데이트",
-                        "zha_options": {
-                            "default_light_transition": "조명 전환 시간 기본 값(초)",
-                            "enable_identify_on_join": "장치가 네트워크에 연결될 때 식별 효과 활성화",
-                            "title": "전역 옵션"
-                        }
+                        "update_button": "구성 업데이트"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "구성이 완료되었습니다",
@@ -2941,123 +2960,7 @@
                     "introduction": "지역을 사용하면 지구 상의 특정 위치를 지정할 수 있습니다. 구성원이 지역 내에 있으면 구성요소 상태에서 지역의 이름을 가져옵니다. 자동화 설정 내에서 지역을 트리거 또는 조건으로 사용할 수도 있습니다.",
                     "no_zones_created_yet": "아직 설정한 지역이 없는 것 같습니다."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "연결 거부하기",
-                        "controller_in_inclusion_mode": "Z-Wave 컨트롤러가 이제 연결 허용 모드에 있습니다",
-                        "follow_device_instructions": "기기를 연결하려면 기기의 설명서를 따라주세요.",
-                        "inclusion_failed": "노드를 추가할 수 없습니다. 자세한 내용은 로그를 확인해주세요.",
-                        "inclusion_finished": "노드가 추가되었습니다. 백그라운드에서 노드 설정을 마치면 모든 구성요소가 표시되는 데 몇 분 정도 걸릴 수 있습니다.",
-                        "interview_failed": "장치 인터뷰에 실패했습니다. 로그에서 추가 정보를 확인할 수 있습니다.",
-                        "interview_started": "장치가 인터뷰중입니다. 시간이 좀 걸릴 수 있습니다.",
-                        "introduction": "이 마법사는 Z-Wave 네트워크에 노드를 추가하는 과정을 안내해드립니다.",
-                        "secure_inclusion_warning": "보안 기기에는 추가 대역폭이 필요합니다. 보안 기기가 너무 많으면 Z-Wave 네트워크의 속도가 느려질 수 있습니다. 잠금장치나 차고 문 개폐기와 같이 보안이 필요한 기기에만 보안 포함을 사용하는 것이 좋습니다.",
-                        "start_inclusion": "연결 시작하기",
-                        "start_secure_inclusion": "암호화 연결 시작하기",
-                        "title": "Z-Wave 노드 추가하기",
-                        "use_secure_inclusion": "암호화 연결 사용하기",
-                        "view_device": "기기 보기"
-                    },
-                    "button": "구성",
-                    "common": {
-                        "add_node": "노드 추가하기",
-                        "close": "닫기",
-                        "heal_network": "네트워크 복구",
-                        "home_id": "집 ID",
-                        "network": "네트워크",
-                        "node_id": "노드 ID",
-                        "reconfigure_server": "서버 재구성",
-                        "remove_node": "노드 제거하기"
-                    },
-                    "dashboard": {
-                        "driver_version": "드라이버 버전",
-                        "dump_dead_nodes_text": "일부 노드가 응답하지 않고 작동하지 않는 것 같습니다. 이러한 항목은 완전히 내보내지지 않습니다.",
-                        "dump_dead_nodes_title": "일부 노드가 작동하지 않습니다",
-                        "dump_debug": "문제 진단에 도움이 되는 네트워크 덤프 내려받기",
-                        "dump_not_ready_confirm": "내려받기",
-                        "dump_not_ready_text": "모든 노드가 준비되지 않은 상태에서 내보내기를 생성하면 필요한 데이터가 누락될 수 있습니다. 네트워크에 모든 노드를 등록 할 시간을 주세요. 덤프를 계속하시겠습니까?",
-                        "dump_not_ready_title": "모든 노드가 아직 준비되지 않았습니다",
-                        "header": "Z-Wave 네트워크를 관리합니다",
-                        "home_id": "집 ID",
-                        "introduction": "Z-Wave 네트워크 및 Z-Wave 노드를 관리합니다",
-                        "nodes_ready": "노드 준비 완료",
-                        "server_version": "서버 버전"
-                    },
-                    "device_info": {
-                        "device_config": "기기 구성",
-                        "node_ready": "노드 준비",
-                        "node_status": "노드 상태",
-                        "zwave_info": "Z-Wave 정보"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "네트워크 복구가 취소되었습니다.",
-                        "healing_complete": "네트워크 복구가 완료되었습니다.",
-                        "healing_failed": "복구에 실패했습니다. 로그에서 추가 정보를 확인할 수 있습니다.",
-                        "in_progress": "네트워크 복구가 진행 중입니다. 시간이 좀 걸립니다.",
-                        "introduction": "Z-Wave 네트워크 복구를 시작합니다. 네트워크 복구 시 모든 장치가 컨트롤러와의 경로를 재설정하며 최근 장치나 컨트롤러의 위치를 이동 한 경우 권장됩니다.",
-                        "run_in_background": "이 대화 상자를 닫을 수 있으며 네트워크 복구는 백그라운드에서 계속됩니다.",
-                        "start_heal": "복구 시작",
-                        "stop_heal": "복구 중지",
-                        "title": "Z-Wave 네트워크 복구",
-                        "traffic_warning": "복구 프로세스는 Z-Wave 네트워크에서 많은 양의 트래픽을 생성합니다. 이로 인해 치료가 진행되는 동안 장치가 느리게 (또는 전혀 응답하지 않을) 수 있습니다."
-                    },
-                    "logs": {
-                        "log_level": "로그 레벨",
-                        "log_level_changed": "로그 레벨이 변경되었습니다: {level}",
-                        "subscribed_to_logs": "Z-Wave JS 로그 메시지 수신 ...",
-                        "title": "Z-Wave JS 로그"
-                    },
-                    "navigation": {
-                        "logs": "로그",
-                        "network": "네트워크"
-                    },
-                    "network_status": {
-                        "connected": "연결됨",
-                        "connecting": "연결 중",
-                        "unknown": "알 수 없음"
-                    },
-                    "node_config": {
-                        "attribution": "기기를 구성하는 매개 변수 및 설명은 {device_database}에서 제공됩니다",
-                        "battery_device_notice": "배터리 방식 기기의 구성을 업데이트하려면 기기가 절전 해제된 상태이어야 합니다. 기기의 절전 모드를 해제하는 방법은 기기의 설명서를 참조해주세요.",
-                        "error_device_not_found": "기기를 찾을 수 없습니다",
-                        "header": "Z-Wave 기기 구성",
-                        "introduction": "선택한 기기(노드)의 매개 변수를 관리하고 조정합니다.",
-                        "parameter_is_read_only": "이 매개 변수는 읽기 전용입니다.",
-                        "set_param_accepted": "매개 변수가 업데이트되었습니다.",
-                        "set_param_error": "오류가 발생했습니다.",
-                        "set_param_queued": "장치의 절전모드가 해제되면 매개 변수가 업데이트됩니다.",
-                        "zwave_js_device_database": "Z-Wave JS 기기 데이터베이스"
-                    },
-                    "node_status": {
-                        "alive": "사용가능",
-                        "asleep": "절전",
-                        "awake": "절전해제",
-                        "dead": "사용불가",
-                        "unknown": "알 수 없음"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "재인터뷰를 시작하기 전에 배터리 전원 장치의 절전 모드를 해제해야 합니다. 절전 모드를 해제하는 방법은 기기 설명서를 참조하십시오.",
-                        "in_progress": "장치가 인터뷰중입니다. 시간이 좀 걸릴 수 있습니다.",
-                        "interview_complete": "장치 인터뷰가 완료되었습니다.",
-                        "interview_failed": "장치 인터뷰에 실패했습니다. 로그에서 정보를 확인할 수 있습니다.",
-                        "introduction": "Z-Wave 네트워크 상의 장치를 다시 인터뷰합니다. 장치가 사라지거나 오동작할 경우에 이 기능을 사용하십시오.",
-                        "run_in_background": "이 대화 상자를 닫을 수 있으며 인터뷰는 백그라운드에서 계속됩니다.",
-                        "start_reinterview": "재인터뷰 시작",
-                        "title": "Z-Wave 장치 재인터뷰"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "제외 취소하기",
-                        "controller_in_exclusion_mode": "Z-Wave 컨트롤러가 이제 제외 모드에 있습니다",
-                        "exclusion_failed": "노드를 제거할 수 없습니다. 자세한 내용은 로그를 확인해주세요.",
-                        "exclusion_finished": "Z-Wave 네트워크에서 {id} 노드가 제거되었습니다.",
-                        "follow_device_instructions": "기기를 제거하려면 기기의 설명서를 따라주세요.",
-                        "introduction": "Z-Wave 네트워크에서 노드를 제거하고 Home Assistant에서 연결된 기기와 구성요소를 제거합니다.",
-                        "start_exclusion": "제외 시작하기",
-                        "title": "Z-Wave 노드 제거하기"
-                    }
-                },
                 "zwave": {
-                    "button": "구성하기",
                     "common": {
                         "index": "색인",
                         "instance": "인스턴스",
@@ -3146,6 +3049,144 @@
                     "values": {
                         "header": "노드 값"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "연결 거부하기",
+                        "controller_in_inclusion_mode": "Z-Wave 컨트롤러가 이제 연결 허용 모드에 있습니다",
+                        "follow_device_instructions": "기기를 연결하려면 기기의 설명서를 따라주세요.",
+                        "inclusion_failed": "노드를 추가할 수 없습니다. 자세한 내용은 로그를 확인해주세요.",
+                        "inclusion_finished": "노드가 추가되었습니다.",
+                        "interview_failed": "장치 인터뷰에 실패했습니다. 로그에서 추가 정보를 확인할 수 있습니다.",
+                        "interview_started": "장치가 인터뷰중입니다. 시간이 좀 걸릴 수 있습니다.",
+                        "introduction": "이 마법사는 Z-Wave 네트워크에 노드를 추가하는 과정을 안내해드립니다.",
+                        "secure_inclusion_warning": "보안 기기에는 추가 대역폭이 필요합니다. 보안 기기가 너무 많으면 Z-Wave 네트워크의 속도가 느려질 수 있습니다. 잠금장치나 차고 문 개폐기와 같이 보안이 필요한 기기에만 보안 포함을 사용하는 것이 좋습니다.",
+                        "start_inclusion": "연결 시작하기",
+                        "start_secure_inclusion": "암호화 연결 시작하기",
+                        "title": "Z-Wave 노드 추가하기",
+                        "use_secure_inclusion": "암호화 연결 사용하기",
+                        "view_device": "기기 보기"
+                    },
+                    "common": {
+                        "add_node": "노드 추가하기",
+                        "close": "닫기",
+                        "heal_network": "네트워크 복구",
+                        "home_id": "집 ID",
+                        "network": "네트워크",
+                        "node_id": "노드 ID",
+                        "reconfigure_server": "서버 재구성",
+                        "remove_node": "노드 제거하기",
+                        "source": "소스"
+                    },
+                    "dashboard": {
+                        "driver_version": "드라이버 버전",
+                        "dump_dead_nodes_text": "일부 노드가 응답하지 않고 작동하지 않는 것 같습니다. 이러한 항목은 완전히 내보내지지 않습니다.",
+                        "dump_dead_nodes_title": "일부 노드가 작동하지 않습니다",
+                        "dump_debug": "문제 진단에 도움이 되는 네트워크 덤프 내려받기",
+                        "dump_not_ready_confirm": "내려받기",
+                        "dump_not_ready_text": "모든 노드가 준비되지 않은 상태에서 내보내기를 생성하면 필요한 데이터가 누락될 수 있습니다. 네트워크에 모든 노드를 등록 할 시간을 주세요. 덤프를 계속하시겠습니까?",
+                        "dump_not_ready_title": "모든 노드가 아직 준비되지 않았습니다",
+                        "header": "Z-Wave 네트워크를 관리합니다",
+                        "home_id": "집 ID",
+                        "introduction": "Z-Wave 네트워크 및 Z-Wave 노드를 관리합니다",
+                        "nodes_ready": "노드 준비 완료",
+                        "server_version": "서버 버전"
+                    },
+                    "device_info": {
+                        "device_config": "기기 구성",
+                        "heal_node": "노드 복구",
+                        "node_ready": "노드 준비",
+                        "node_status": "노드 상태",
+                        "reinterview_device": "장치 재인터뷰",
+                        "remove_failed": "실패한 장치 제거",
+                        "zwave_info": "Z-Wave 정보"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "네트워크 복구가 취소되었습니다.",
+                        "healing_complete": "네트워크 복구가 완료되었습니다.",
+                        "healing_failed": "복구에 실패했습니다. 로그에서 추가 정보를 확인할 수 있습니다.",
+                        "in_progress": "네트워크 복구가 진행 중입니다. 시간이 좀 걸립니다.",
+                        "introduction": "Z-Wave 네트워크 복구를 시작합니다. 네트워크 복구 시 모든 장치가 컨트롤러와의 경로를 재설정하며 최근 장치나 컨트롤러의 위치를 이동 한 경우 권장됩니다.",
+                        "run_in_background": "이 대화 상자를 닫을 수 있으며 네트워크 복구는 백그라운드에서 계속됩니다.",
+                        "start_heal": "복구 시작",
+                        "stop_heal": "복구 중지",
+                        "title": "Z-Wave 네트워크 복구",
+                        "traffic_warning": "복구 프로세스는 Z-Wave 네트워크에서 많은 양의 트래픽을 생성합니다. 이로 인해 치료가 진행되는 동안 장치가 느리게 (또는 전혀 응답하지 않을) 수 있습니다."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} 이(가) 복구되었습니다.",
+                        "healing_failed": "{device} 복구할 수 없습니다.",
+                        "healing_failed_check_logs": "추가 정보는 로그에서 확인할 수 있습니다.",
+                        "in_progress": "{device} 복구가 진행 중입니다.",
+                        "introduction": "컨트롤러에 대한 경로를 다시 업데이트하도록 {device} 장치에 통보합니다.  최근에 장치 또는 컨트롤러를 이동한 경우 통신 문제를 해결하는 데 도움이 될 수 있습니다.",
+                        "network_heal_in_progress": "Z-Wave 네트워크 복구가 이미 진행 중입니다. 개별 장치의 복구가 완료될 때까지 기다리십시오.",
+                        "start_heal": "장치 복구",
+                        "title": "Z-Wave 장치 복구",
+                        "traffic_warning": "복구 과정은 Z-Wave 네트워크에서 많은 양의 트래픽을 생성합니다. 이로 인해 복구가 진행되는 동안 장치가 느리게(또는 반응 없이) 응답할 수 있습니다."
+                    },
+                    "logs": {
+                        "log_level": "로그 레벨",
+                        "log_level_changed": "로그 레벨이 변경되었습니다: {level}",
+                        "subscribed_to_logs": "Z-Wave JS 로그 메시지 수신 ...",
+                        "title": "Z-Wave JS 로그"
+                    },
+                    "navigation": {
+                        "logs": "로그",
+                        "network": "네트워크"
+                    },
+                    "network_status": {
+                        "connected": "연결됨",
+                        "connecting": "연결 중",
+                        "unknown": "알 수 없음"
+                    },
+                    "node_config": {
+                        "attribution": "기기를 구성하는 매개 변수 및 설명은 {device_database}에서 제공됩니다",
+                        "battery_device_notice": "배터리 방식 기기의 구성을 업데이트하려면 기기가 절전 해제된 상태이어야 합니다. 기기의 절전 모드를 해제하는 방법은 기기의 설명서를 참조해주세요.",
+                        "error_device_not_found": "기기를 찾을 수 없습니다",
+                        "header": "Z-Wave 기기 구성",
+                        "introduction": "선택한 기기(노드)의 매개 변수를 관리하고 조정합니다.",
+                        "parameter": "매개변수",
+                        "parameter_is_read_only": "이 매개 변수는 읽기 전용입니다.",
+                        "set_param_accepted": "매개 변수가 업데이트되었습니다.",
+                        "set_param_error": "오류가 발생했습니다.",
+                        "set_param_queued": "장치의 절전모드가 해제되면 매개 변수가 업데이트됩니다.",
+                        "zwave_js_device_database": "Z-Wave JS 기기 데이터베이스"
+                    },
+                    "node_status": {
+                        "alive": "사용가능",
+                        "asleep": "절전",
+                        "awake": "절전해제",
+                        "dead": "사용불가",
+                        "unknown": "알 수 없음"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "재인터뷰를 시작하기 전에 배터리 전원 장치의 절전 모드를 해제해야 합니다. 절전 모드를 해제하는 방법은 기기 설명서를 참조하십시오.",
+                        "in_progress": "장치가 인터뷰중입니다. 시간이 좀 걸릴 수 있습니다.",
+                        "interview_complete": "장치 인터뷰가 완료되었습니다.",
+                        "interview_failed": "장치 인터뷰에 실패했습니다. 로그에서 정보를 확인할 수 있습니다.",
+                        "introduction": "Z-Wave 네트워크 상의 장치를 다시 인터뷰합니다. 장치가 사라지거나 오동작할 경우에 이 기능을 사용하십시오.",
+                        "run_in_background": "이 대화 상자를 닫을 수 있으며 인터뷰는 백그라운드에서 계속됩니다.",
+                        "start_reinterview": "재인터뷰 시작",
+                        "title": "Z-Wave 장치 재인터뷰"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "장치 제거가 진행 중입니다.",
+                        "introduction": "Z-Wave 네트워크에서 실패한 장치를 제거하십시오. 기기가 고장 등으로 정상적으로 제외할 수 없는 경우에 사용합니다.",
+                        "removal_failed": "Z-Wave 네트워크에서 장치를 제거할 수 없습니다.",
+                        "removal_finished": "Z-Wave 네트워크에서 {id} 노드가 제거되었습니다.",
+                        "remove_device": "장치 제거",
+                        "title": "실패한 Z-Wave 장치 제거"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "제외 취소하기",
+                        "controller_in_exclusion_mode": "Z-Wave 컨트롤러가 이제 제외 모드에 있습니다",
+                        "exclusion_failed": "노드를 제거할 수 없습니다. 자세한 내용은 로그를 확인해주세요.",
+                        "exclusion_finished": "Z-Wave 네트워크에서 {id} 노드가 제거되었습니다.",
+                        "follow_device_instructions": "기기를 제거하려면 기기의 설명서를 따라주세요.",
+                        "introduction": "Z-Wave 네트워크에서 노드를 제거하고 Home Assistant에서 연결된 기기와 구성요소를 제거합니다.",
+                        "start_exclusion": "제외 시작하기",
+                        "title": "Z-Wave 노드 제거하기"
+                    }
                 }
             },
             "custom": {
@@ -3228,31 +3269,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "뒤로가기",
-                "supervisor": {
-                    "ask": "도움 요청하기",
-                    "observer": "Observer 확인하기",
-                    "reboot": "호스트 재부팅 시도하기",
-                    "system_health": "시스템 상태 확인하기",
-                    "title": "Supervisor 패널을 불러올 수 없습니다!",
-                    "wait": "방금 시작한 경우 Supervisor가 완전히 시작되기까지 잠시 기다려주세요."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "지난 주",
-                    "this_week": "이번 주",
-                    "today": "오늘",
-                    "yesterday": "어제"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "지난 주",
-                    "this_week": "이번 주",
-                    "today": "오늘",
-                    "yesterday": "어제"
+            "energy": {
+                "charts": {
+                    "by_device": "장치별 소비량",
+                    "solar": "태양광",
+                    "stat_house_energy_meter": "총 에너지 소비량"
+                },
+                "setup": {
+                    "back": "뒤로",
+                    "done": "내 에너지 대시보드를 보여주세요!",
+                    "next": "다음"
                 }
             },
             "lovelace": {
@@ -3366,7 +3392,6 @@
                         "entities": {
                             "description": "구성요소 카드는 가장 일반적인 유형의 카드입니다. 항목을 목록으로 그룹화합니다.",
                             "edit_special_row": "편집 버튼을 클릭하여 이 행의 세부 정보 보기",
-                            "entity_row_editor": "구성요소 행 편집기",
                             "entity_row": {
                                 "attribute": "속성",
                                 "button": "버튼",
@@ -3378,6 +3403,7 @@
                                 "section": "섹션",
                                 "weblink": "웹 링크"
                             },
+                            "entity_row_editor": "구성요소 행 편집기",
                             "name": "구성요소 모음",
                             "secondary_info_values": {
                                 "brightness": "밝기",
@@ -3404,6 +3430,7 @@
                         "gauge": {
                             "description": "게이지 카드는 센서 데이터를 시각적으로 볼 수 있는 기본 카드입니다.",
                             "name": "게이지",
+                            "needle_gauge": "바늘 게이지로 표시하시겠습니까?",
                             "severity": {
                                 "define": "게이지 구간 정의하기",
                                 "green": "초록",
@@ -3416,6 +3443,7 @@
                             "attribute": "속성",
                             "camera_image": "카메라 구성요소",
                             "camera_view": "카메라 뷰",
+                            "days_to_show": "표시할 날짜",
                             "double_tap_action": "더블 탭 동작",
                             "entities": "구성요소",
                             "entity": "구성요소",
@@ -3529,6 +3557,10 @@
                             "integration_not_loaded": "이 카드를 설정하려면 `shopping_list` 통합 구성요소가 필요합니다.",
                             "name": "장보기 목록"
                         },
+                        "statistics-graph": {
+                            "description": "기록 그래프 카드를 사용하면 나열된 각 구성요소에 대한 그래프를 표시할 수 있습니다.",
+                            "name": "통계 그래프"
+                        },
                         "thermostat": {
                             "description": "온도 조절기 카드는 냉난방 기기를 제어합니다. 구성요소의 온도와 모드를 변경할 수 있습니다.",
                             "name": "온도 조절기"
@@ -3598,6 +3630,12 @@
                         "tab_badges": "배지",
                         "tab_settings": "설정",
                         "tab_visibility": "보기 권한",
+                        "type": "보기 유형",
+                        "types": {
+                            "masonry": "Masonry(기본값)",
+                            "panel": "패널(카드 1개)",
+                            "sidebar": "사이드바"
+                        },
                         "visibility": {
                             "select_users": "이 뷰를 볼 수 있는 사용자를 선택해주세요"
                         }
@@ -3652,7 +3690,6 @@
                         "unsaved_changes": "저장되지 않은 변경사항"
                     },
                     "save_config": {
-                        "cancel": "아닙니다",
                         "close": "닫기",
                         "empty_config": "비어있는 대시보드로 시작",
                         "header": "Lovelace UI 직접 관리하기",
@@ -3681,8 +3718,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "패널 모드는 첫 번째 카드를 전체 너비로 보여줍니다. 이 뷰에서는 다른 카드와 배지는 보여지지 않습니다.",
-                            "title": "패널 모드",
                             "warning_multiple_cards": "이 뷰에는 카드가 두 개 이상 포함되어 있지만 패널 모드는 한 개의 카드만 표시할 수 있습니다."
                         }
                     }
@@ -3885,8 +3920,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "다음",
-                    "intro": "인스턴스의 분석 내용을 공유합니다. 이 데이터는 {link}에서 공개적으로 사용될 수 있습니다"
+                    "finish": "다음"
                 },
                 "core-config": {
                     "button_detect": "탐색",
@@ -3910,15 +3944,13 @@
                     "confirm_password": "스냅샷 비밀번호 확인",
                     "description": "이전 스냅숏에서 복원할 수 있습니다.",
                     "folders": "폴더",
-                    "full_snapshot": "전체 스냅샷",
                     "hide_log": "전체 로그 숨기기",
                     "in_progress": "복원 중",
-                    "partial_snapshot": "부분 스냅샷",
-                    "password": "스냅샷 비밀번호",
+                    "password": "비밀번호",
                     "password_protection": "비밀번호 보호",
-                    "select_type": "무엇을 복원할지 선택하세요",
+                    "select_type": "복원 할 항목 선택",
                     "show_log": "전체 로그 표시하기",
-                    "type": "스냅샷 종류"
+                    "type": "유형"
                 },
                 "user": {
                     "create_account": "계정 만들기",
@@ -3995,6 +4027,12 @@
                     "prompt_copy_token": "액세스 토큰을 복사하세요. 이 안내는 다시 표시되지 않습니다.",
                     "prompt_name": "토큰 이름을 지어주세요."
                 },
+                "mfa": {
+                    "confirm_disable": "{name}을(를) 비활성화하시겠습니까?",
+                    "disable": "비활성화",
+                    "enable": "활성화",
+                    "header": "다단계 인증 모듈"
+                },
                 "mfa_setup": {
                     "close": "닫기",
                     "step_done": "{step} 설치가 완료되었습니다",
@@ -4002,12 +4040,6 @@
                     "title_aborted": "취소됨",
                     "title_success": "성공!"
                 },
-                "mfa": {
-                    "confirm_disable": "{name}을(를) 비활성화하시겠습니까?",
-                    "disable": "비활성화",
-                    "enable": "활성화",
-                    "header": "다단계 인증 모듈"
-                },
                 "number_format": {
                     "description": "숫자 형식을 선택합니다.",
                     "dropdown_label": "숫자 형식",
diff --git a/translations/frontend/lb.json b/translations/frontend/lb.json
index 29201c41aa..832b42dacf 100644
--- a/translations/frontend/lb.json
+++ b/translations/frontend/lb.json
@@ -26,6 +26,14 @@
         "shopping_list": "Akafslëscht",
         "states": "Iwwersiicht"
     },
+    "state": {
+        "default": {
+            "off": "Aus",
+            "on": "Un",
+            "unavailable": "Net erreechbar",
+            "unknown": "Onbekannt"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +102,6 @@
             "not_home": "Ënnerwee"
         }
     },
-    "state": {
-        "default": {
-            "off": "Aus",
-            "on": "Un",
-            "unavailable": "Net erreechbar",
-            "unknown": "Onbekannt"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -217,6 +217,18 @@
                 "get_logs": "Feeler beim liesen vun add-on logs, {error}"
             }
         },
+        "backup": {
+            "addons": "Add-ons",
+            "could_not_create": "Feeler beim erstellen vum Backup",
+            "create": "Erstellen",
+            "create_blocked_not_running": "Ee Backup erstellen ass fir de Moment net méiglech well de System an engem {state} Zoustand ass.",
+            "enter_password": "Gëff ee Passwuert an",
+            "folders": "Dossieren",
+            "name": "Numm",
+            "password": "Passwuert",
+            "password_protection": "Passwuert Protektioun",
+            "type": "Typ"
+        },
         "common": {
             "close": "Zoumaachen",
             "description": "Beschreiwung",
@@ -291,9 +303,6 @@
                 "text": "Soll den Add-on mat dengem Ännerungen frësch gestart ginn?"
             },
             "update": {
-                "create_snapshot": "Erstell ee Snapshot vun {name} virun der Aktualiséierung",
-                "snapshot": "Snapshot",
-                "snapshotting": "Snapshot vun {name} gëtt erstallt",
                 "updating": "Aktualiséiert {name} op Versioun {version}"
             }
         },
@@ -303,34 +312,6 @@
             "faq_link": "Meng Home Assistant FAQ",
             "not_supported": "Dëse Redirect gëtt net vun  Denger Home Assistant Instanz ënnerstëtzt. Kuck de {link} fir déi ënnerstëtzte Redirects an d'Versioun fir déi se agefouert goufen."
         },
-        "snapshot": {
-            "addons": "Add-ons",
-            "available_snapshots": "Verfügbar Snapshoten",
-            "could_not_create": "Feeler beim erstellen vum Snapshot",
-            "create": "Erstellen",
-            "create_blocked_not_running": "Ee Snapshot erstellen ass fir de Moment net méiglech well de System an engem {state} Zoustand ass.",
-            "create_snapshot": "Snapshot erstellen",
-            "description": "Snapshots erlaaben Dir all Home Assistant Instanz Donnéeën einfach ze backupen an ze restauréieren.",
-            "enter_password": "Gëff ee Passwuert an",
-            "folder": {
-                "addons/local": "Lokal Add-ons",
-                "homeassistant": "Home Assistant Konfiguratioun",
-                "media": "Medien",
-                "share": "Deelen",
-                "ssl": "SSL"
-            },
-            "folders": "Dossieren",
-            "full_snapshot": "Komplette Snapshot",
-            "name": "Numm",
-            "no_snapshots": "Du hues nach keng Snapshoten.",
-            "partial_snapshot": "Deelweise Snapshot",
-            "password": "Passwuert",
-            "password_protected": "Duerch ee Passwuert geschützt",
-            "password_protection": "Passwuert Protektioun",
-            "security": "Sëcherheet",
-            "type": "Typ",
-            "upload_snapshot": "Snapshot eroplueden"
-        },
         "store": {
             "missing_addons": "Add-ons feelen ? Aktivéier den Avancéierte Modus an denger Benotzer Profil Säit",
             "no_results_found": "Keng Resultater fonnt am {repository}.",
@@ -730,10 +711,10 @@
                 "documentation": "Dokumentatioun",
                 "learn_adding_local_media": "Méi iwwert dobäisetze vun Medie an der {documentation} liesen.",
                 "local_media_files": "Placéier deng Video, Audio an Biller Dateien am Medie Dossier fir se kënnen duerch ze sichen an am Browser oder ënnerstëtzte Medie Spiller of ze spillen.",
+                "media-player-browser": "Media Player Browser",
                 "media_browsing_error": "Feeler beim duerchsiche vun de Medie",
                 "media_not_supported": "De Medie Spiller vum Browser ënnerstëtzt dëse typ vun Medie net",
                 "media_player": "Medie Spiller",
-                "media-player-browser": "Media Player Browser",
                 "no_items": "Keng Elementer",
                 "no_local_media_found": "Keng lokal Medie fonnt",
                 "no_media_folder": "Et gesäit sou aus wéi wann nach keen lokale Medie Dossier erstallt gouf.",
@@ -975,7 +956,6 @@
                         "integrations": "Integratioune",
                         "logs": "Logs",
                         "lovelace": "Lovelace Tableau de Bord",
-                        "navigate_to": "Navigéieren zu {panel}",
                         "person": "Persoune",
                         "scene": "Zeene",
                         "script": "Skripte",
@@ -1169,7 +1149,6 @@
                             "introduction": "Aktioune déi den Home Assistant ausféiert wann den Automatismus ausgeléist gouf.\n[Léier méi iwwert Aktiounen.](https://home-assistant.io/docs/automation/action/)",
                             "learn_more": "Méi iwwert Aktioune liesen",
                             "name": "Aktioun",
-                            "type_select": "Aktioun Typ",
                             "type": {
                                 "choose": {
                                     "add_option": "Optioun dobäisetzen",
@@ -1207,7 +1186,6 @@
                                 "repeat": {
                                     "label": "Widderhuelen",
                                     "sequence": "Aktiounen",
-                                    "type_select": "Widderhuelen Typ",
                                     "type": {
                                         "count": {
                                             "label": "Ziel"
@@ -1220,7 +1198,8 @@
                                             "conditions": "Während Konditiounen",
                                             "label": "Während"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Widderhuelen Typ"
                                 },
                                 "scene": {
                                     "label": "Zeen aktivéieren"
@@ -1240,6 +1219,7 @@
                                     "wait_template": "Waardenzäit Modell"
                                 }
                             },
+                            "type_select": "Aktioun Typ",
                             "unsupported_action": "Keng UI Ënnerstëtzung fir Aktioun: {action}"
                         },
                         "alias": "Numm",
@@ -1258,7 +1238,6 @@
                             "introduction": "Konditioune sinn een optionalen Deel a kënne benotzt gi fir ze bestëmme wann eng Aktioun ausgeféiert gëtt. ",
                             "learn_more": "Méi iwwert Konditioune liesen",
                             "name": "Konditioun",
-                            "type_select": "Typ vun Konditioun",
                             "type": {
                                 "and": {
                                     "label": "An"
@@ -1325,6 +1304,7 @@
                                     "zone": "Zon"
                                 }
                             },
+                            "type_select": "Typ vun Konditioun",
                             "unsupported_condition": "Keng UI Ënnerstëtzung fir Konditioun: {condition}"
                         },
                         "copy_to_clipboard": "An de Tëschespäicher kopéieren",
@@ -1364,7 +1344,6 @@
                             "introduction": "Een Ausléiser start de Prozess vun engem Automatismus. Et ass méiglech méi wéi een Ausléiser fir een Automatismus unzeginn. Wann een Ausléiser start validéiert Home Assistant d'Konditiounen a féiert - de Fall gesat - eng Aktioun aus.\n\n[Léier méi iwwert Ausléiser.](https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "Méi iwwert Ausléiser liesen",
                             "name": "Ausléiser",
-                            "type_select": "Typ vun Ausléiser",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1429,18 +1408,18 @@
                                     "label": "Modell",
                                     "value_template": "Wäerte Modell"
                                 },
-                                "time_pattern": {
-                                    "hours": "Stonnen",
-                                    "label": "Zäit Muster",
-                                    "minutes": "Minutten",
-                                    "seconds": "Sekonnen"
-                                },
                                 "time": {
                                     "at": "Um",
                                     "label": "Zäit",
                                     "type_input": "Wäert vun engem Datum/Zäit Helper",
                                     "type_value": "Fix Zäit"
                                 },
+                                "time_pattern": {
+                                    "hours": "Stonnen",
+                                    "label": "Zäit Muster",
+                                    "minutes": "Minutten",
+                                    "seconds": "Sekonnen"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1454,6 +1433,7 @@
                                     "zone": "Zon"
                                 }
                             },
+                            "type_select": "Typ vun Ausléiser",
                             "unsupported_platform": "Keng UI ënnerstëtzung fir Plattform: {platform}"
                         },
                         "unsaved_confirm": "Net gespäichert Ännerungen. Trotzdeem verloossen?"
@@ -1602,9 +1582,9 @@
                             "loading": "Lued ...",
                             "manage": "Verwalten",
                             "no_hooks_yet": "Et gesäit sou aus wéi wann nach keng webhooks benotzt ginn. Fänkt mam erstellen vun enger ",
+                            "no_hooks_yet2": " oder via erstellen vun ",
                             "no_hooks_yet_link_automation": "Webhook Automatisme",
                             "no_hooks_yet_link_integration": "webhook baséierter Integratioun",
-                            "no_hooks_yet2": " oder via erstellen vun ",
                             "title": "Webhooks"
                         }
                     },
@@ -1894,14 +1874,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Läschen",
-                    "filtering_by": "Filteren anhand vun",
-                    "show": "Uweisen"
-                },
-                "hassio": {
-                    "button": "Astellen"
-                },
                 "header": "Home Assistant astellen",
                 "helpers": {
                     "caption": "Helper",
@@ -1950,16 +1922,11 @@
                     "path_configuration": "Pad zur configuration.yaml: {path}",
                     "server": "server",
                     "source": "Quell:",
-                    "system_health_error": "System Gesondheet Komponent net gelueden. Setz 'system_health:' zur configuration.yaml dobäi",
                     "system_health": {
                         "manage": "Verwalten",
                         "more_info": "Méi Informatiounen"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Integratiouns Säit",
-                    "missing_zha": "Vermëss du ZHA Konfig. Tableau? Et ass op ZHA Entrée op der {integrations_page} geplënnert.",
-                    "missing_zwave": "Vermëss du Z-Wave Konfig. Tableau? Et ass op Z-Wave Entrée op der {integrations_page} geplënnert."
+                    },
+                    "system_health_error": "System Gesondheet Komponent net gelueden. Setz 'system_health:' zur configuration.yaml dobäi"
                 },
                 "integrations": {
                     "add_integration": "Integratioun dobäisetzen",
@@ -1990,7 +1957,6 @@
                         "manuf": "vun {manufacturer}",
                         "no_area": "Kee Beräich",
                         "not_loaded": "Net gelueden",
-                        "options": "Optiounen",
                         "reload": "Nei lueden",
                         "reload_confirm": "Integratioun gouf frësch gelueden",
                         "reload_restart_confirm": "Start Home Assistant nei fir dës Integratioun fäerdeg ze lueden",
@@ -2019,7 +1985,6 @@
                             "open_site": "Internetsäit opmaachen"
                         },
                         "finish": "Ofschléissen",
-                        "loading_first_time": "Waart w.e.g. während der Installatioun vun der Integratioun",
                         "not_all_required_fields": "Net all erfuerderlech Felder sinn ausgefëllt.",
                         "submit": "Ofschécken"
                     },
@@ -2037,7 +2002,6 @@
                         "confirm_delete_ignore_title": "Ophale mam ignoréieren vun {name}?",
                         "confirm_ignore": "Bass du sécher, dass Du dës Integratioun net wëlls ariichten? Du kanns dëst annuléieren andeems Du op 'Ignoréiert Integratiounen uweisen' am Menü uewe riets klicks.",
                         "confirm_ignore_title": "Entdeckung vun {name} ignoréieren?",
-                        "hide_ignored": "Ignoréiert Integratiounen verstoppen",
                         "ignore": "Ignoréieren",
                         "ignored": "Ignoréiert",
                         "show_ignored": "Ignoréiert Integratiounen uweisen",
@@ -2153,7 +2117,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Astellen",
                     "description_listen": "Sujet lauschteren",
                     "description_publish": "Ee Pak publizéieren",
                     "listening_to": "Lauschtert op",
@@ -2167,7 +2130,6 @@
                     "topic": "Sujet"
                 },
                 "ozw": {
-                    "button": "Astellen",
                     "common": {
                         "controller": "Kontroller",
                         "instance": "Instanz",
@@ -2191,6 +2153,11 @@
                         "nodes": "Nodes",
                         "select_instance": "Instanz auswielen"
                     },
+                    "network": {
+                        "header": "Verwaltung vum Netzwierk",
+                        "introduction": "Netzwierk wäit Funktioune verwalten",
+                        "node_count": "{count} nodes"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "All Nodes goufen ofgefrot",
@@ -2211,10 +2178,9 @@
                         "starting": "Start",
                         "unknown": "Onbekannt"
                     },
-                    "network": {
-                        "header": "Verwaltung vum Netzwierk",
-                        "introduction": "Netzwierk wäit Funktioune verwalten",
-                        "node_count": "{count} nodes"
+                    "node": {
+                        "button": "Node Detailler",
+                        "not_found": "Node net fonnt"
                     },
                     "node_config": {
                         "header": "Konfiguratioun vum Node",
@@ -2241,10 +2207,6 @@
                         "versions": "Informatioun kréien iwwert Firmware a Kommando Klass Versiounen",
                         "wakeup": "Ënnerstëtzung fir Erwäche Waardeschlaangen an Noriichten astellen"
                     },
-                    "node": {
-                        "button": "Node Detailler",
-                        "not_found": "Node net fonnt"
-                    },
                     "nodes_table": {
                         "failed": "Feeler",
                         "id": "ID",
@@ -2544,7 +2506,6 @@
                         "search_again": "Nach emol sichen",
                         "spinner": "Sicht no ZHA Zigbee Apparater..."
                     },
-                    "button": "Astellen",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attributer vum ausgewielten Cluster",
                         "get_zigbee_attribute": "Zigbee Attribut liesen",
@@ -2650,30 +2611,7 @@
                     "introduction": "Zonen erlaben Iech verschidde Regiounen op der Äerd ze spezifizéieren. Wann eng Persoun an enger Zone ass, hëlt de Status den Numm aus der Zone. Zonë kënnen och als Ausléiser oder als Konditioun an Automatisme benotzt ginn.",
                     "no_zones_created_yet": "Et gesäit sou aus wéi wann nach keng Zone erstallt goufen."
                 },
-                "zwave_js": {
-                    "dashboard": {
-                        "driver_version": "Driver Versioun",
-                        "dump_not_ready_confirm": "Eroflueden",
-                        "server_version": "Server Versioun"
-                    },
-                    "device_info": {
-                        "device_config": "Apparat ariichten"
-                    },
-                    "node_config": {
-                        "attribution": "Parameter fir d'Konfiguratioun vum Apparat a seng Beschréiwungen gin duerch {device_database} zur Verfügung gestallt.",
-                        "battery_device_notice": "Batterie bedriwwen Apparater mussen un sinn fir hier Konfiguratioun z'aktualiséieren. Kuck wegl d'Instruktiounen vum Hiersteller fir den Apparat unzeschalten.",
-                        "error_device_not_found": "Apparat net fonnt",
-                        "header": "Z-Wave Apparat Konfiguratioun",
-                        "introduction": "Verwalt a pass verschidde (node) spezifesch Konfiguratioun's Parameter vum Apparat un.",
-                        "parameter_is_read_only": "Dëse Parameter ass schréif geschützt",
-                        "zwave_js_device_database": "Z-Wave JS Apparat Datebank"
-                    },
-                    "node_status": {
-                        "unknown": "Onbekannt"
-                    }
-                },
                 "zwave": {
-                    "button": "Astellen",
                     "common": {
                         "index": "Index",
                         "instance": "Instanz",
@@ -2762,6 +2700,28 @@
                     "values": {
                         "header": "Wäerter vum Apparat"
                     }
+                },
+                "zwave_js": {
+                    "dashboard": {
+                        "driver_version": "Driver Versioun",
+                        "dump_not_ready_confirm": "Eroflueden",
+                        "server_version": "Server Versioun"
+                    },
+                    "device_info": {
+                        "device_config": "Apparat ariichten"
+                    },
+                    "node_config": {
+                        "attribution": "Parameter fir d'Konfiguratioun vum Apparat a seng Beschréiwungen gin duerch {device_database} zur Verfügung gestallt.",
+                        "battery_device_notice": "Batterie bedriwwen Apparater mussen un sinn fir hier Konfiguratioun z'aktualiséieren. Kuck wegl d'Instruktiounen vum Hiersteller fir den Apparat unzeschalten.",
+                        "error_device_not_found": "Apparat net fonnt",
+                        "header": "Z-Wave Apparat Konfiguratioun",
+                        "introduction": "Verwalt a pass verschidde (node) spezifesch Konfiguratioun's Parameter vum Apparat un.",
+                        "parameter_is_read_only": "Dëse Parameter ass schréif geschützt",
+                        "zwave_js_device_database": "Z-Wave JS Apparat Datebank"
+                    },
+                    "node_status": {
+                        "unknown": "Onbekannt"
+                    }
                 }
             },
             "custom": {
@@ -2838,33 +2798,6 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Zeréck goen",
-                "supervisor": {
-                    "ask": "No Hëllef froen",
-                    "observer": "Observateur iwwerpréiwen",
-                    "reboot": "Probéier ee Reboot vum Host",
-                    "system_health": "System Zoustand iwwerpréiwen",
-                    "title": "Konnt den Supervisor Panneau net lueden!",
-                    "wait": "Wanns Du just gestart hues, stell sécher dass den Supervisor genuch Zäit huet fir ze starten."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Läscht Woch",
-                    "this_week": "Dës Woch",
-                    "today": "Haut",
-                    "yesterday": "Gëschter"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Läscht Woch",
-                    "this_week": "Dës Woch",
-                    "today": "Haut",
-                    "yesterday": "Gëschter"
-                }
-            },
             "lovelace": {
                 "add_entities": {
                     "generated_unsupported": "Dës Funktioun kann nëmme benotzt gi wann dir d'Kontroll iwwert Lovelace iwwerholl hutt.",
@@ -2968,7 +2901,6 @@
                         "entities": {
                             "description": "D'Entitéite Kaart ass déi am meeschten allgemengen Zort Kaart. Si gruppéiert Entitéite gemeinsam a Lëschten.",
                             "edit_special_row": "Kuckt d'Detailer vun dëser Rei andeems Du op den Edit Knäppchen klicks",
-                            "entity_row_editor": "Entitéite Réih Editor",
                             "entity_row": {
                                 "attribute": "Attribut",
                                 "button": "Knäppchen",
@@ -2980,6 +2912,7 @@
                                 "section": "Sektioun",
                                 "weblink": "Web Link"
                             },
+                            "entity_row_editor": "Entitéite Réih Editor",
                             "name": "Entitéiten",
                             "secondary_info_values": {
                                 "brightness": "Hellegkeet",
@@ -3249,7 +3182,6 @@
                         "unsaved_changes": "Net gespäicherten Ännerungen"
                     },
                     "save_config": {
-                        "cancel": "Vergiess et",
                         "close": "Zoumaachen",
                         "empty_config": "Mat engem eidelen Tableau de Bord ufänken",
                         "header": "Kontroll iwwert Loveloce UI iwwerhuelen",
@@ -3278,8 +3210,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Dëst stellt déi éischt Kaart op voller Breet duer. Aner Kaarte oder Badge ginn net duergestallt.",
-                            "title": "Panel Modus?",
                             "warning_multiple_cards": "Dës Usiicht enthält méi wéi eng Kaart, mee eng Panneau Usiicht kann nëmmen 1 Kaart uweisen."
                         }
                     }
@@ -3497,10 +3427,15 @@
                 "intro": "Sidd Dir prett fir Äert Heem interessant ze maachen, Är Privatsphär ze garantéieren an enger weltwäiter Gemeinschaft bei ze trieden?",
                 "next": "Nächst",
                 "restore": {
-                    "description": "Alternativ kanns Du aus engem fréiere Snapshot restauréieren.",
+                    "addons": "Add-ons",
+                    "description": "Alternativ kanns Du aus engem fréiere Backup restauréieren.",
+                    "folders": "Dossieren",
                     "hide_log": "Komplette Log verstoppen",
                     "in_progress": "Restauratioun en cours",
-                    "show_log": "Komplette Log uweisen"
+                    "password": "Passwuert",
+                    "password_protection": "Passwuert Protektioun",
+                    "show_log": "Komplette Log uweisen",
+                    "type": "Typ"
                 },
                 "user": {
                     "create_account": "Kont erstellen",
@@ -3577,6 +3512,12 @@
                     "prompt_copy_token": "Kopéiert den Accèss Jeton. E gëtt nie méi ugewisen.",
                     "prompt_name": "Gëff dem Jeton ee Numm?"
                 },
+                "mfa": {
+                    "confirm_disable": "Sécher fir {name} ze desaktivéieren?",
+                    "disable": "Desaktivéieren",
+                    "enable": "Aktivéieren",
+                    "header": "Multi-Faktor Authentifikatioun's Module"
+                },
                 "mfa_setup": {
                     "close": "Zoumaachen",
                     "step_done": "Konfiguratioun ofgeschloss fir {step}",
@@ -3584,12 +3525,6 @@
                     "title_aborted": "Ofgebrach",
                     "title_success": "Succès!"
                 },
-                "mfa": {
-                    "confirm_disable": "Sécher fir {name} ze desaktivéieren?",
-                    "disable": "Desaktivéieren",
-                    "enable": "Aktivéieren",
-                    "header": "Multi-Faktor Authentifikatioun's Module"
-                },
                 "push_notifications": {
                     "add_device_prompt": {
                         "input_label": "Numm vum Apparat",
diff --git a/translations/frontend/lt.json b/translations/frontend/lt.json
index 1491572285..149c2997be 100644
--- a/translations/frontend/lt.json
+++ b/translations/frontend/lt.json
@@ -2,6 +2,7 @@
     "config_entry": {
         "disabled_by": {
             "device": "Įrenginys",
+            "integration": "Integracija",
             "user": "Vartotojas"
         }
     },
@@ -15,14 +16,24 @@
         "calendar": "Kalendorius",
         "config": "Konfigūracija",
         "developer_tools": "Kūrėjo įrankiai",
+        "energy": "Energija",
         "history": "Istorija",
         "logbook": "Veiksmų žurnalas",
         "mailbox": "Pašto dėžutė",
         "map": "Žemėlapis",
+        "media_browser": "Medijos naršyklė",
         "profile": "Vartotojo profilis",
         "shopping_list": "Pirkinių sąrašas",
         "states": "Valdymas"
     },
+    "state": {
+        "default": {
+            "off": "Išjungta",
+            "on": "Įjungta",
+            "unavailable": "(nepasiekiamas)",
+            "unknown": "Nežinoma"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -45,13 +56,20 @@
                 "comfort": "Komfortas",
                 "eco": "Eko",
                 "home": "Namai",
+                "none": "Joks",
                 "sleep": "Miegoti"
             }
         },
         "humidifier": {
             "mode": {
                 "auto": "Automatinis",
+                "away": "Išvykęs",
                 "baby": "Kūdikio",
+                "boost": "Padidinti",
+                "comfort": "Komfortas",
+                "eco": "Eko",
+                "home": "Namai",
+                "normal": "Normalus",
                 "sleep": "Miego"
             }
         }
@@ -65,7 +83,9 @@
             "armed_night": "Užrakinta",
             "arming": "Užrakinama",
             "disarmed": "Atrakinta",
-            "disarming": "Atrakinti"
+            "disarming": "Atrakinti",
+            "pending": "Vykdoma",
+            "triggered": "Paleidiklis"
         },
         "default": {
             "entity_not_found": "Objektas nerastas",
@@ -82,16 +102,28 @@
             "not_home": "Išvykęs"
         }
     },
-    "state": {
-        "default": {
-            "off": "Išjungta",
-            "on": "Įjungta",
-            "unavailable": "(nepasiekiamas)",
-            "unknown": "Nežinoma"
-        }
-    },
     "supervisor": {
         "addon": {
+            "configuration": {
+                "audio": {
+                    "default": "Numatytasis veiksmas",
+                    "header": "Garsas",
+                    "input": "Įvestis",
+                    "output": "Išvestis"
+                },
+                "network": {
+                    "container": "Konteineris",
+                    "disabled": "Išjungta",
+                    "header": "Tinklas",
+                    "host": "Host"
+                },
+                "options": {
+                    "edit_in_ui": "Redaguoti UI aplinkoje",
+                    "edit_in_yaml": "Redaguoti YAML aplinkoje",
+                    "header": "Parinktys",
+                    "invalid_yaml": "Neteisingas YAML"
+                }
+            },
             "dashboard": {
                 "action_error": {
                     "start_invalid_config": "Eiti į konfigūraciją"
@@ -128,6 +160,22 @@
                 "documentation": "Dokumentacija"
             }
         },
+        "backup": {
+            "addons": "Priedai",
+            "could_not_create": "Nepavyko sukurti momentinės kopijos",
+            "create": "Sukurti",
+            "created": "Sukurta",
+            "delete_backup_confirm": "ištrinti",
+            "enter_password": "Įveskite slaptažodį.",
+            "failed_to_delete": "Ištrinti nepavyko",
+            "folders": "Aplankai",
+            "name": "Pavadinimas",
+            "password": "Slaptažodis",
+            "passwords_not_matching": "Slaptažodžiai nesutampa",
+            "select_type": "Pasirinkite, ką atkurti",
+            "selected": "{number} pasirinkta",
+            "type": "Tipas"
+        },
         "common": {
             "cancel": "Atšaukti",
             "close": "Užverti",
@@ -158,7 +206,8 @@
             }
         },
         "dashboard": {
-            "addon_new_version": "Galima nauja versija"
+            "addon_new_version": "Galima nauja versija",
+            "addons": "Įdiegti įskiepiai"
         },
         "dialog": {
             "hardware": {
@@ -166,6 +215,7 @@
                 "device_path": "Įrenginio kelias",
                 "id": "ID",
                 "search": "Ieškoti įrenginių",
+                "subsystem": "Posistemė",
                 "title": "Įrenginiai"
             },
             "network": {
@@ -203,7 +253,6 @@
                 "text": "Ar norite iš naujo paleisti priedą su pakeitimais?"
             },
             "update": {
-                "create_snapshot": "Prieš naujinant sukurti {name} momentinę kopiją",
                 "updating": "{name} naujinama į versiją {version}"
             }
         },
@@ -214,28 +263,6 @@
             "dashboard": "Prietaisų skydelis",
             "system": "Sistema"
         },
-        "snapshot": {
-            "addons": "Priedai",
-            "could_not_create": "Nepavyko sukurti momentinės kopijos",
-            "create": "Sukurti",
-            "created": "Sukurta",
-            "delete_snapshot_confirm": "ištrinti",
-            "enter_password": "Įveskite slaptažodį.",
-            "failed_to_delete": "Ištrinti nepavyko",
-            "folder": {
-                "homeassistant": "„Home Assistant“ konfigūracija",
-                "share": "Dalintis"
-            },
-            "folders": "Aplankai",
-            "name": "Pavadinimas",
-            "no_snapshots": "Dar neturite momentinių kopijų.",
-            "password": "Slaptažodis",
-            "passwords_not_matching": "Slaptažodžiai nesutampa",
-            "security": "Saugumas",
-            "select_type": "Pasirinkite, ką atkurti",
-            "selected": "{number} pasirinkta",
-            "type": "Tipas"
-        },
         "store": {
             "no_results_found": "Rezultatų {repository} nerasta.",
             "registries": "Registrai",
@@ -259,6 +286,7 @@
             },
             "supervisor": {
                 "channel": "Kanalas",
+                "search": "Paieška",
                 "share_diagonstics_title": "Padėkite tobulinti Home Assistant",
                 "unhealthy_reason": {
                     "untrusted": "Aptiktas nepatikimas turinys"
@@ -275,17 +303,35 @@
         },
         "card": {
             "alarm_control_panel": {
+                "arm_away": "Išvykęs",
                 "arm_custom_bypass": "Individualizuotas apėjimas",
+                "arm_home": "Namų apsauga",
                 "arm_night": "Naktinė apsauga",
                 "clear_code": "Išvalyti",
-                "code": "Kodas"
+                "code": "Kodas",
+                "disarm": "Atrakinti"
+            },
+            "automation": {
+                "last_triggered": "Paskutinį kartą suaktyvinta",
+                "trigger": "Vykdyti veiksmus"
             },
             "camera": {
                 "not_available": "Vaizdas negalimas"
             },
             "climate": {
+                "away_mode": "Išvykimo režimas",
+                "current_temperature": "{name} esama temperatūra",
                 "currently": "Šiuo metu",
-                "on_off": "Įjungta / išjungta"
+                "fan_mode": "Ventiliatoriaus režimas",
+                "high": "aukštas",
+                "low": "žemas",
+                "on_off": "Įjungta / išjungta",
+                "operation": "Operacija",
+                "preset_mode": "Iš anksto nustatytas",
+                "target_humidity": "Norimas drėgnumas",
+                "target_temperature": "Norima temperatūra",
+                "target_temperature_entity": "{name} norima temperatūra",
+                "target_temperature_mode": "{name} norima temperatūra {mode}"
             },
             "counter": {
                 "actions": {
@@ -300,6 +346,9 @@
             },
             "fan": {
                 "direction": "Kryptis",
+                "forward": "Pirmyn",
+                "oscillate": "Sukasi",
+                "reverse": "Atgal",
                 "speed": "Greitis"
             },
             "humidifier": {
@@ -308,9 +357,11 @@
             "light": {
                 "brightness": "Ryškumas",
                 "color_temperature": "Spalvos temperatūra",
+                "effect": "Efektas",
                 "white_value": "Baltas ryškumas"
             },
             "lock": {
+                "code": "Kodas",
                 "lock": "Užrakinti",
                 "unlock": "Atrakinti"
             },
@@ -348,6 +399,13 @@
                     "turn_on": "Įjungti"
                 }
             },
+            "water_heater": {
+                "away_mode": "Išvykimo režimas",
+                "currently": "Šiuo metu",
+                "on_off": "Įjungta / išjungta",
+                "operation": "Operacija",
+                "target_temperature": "Norima temperatūra"
+            },
             "weather": {
                 "attributes": {
                     "air_pressure": "Atmosferos slėgis",
@@ -359,13 +417,21 @@
                 },
                 "cardinal_direction": {
                     "e": "R",
+                    "ene": "RŠR",
+                    "ese": "RPR",
                     "n": "Š",
                     "ne": "ŠR",
+                    "nne": "ŠŠR",
+                    "nnw": "ŠŠV",
                     "nw": "ŠV",
                     "s": "P",
                     "se": "PR",
+                    "sse": "PPR",
+                    "ssw": "PPV",
                     "sw": "PV",
-                    "w": "V"
+                    "w": "V",
+                    "wnw": "VŠV",
+                    "wsw": "VPV"
                 },
                 "forecast": "Prognozė",
                 "high": "Aukštas",
@@ -426,6 +492,12 @@
             },
             "date-range-picker": {
                 "end_date": "Pabaigos data",
+                "ranges": {
+                    "last_week": "Praeitą savaitę",
+                    "this_week": "Šią savaitę",
+                    "today": "Šiandien",
+                    "yesterday": "Vakar"
+                },
                 "select": "Pasirinkite",
                 "start_date": "Pradžios data"
             },
@@ -438,6 +510,7 @@
             },
             "entity": {
                 "entity-picker": {
+                    "entity": "Subjektas",
                     "no_match": "Nerasta atitinkančių objektų"
                 }
             },
@@ -524,6 +597,24 @@
             "service-control": {
                 "integration_doc": "Integracijos dokumentacija"
             },
+            "service-picker": {
+                "service": "Paslauga"
+            },
+            "statistic-picker": {
+                "learn_more": "Sužinokite daugiau paie statistiką",
+                "missing_entity": "Kodėl mano subjektas neįtrauktas į sąrašą?",
+                "statistic": "Statistika"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Įkeliama statistika",
+                "no_statistics_found": "Statistika nerasta",
+                "statistic_types": {
+                    "max": "maks",
+                    "mean": "vidurkis",
+                    "min": "min",
+                    "sum": "suma"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Pasirinkite sritį",
                 "add_device_id": "Pasirinkite įrenginį",
@@ -540,13 +631,16 @@
         },
         "dialogs": {
             "config_entry_system_options": {
+                "enable_new_entities_label": "Įgalinti naujai pridėtus subjektus",
                 "restart_home_assistant": "Kad pakeitimai įsigaliotų, turite iš naujo paleisti Home Assistant.",
+                "title": "{integration} sistemos parinktys",
                 "update": "Atnaujinti"
             },
             "entity_registry": {
                 "dismiss": "Atmesti",
                 "editor": {
                     "device_disabled": "Šio objekto įrenginys išjungtas.",
+                    "icon": "Piktograma",
                     "name": "Pavadinimas",
                     "open_device_settings": "Atidaryti įrenginio nustatymus"
                 },
@@ -589,6 +683,10 @@
                 "remote": {
                     "activity": "Dabartinė veikla"
                 },
+                "restored": {
+                    "confirm_remove_title": "Pašalinti subjektą?",
+                    "remove_action": "Pašalinti subjektą"
+                },
                 "script": {
                     "last_action": "Paskutinis veiksmas"
                 },
@@ -635,7 +733,6 @@
                         "integrations": "Integracijos",
                         "logs": "Įvykių žurnalai",
                         "lovelace": "Lovelace ataskaitų sritis",
-                        "navigate_to": "Pereiti į {panel}",
                         "person": "Žmonės",
                         "scene": "Scenos",
                         "script": "Skriptai",
@@ -675,12 +772,15 @@
             },
             "zha_reconfigure_device": {
                 "attribute": "Atributas",
+                "bind_header": "Susiejimas",
                 "button_hide": "Slėpti išsamią informaciją",
                 "button_show": "Rodyti išsamią informaciją",
+                "cluster_header": "Klusteris",
                 "configuration_complete": "Įrenginio perkonfigūravimas baigtas.",
                 "configuration_failed": "Įrenginio perkonfigūravimas nepavyko. Žurnaluose gali būti papildomos informacijos.",
                 "configuring_alt": "Konfigūruojama",
                 "in_progress": "Įrenginys perkonfigūruojamas. Tai gali užtrukti.",
+                "min_max_change": "min/maks/pokytis",
                 "reporting_header": "Ataskaitos",
                 "run_in_background": "Galite uždaryti šį dialogo langą ir perkonfigūravimas bus tęsiamas fone.",
                 "start_reconfiguration": "Pradėti perkonfigūravimą"
@@ -713,6 +813,7 @@
         "notification_toast": {
             "connection_lost": "Nutrūko ryšys. Jungiamasi iš naujo...",
             "dismiss": "Atmesti",
+            "service_call_failed": "Nepavyko panaudoti skambučių paslaugos {service}.",
             "started": "Home Assistant startavo",
             "starting": "Home Assistant kraunasi. Visos funkcijos bus prieinamos kai bus baigtas užkrovimas."
         },
@@ -726,7 +827,8 @@
                     "caption": "Sričių registras",
                     "data_table": {
                         "area": "Sritis",
-                        "devices": "Įrenginiai"
+                        "devices": "Įrenginiai",
+                        "entities": "Subjektai"
                     },
                     "delete": {
                         "confirmation_title": "Ar jūs tikrai norite ištrinti šią sritį?"
@@ -736,6 +838,7 @@
                         "create": "SUKURTI",
                         "default_name": "Nauja sritis",
                         "delete": "IŠTRINTI",
+                        "linked_entities_caption": "Subjektai",
                         "unknown_error": "Nežinoma klaida",
                         "update": "ATNAUJINTI"
                     },
@@ -771,7 +874,6 @@
                             "header": "Veiksmai",
                             "learn_more": "Sužinokite daugiau apie veiksmus",
                             "name": "Veiksmas",
-                            "type_select": "Veiksmo tipas",
                             "type": {
                                 "condition": {
                                     "label": "Sąlyga"
@@ -792,15 +894,23 @@
                                 },
                                 "event": {
                                     "event": "Įvykiai",
-                                    "label": "Sukurti įvykį"
+                                    "label": "Sukurti įvykį",
+                                    "service_data": "Serviso duomenis"
                                 },
                                 "scene": {
                                     "label": "Suaktyvinti sceną"
                                 },
+                                "service": {
+                                    "label": "Skambučių paslauga"
+                                },
                                 "wait_template": {
-                                    "label": "Laukti"
+                                    "label": "Laukti",
+                                    "timeout": "Laukimo laikas (neprivaloma)",
+                                    "wait_template": "Laukimo šablonas"
                                 }
-                            }
+                            },
+                            "type_select": "Veiksmo tipas",
+                            "unsupported_action": "Nėra UI palaikymo platformai: {action}"
                         },
                         "alias": "Pavadinimas",
                         "blueprint": {
@@ -812,6 +922,7 @@
                         "conditions": {
                             "add": "Pridėti sąlygą",
                             "delete": "Ištrinti",
+                            "delete_confirm": "Ar tikrai norite ištrinti?",
                             "duplicate": "Dubliuoti",
                             "header": "Sąlygos",
                             "introduction": "Sąlygos yra neprivalomos ir neleis automatikos scenarijams veikti, nebent bus įvykdytos visos sąlygos.",
@@ -830,11 +941,17 @@
                                 },
                                 "numeric_state": {
                                     "above": "Daugiau",
-                                    "below": "žemiau"
+                                    "below": "žemiau",
+                                    "label": "Skaitinė būsena",
+                                    "value_template": "Reikšmės šablonas (neprivaloma)"
                                 },
                                 "or": {
                                     "label": "Arba"
                                 },
+                                "state": {
+                                    "label": "Būsena",
+                                    "state": "Būsena"
+                                },
                                 "sun": {
                                     "after": "Po:",
                                     "before": "Prieš:",
@@ -843,7 +960,8 @@
                                     "sunset": "Saulėlydis"
                                 },
                                 "template": {
-                                    "label": "Šablonas"
+                                    "label": "Šablonas",
+                                    "value_template": "Reikšmės šablonas"
                                 },
                                 "time": {
                                     "after": "Po",
@@ -859,11 +977,18 @@
                                         "wed": "Trečiadienis"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Trigerio ID",
+                                    "label": "Trigeris",
+                                    "no_triggers": "Nėra trigerių"
+                                },
                                 "zone": {
+                                    "entity": "Subjektas su vieta",
                                     "label": "Vieta",
                                     "zone": "Vieta"
                                 }
-                            }
+                            },
+                            "type_select": "Sąlyginis tipas"
                         },
                         "copy_to_clipboard": "Kopijuoti į iškarpinę",
                         "default_name": "Naujas automatikos scenarijus",
@@ -875,6 +1000,7 @@
                         "edit_yaml": "Redaguoti kaip YAML",
                         "introduction": "Naudokite automatikos scenarijus, kad atgaivintumėte savo namus.",
                         "load_error_not_editable": "Redagavimas leidžiamas tik automatizavimai, esantys automations.yaml",
+                        "load_error_unknown": "Nepavyko užkrauti automatikos ({err_no}).",
                         "modes": {
                             "documentation": "automatikos dokumentacija",
                             "label": "Režimas"
@@ -889,7 +1015,6 @@
                             "introduction": "Trigeriai yra tai, kas pradeda automatizavimo taisyklės apdorojimą. Tai pačiai taisyklei galima nurodyti kelis aktyviklius. Kai tik įsijungs trigeris, Home Assistant patikrins sąlygas, jei tokių yra, ir iškviečia veiksmą.",
                             "learn_more": "Sužinokite daugiau apie trigerius",
                             "name": "Trigeris",
-                            "type_select": "Trigerio tipas",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -921,6 +1046,7 @@
                                 },
                                 "mqtt": {
                                     "label": "MQTT",
+                                    "payload": "Apkrova (neprivaloma)",
                                     "topic": "Tema"
                                 },
                                 "numeric_state": {
@@ -930,6 +1056,7 @@
                                     "value_template": "Vertės šablonas (pasirinktinai)"
                                 },
                                 "state": {
+                                    "for": "Kiek laiko",
                                     "from": "Iš",
                                     "label": "Būsena",
                                     "to": "Kam"
@@ -948,39 +1075,44 @@
                                     "label": "Šablonas",
                                     "value_template": "Vertės šablonas"
                                 },
+                                "time": {
+                                    "at": "Tuo metu",
+                                    "label": "Laikas"
+                                },
                                 "time_pattern": {
                                     "hours": "Valandos",
                                     "label": "Laiko modelis",
                                     "minutes": "Minutes",
                                     "seconds": "Sekundės"
                                 },
-                                "time": {
-                                    "at": "Tuo metu",
-                                    "label": "Laikas"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
                                 },
                                 "zone": {
+                                    "enter": "Įėjimas",
+                                    "entity": "Subjektas su vieta",
                                     "event": "Įvykis",
                                     "label": "Zona",
                                     "leave": "Palieka",
                                     "zone": "Vieta"
                                 }
                             },
+                            "type_select": "Trigerio tipas",
                             "unsupported_platform": "Nėra UI palaikymo platformai: {platform}"
                         },
                         "unsaved_confirm": "Turite neišsaugotų pakeitimų, ar tikrai norite išeiti?"
                     },
                     "picker": {
                         "add_automation": "Pridėti automatikos scenarijų",
+                        "edit_automation": "Redaguoti automatiką",
                         "header": "Automatikos redaktorius",
                         "introduction": "Automatikos redaktorius leidžia kurti ir redaguoti automatikos scenarijus. Spustelėkite toliau pateiktą nuorodą, kad perskaitytumėte instrukcijas ir įsitikintumėte, jog tinkamai sukonfigūravote Home Assistant.",
                         "learn_more": "Sužinokite daugiau apie automatizavimą",
                         "no_automations": "Redaguojamas automatizavimas nerastas",
                         "only_editable": "Redagavimas leidžiamas tik automatizavimai, esantys automations.yaml",
-                        "pick_automation": "Pasirinkite redaguojamą automatikos scenarijų"
+                        "pick_automation": "Pasirinkite redaguojamą automatikos scenarijų",
+                        "show_info_automation": "Rodyti informaciją apie automatizavimą"
                     },
                     "thingtalk": {
                         "link_devices": {
@@ -1030,6 +1162,7 @@
                             "config_documentation": "Konfigūracijos dokumentacija",
                             "disable": "išjungti",
                             "enable": "įgalinti",
+                            "manage_entities": "Tvarkyti subjektus",
                             "title": "Alexa"
                         },
                         "connected": "Prisijungęs",
@@ -1050,6 +1183,7 @@
                             "connected": "Prisijungęs",
                             "link_learn_how_it_works": "Sužinokite, kaip tai veikia",
                             "not_connected": "Neprisijungęs",
+                            "reconnecting": "Bandoma prisijungti iš naujo",
                             "remote_enabled": {
                                 "caption": "Automatiškai prisijungti"
                             },
@@ -1130,6 +1264,7 @@
                         "password": "Slaptažodis",
                         "password_error_msg": "Slaptažodis turi turėti bent 8 simbolius",
                         "resend_confirm_email": "Pakartotinai išsiųsti patvirtinimo el. laišką",
+                        "start_trial": "Pradėti bandomąją versiją",
                         "title": "Registruoti paskyrą"
                     }
                 },
@@ -1138,29 +1273,20 @@
                     "description": "Vienetų sistema, vieta, laiko juosta ir kiti bendrieji parametrai",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "learn_more": "Kaip mes tvarkome jūsų duomenis",
-                                "preference": {
-                                    "diagnostics": {
-                                        "description": "Bendrinkite trigdžių ataskaitas, kai įvyksta netikėtų klaidų.",
-                                        "title": "Diagnostika"
-                                    },
-                                    "statistics": {
-                                        "title": "Naudojimo statistika"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Pavadinimai, versijos ir galimybės."
-                                    },
-                                    "usage": {
-                                        "description": "Pavadinimai ir versijos informacija.",
-                                        "title": "Naudotos integracijos"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Valiuta",
+                                "elevation": "Aukštis",
+                                "elevation_meters": "metrų",
+                                "find_currency_value": "Surasti reikšmę",
+                                "imperial_example": "Farenheitas, svarai",
                                 "latitude": "Platuma",
                                 "longitude": "Ilguma",
-                                "save_button": "Išsaugoti"
+                                "metric_example": "Celsijus, kilogramai",
+                                "save_button": "Išsaugoti",
+                                "time_zone": "Laiko zona",
+                                "unit_system": "Matavimo vienetų sistema",
+                                "unit_system_imperial": "Imperinė",
+                                "unit_system_metric": "Metrinė"
                             },
                             "header": "Bendroji konfigūracija",
                             "introduction": "Konfigūracijos keitimas gali būti varginantis procesas. Taip, mes žinome! Todėl šiame skyriuje bandysime šiek tiek palengvinti jūsų gyvenimą."
@@ -1169,6 +1295,8 @@
                 },
                 "customize": {
                     "caption": "Pritaikymai",
+                    "description": "Redaguoti savo subjektus",
+                    "pick_attribute": "Pasirinkite atributą, kurį norite pakeisti",
                     "picker": {
                         "documentation": "Tinkinimo dokumentacija",
                         "header": "Pritaikymas"
@@ -1224,6 +1352,10 @@
                     "enabled_cause": "Įrenginį išjungė {cause}.",
                     "enabled_description": "Išjungti įrenginiai nebus rodomi, o įrenginiui priklausantys objektai bus išjungti ir nepridedami į Home Assistant.",
                     "enabled_label": "Įgalinti įrenginį",
+                    "entities": {
+                        "add_entities_lovelace": "Pridėti į Lovelace",
+                        "entities": "Subjektai"
+                    },
                     "no_devices": "Nėra įrenginių",
                     "picker": {
                         "filter": {
@@ -1247,16 +1379,44 @@
                     "unnamed_device": "Bevardis įrenginys",
                     "update_device_error": "Nepavyko atnaujinti įrenginio"
                 },
+                "energy": {
+                    "device_consumption": {
+                        "dialog": {
+                            "selected_stat_intro": "Pasirinkite subjektą, kuris atspindi įrenginio energijos suvartojimą."
+                        },
+                        "learn_more": "Daugiau informacijos apie tai, kaip pradėti.",
+                        "title": "Individualus įrenginiai"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "to": {
+                                "cost_number": "Naudokite statinį tarifą",
+                                "cost_number_input": "Kaina už kWh",
+                                "cost_number_suffix": "{currency}/kWh"
+                            }
+                        },
+                        "learn_more": "Daugiau informacijos apie tai, kaip pradėti."
+                    },
+                    "solar": {
+                        "learn_more": "Daugiau informacijos apie tai, kaip pradėti.",
+                        "stat_production": "Jūsų saulės energijos gamyba",
+                        "title": "Saulės baterijos"
+                    }
+                },
                 "entities": {
                     "caption": "Subjektų registras",
                     "description": "Visų žinomų subjektų apžvalga.",
                     "picker": {
                         "filter": {
+                            "filter": "Filtras",
                             "show_all": "Rodyti viską"
                         },
                         "header": "Subjektų registras",
                         "headers": {
                             "area": "Sritis",
+                            "entity_id": "Subjekto id",
+                            "integration": "Integracija",
+                            "name": "Pavadinimas",
                             "status": "Būsena"
                         },
                         "introduction2": "Naudokite subjekto registrą, kad perrašytumėte pavadinimą, pakeiskite subjekto ID arba pašalintumėte įrašą iš namų asistento. Atminkite, kad pašalindami registro įrašą tai nepanaikins pačio subjekto. Norėdami tai padaryti, sekite toliau pateiktą nuorodą ir pašalinkite ją iš integracijos puslapio.",
@@ -1267,9 +1427,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Išvalyti"
-                },
                 "header": "Konfigūruoti Home Assistant",
                 "helpers": {
                     "dialog": {
@@ -1298,6 +1455,7 @@
                     "copy_raw": "Neapdorotas tekstas",
                     "description": "Versija, sistemos būklė ir nuorodos į dokumentaciją",
                     "home_assistant_logo": "Home Assistant logotipas",
+                    "icons_by": "Piktogramos",
                     "server": "serveris",
                     "setup_time": "Nustatyti laiką",
                     "source": "Šaltinis:",
@@ -1310,13 +1468,15 @@
                     "add_integration": "Pridėti integraciją",
                     "caption": "Integracijos",
                     "config_entry": {
+                        "area": "{area}",
                         "check_the_logs": "Patikrinkite žurnalus",
                         "configure": "Konfigūruoti",
                         "delete": "Ištrinti",
+                        "device_unavailable": "Įrenginis neprieinamas",
                         "documentation": "Dokumentacija",
+                        "entity_unavailable": "Subjektas nepasiekiamas",
                         "firmware": "Programinė įranga: {versija}",
                         "hub": "Prijungtas per",
-                        "logs": "žurnalai",
                         "manuf": "sukūrė {manufacturer}",
                         "no_area": "Nėra srities",
                         "not_loaded": "Nepakrauta",
@@ -1326,7 +1486,9 @@
                             "failed_unload": "Įkrauti nepavyko",
                             "loaded": "Įkrauta",
                             "migration_error": "Perkėlimo klaida",
-                            "not_loaded": "Nepakrauta"
+                            "not_loaded": "Nepakrauta",
+                            "setup_error": "Nepavyko sukonfiguruoti",
+                            "setup_retry": "Bandoma iš naujo nustatyti"
                         }
                     },
                     "config_flow": {
@@ -1340,6 +1502,7 @@
                         "next": "Kitas",
                         "submit": "Pateikti"
                     },
+                    "configure": "Konfigūruoti",
                     "configured": "Sukonfigūruota",
                     "details": "Integravimo informacija",
                     "disable": {
@@ -1348,6 +1511,7 @@
                     "discovered": "Atrasta",
                     "home_assistant_website": "Home Assistant svetainė",
                     "ignore": {
+                        "confirm_ignore_title": "Nepaisyti {name} atradimo?",
                         "ignore": "Nepaisyti",
                         "ignored": "Nepaisoma"
                     },
@@ -1359,7 +1523,11 @@
                     "clear": "Išvalyti",
                     "description": "Peržiūrėti Home Assistant žurnalus",
                     "level": {
-                        "info": "INFO"
+                        "critical": "KRITINIS",
+                        "debug": "TESTAVIMO",
+                        "error": "KLAIDA",
+                        "info": "INFO",
+                        "warning": "ĮSPĖJIMAS"
                     },
                     "loading_log": "Įkeliamas klaidų žurnalas...",
                     "no_errors": "Apie klaidas nepranešta",
@@ -1393,6 +1561,9 @@
                     },
                     "resources": {
                         "caption": "Ištekliai",
+                        "detail": {
+                            "url": "URL"
+                        },
                         "picker": {
                             "headers": {
                                 "type": "Tipas",
@@ -1408,7 +1579,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfigūruoti",
                     "publish": "Paskelbti",
                     "title": "MQTT"
                 },
@@ -1424,13 +1594,13 @@
                             "dashboard": "Valdymo skydas"
                         }
                     },
-                    "network_status": {
-                        "unknown": "Nežinoma"
-                    },
                     "network": {
                         "header": "Tinklo valdymas",
                         "introduction": "Tvarkykite viso tinklo funkcijas."
                     },
+                    "network_status": {
+                        "unknown": "Nežinoma"
+                    },
                     "node_config": {
                         "header": "Mazgo konfigūracija",
                         "help_source": "Konfigūracijos parametrų aprašymai ir žinyno tekstas pateikiami OpenZWave projekto.",
@@ -1468,6 +1638,7 @@
                         "device_tracker_picked": "Stebėti įrenginį",
                         "linked_user": "Susietas vartotojas",
                         "name": "Vardas",
+                        "name_error_msg": "Vardas yra privalomas",
                         "new_person": "Naujas asmuo",
                         "update": "Atnaujinti"
                     },
@@ -1476,21 +1647,29 @@
                     "person_not_found_title": "Asmuo nerastas"
                 },
                 "scene": {
+                    "activated": "Scena {name} aktyvuota.",
                     "caption": "Scenos",
                     "editor": {
+                        "default_name": "Nauja scena",
                         "devices": {
                             "add": "Pridėti įrenginį",
                             "delete": "Pašalinti įrenginį",
                             "header": "Įrenginiai"
                         },
                         "icon": "Piktograma",
-                        "load_error_not_editable": "Redaguoti galima tik scenas, esančias scenes.yaml."
+                        "load_error_not_editable": "Redaguoti galima tik scenas, esančias scenes.yaml.",
+                        "load_error_unknown": "Nepavyko užkrauti scenos ({err_no}).",
+                        "name": "Pavadinimas",
+                        "save": "Išsaugoti",
+                        "unsaved_confirm": "Turite neišsaugotų pakeitimų, ar tikrai norite išeiti?"
                     },
                     "picker": {
                         "add_scene": "Pridėti sceną",
                         "delete_confirm": "Ar jūs tikrai norite ištrinti šią sceną?",
                         "delete_scene": "Ištrinti sceną",
+                        "duplicate": "Pasikartojantys",
                         "edit_scene": "Redaguoti sceną",
+                        "header": "Scenų redaktorius",
                         "learn_more": "Sužinokite daugiau apie scenas",
                         "no_scenes": "Neradome jokių redaguojamų scenų",
                         "only_editable": "Redaguoti galima tik scenas, esančias scenes.yaml.",
@@ -1502,8 +1681,10 @@
                     "caption": "Scenarijai",
                     "description": "Atlikite veiksmų seką",
                     "editor": {
+                        "alias": "Pavadinimas",
                         "default_name": "Naujas scenarijus",
                         "delete_confirm": "Ar tikrai norite ištrinti šį scenarijų?",
+                        "delete_script": "Ištrinti skriptą",
                         "header": "Scenarijus: {name}",
                         "modes": {
                             "label": "Režimas"
@@ -1516,6 +1697,8 @@
                         "add_script": "Pridėti scenarijų",
                         "duplicate": "Dubliuoti",
                         "duplicate_script": "Dubliuoti skriptą",
+                        "edit_script": "Redaguoti skriptą",
+                        "header": "Skripto redaktorius",
                         "run_script": "Vykdyti scenarijų"
                     }
                 },
@@ -1523,17 +1706,22 @@
                     "description": "Paleisti iš naujo ir sustabdyti Home Assistant serverį",
                     "section": {
                         "reloading": {
+                            "automation": "Automatika",
                             "homekit": "HomeKit",
                             "person": "Žmonės",
                             "reload": "{domain}",
                             "scene": "Perkraukite scenas",
+                            "script": "Skriptai",
                             "telegram": "Telegram pranešimo paslaugos",
                             "zone": "Zonos"
                         },
                         "server_management": {
+                            "confirm_restart": "Ar tikrai norite perkrauti Home Assistant?",
                             "confirm_stop": "Ar jūs tikrai norite sustabdyti Home Assistant?",
                             "heading": "Serverio valdymas",
-                            "introduction": "Valdykite Home Assistant serverį... iš Home Assistant."
+                            "introduction": "Valdykite Home Assistant serverį... iš Home Assistant.",
+                            "restart": "Perkrauti",
+                            "stop": "Sustabdyti"
                         },
                         "validation": {
                             "heading": "Konfigūracijos patvirtinimas",
@@ -1603,10 +1791,15 @@
                 "zha": {
                     "add_device": "Pridėti įrenginį",
                     "add_device_page": {
+                        "search_again": "Ieškoti iš naujo",
                         "spinner": "Ieškoma ZHA Zigbee įrenginių..."
                     },
-                    "button": "Konfigūruoti",
+                    "common": {
+                        "clusters": "Klusteriai",
+                        "value": "Reikšmė"
+                    },
                     "configuration_page": {
+                        "shortcuts_title": "Nuorodos",
                         "update_button": "Atnaujinti konfigūraciją"
                     },
                     "device_pairing_card": {
@@ -1663,9 +1856,39 @@
                         "update": "Atnaujinti"
                     }
                 },
+                "zwave": {
+                    "common": {
+                        "unknown": "nežinomas",
+                        "value": "Reikšmė",
+                        "wakeup_interval": "Žadinimo intervalas"
+                    },
+                    "description": "Tvarkyti savo Z-Wave tinklą",
+                    "node_config": {
+                        "false": "Netiesa",
+                        "seconds": "sekundės",
+                        "set_config_parameter": "Nustatykite parametrą „Config“",
+                        "set_wakeup": "Nustatyti žadinimo intervalą",
+                        "true": "Tiesa"
+                    },
+                    "node_management": {
+                        "add_to_group": "Pridėti prie grupės",
+                        "group": "Grupė",
+                        "protection": "Apsauga",
+                        "set_protection": "Nustatyti apsaugą"
+                    },
+                    "services": {
+                        "heal_network": "Išgydyti tinklą",
+                        "save_config": "Išsaugoti konfigūraciją",
+                        "soft_reset": "Švelnus nustatymas iš naujo",
+                        "start_network": "Paleisti tinklą",
+                        "stop_network": "Sustabdyti tinklą",
+                        "test_network": "Tikrinti tinklą"
+                    }
+                },
                 "zwave_js": {
                     "common": {
-                        "reconfigure_server": "Iš naujo sukonfigūruoti serverį"
+                        "reconfigure_server": "Iš naujo sukonfigūruoti serverį",
+                        "source": "Šaltinis"
                     },
                     "dashboard": {
                         "driver_version": "Tvarkyklės versija",
@@ -1691,6 +1914,7 @@
                         "attribution": "Įrenginio konfigūracijos parametrus ir aprašymus pateikia {device_database}",
                         "battery_device_notice": "Įrenginiai su baterijomis turi būti pažadinti, kad būtų galima atnaujinti jų konfigūraciją. Instrukcijas, kaip pažadinti įrenginį, rasite įrenginio vadove.",
                         "error_device_not_found": "Įrenginys nerastas",
+                        "parameter": "Parametras",
                         "set_param_accepted": "Parametras buvo atnaujintas.",
                         "set_param_error": "Įvyko klaida.",
                         "set_param_queued": "Parametro pakeitimas buvo įrašytas į eilę ir bus atnaujintas, kai įrenginys pabus."
@@ -1701,32 +1925,9 @@
                         "awake": "Budi",
                         "dead": "Miręs",
                         "unknown": "Nežinoma"
-                    }
-                },
-                "zwave": {
-                    "button": "Konfigūruoti",
-                    "common": {
-                        "wakeup_interval": "Žadinimo intervalas"
                     },
-                    "node_config": {
-                        "false": "Netiesa",
-                        "seconds": "sekundės",
-                        "set_config_parameter": "Nustatykite parametrą „Config“",
-                        "set_wakeup": "Nustatyti žadinimo intervalą",
-                        "true": "Tiesa"
-                    },
-                    "node_management": {
-                        "add_to_group": "Pridėti prie grupės",
-                        "group": "Grupė",
-                        "protection": "Apsauga",
-                        "set_protection": "Nustatyti apsaugą"
-                    },
-                    "services": {
-                        "save_config": "Išsaugoti konfigūraciją",
-                        "soft_reset": "Švelnus nustatymas iš naujo",
-                        "start_network": "Paleisti tinklą",
-                        "stop_network": "Sustabdyti tinklą",
-                        "test_network": "Tikrinti tinklą"
+                    "remove_failed_node": {
+                        "remove_device": "Pašalinti įrenginį"
                     }
                 }
             },
@@ -1744,13 +1945,18 @@
                         "title": "Įvykiai"
                     },
                     "services": {
+                        "column_description": "Aprašymas",
+                        "column_example": "Pavyzdys",
                         "no_template_ui_support": "Vartotojo sąsaja nepalaiko šablonų, bet jūs vis tiek galite naudoti YAML redaktorių.",
                         "title": "Paslaugos"
                     },
                     "states": {
+                        "attributes": "Atributai",
+                        "entity": "Subjektas",
                         "last_changed": "Pakeista",
                         "last_updated": "Atnaujinta",
                         "more_info": "Daugiau informacijos",
+                        "state": "Būsena",
                         "title": "Būsenos"
                     },
                     "templates": {
@@ -1761,22 +1967,13 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Grįžti atgal",
-                "supervisor": {
-                    "ask": "Prašyti pagalbos",
-                    "system_health": "Patikrinti sistemos būklę"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "today": "Šiandien",
-                    "yesterday": "Vakar"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "today": "Šiandien"
+            "energy": {
+                "charts": {
+                    "solar": "Saulės"
+                },
+                "setup": {
+                    "back": "Atgal",
+                    "next": "Kitas"
                 }
             },
             "lovelace": {
@@ -1787,7 +1984,9 @@
                         "title": "Sveiki sugrįžę namo"
                     },
                     "picture-elements": {
+                        "call_service": "Skambučių paslauga {name}",
                         "hold": "Laikykite:",
+                        "more_info": "Rodyti daugiau informacijos: {name}",
                         "navigate_to": "Eikite į {location}",
                         "tap": "Palieskite:",
                         "toggle": "Perjungti {name}"
@@ -1813,6 +2012,9 @@
                         "url_path": "URL kelias"
                     },
                     "card": {
+                        "alarm-panel": {
+                            "name": "Signalizacijos skydelis"
+                        },
                         "button": {
                             "default_action_help": "Numatytasis veiksmas priklauso nuo objekto galimybių, jis bus perjungtas arba bus rodoma daugiau informacijos.",
                             "name": "Mygtukas"
@@ -1828,17 +2030,19 @@
                             }
                         },
                         "conditional": {
-                            "card": "Kortelė"
+                            "card": "Kortelė",
+                            "name": "Sąlyginis"
                         },
                         "config": {
                             "optional": "Neprivaloma",
                             "required": "Privaloma"
                         },
                         "entities": {
-                            "entity_row_editor": "Objekto eilučių rengyklė",
                             "entity_row": {
                                 "button": "Mygtukas"
                             },
+                            "entity_row_editor": "Objekto eilučių rengyklė",
+                            "name": "Subjektai",
                             "secondary_info_values": {
                                 "brightness": "Ryškumas",
                                 "entity-id": "Objekto ID",
@@ -1851,7 +2055,11 @@
                             },
                             "show_header_toggle": "Rodyti antraštės perjungiklį?"
                         },
+                        "entity-filter": {
+                            "name": "Objekto filtras"
+                        },
                         "gauge": {
+                            "name": "Matuoklis",
                             "severity": {
                                 "green": "Žalia",
                                 "red": "Raudona",
@@ -1859,6 +2067,9 @@
                             }
                         },
                         "generic": {
+                            "days_to_show": "Kiek dienų rodyti",
+                            "entities": "Subjektai",
+                            "entity": "Subjektas",
                             "icon": "Piktograma",
                             "icon_height": "Piktogramos aukštis",
                             "image": "Vaizdo kelias",
@@ -1871,19 +2082,51 @@
                             "unit": "Vienetas"
                         },
                         "glance": {
-                            "columns": "Stulpeliai"
+                            "columns": "Stulpeliai",
+                            "name": "Glance"
                         },
                         "grid": {
                             "description": "Tinklelio kortelė leidžia rodyti kelias korteles tinklelyje.",
                             "name": "Tinklelis"
                         },
+                        "history-graph": {
+                            "name": "Istorijos diagrama"
+                        },
+                        "horizontal-stack": {
+                            "name": "Horizontaliai išdėstyta grupė"
+                        },
+                        "iframe": {
+                            "name": "Tinklalapis"
+                        },
+                        "light": {
+                            "name": "Šviesus"
+                        },
                         "logbook": {
                             "description": "Veiksmų žurnalo kortelėje rodomas įvykių sąrašas.",
                             "name": "Veiksmų žurnalas"
                         },
+                        "map": {
+                            "name": "Žemėlapis"
+                        },
+                        "markdown": {
+                            "name": "Markdown"
+                        },
+                        "media-control": {
+                            "name": "Medijos valdiklis"
+                        },
+                        "picture-elements": {
+                            "name": "Paveikslėlio elementai"
+                        },
+                        "picture-entity": {
+                            "name": "Paveikslėlio subjektas"
+                        },
                         "picture-glance": {
+                            "name": "Paveikslėlio Glance",
                             "state_entity": "Būsenos objektas"
                         },
+                        "picture": {
+                            "name": "Paveikslėlis"
+                        },
                         "plant-status": {
                             "name": "Augalo būklė"
                         },
@@ -1896,6 +2139,9 @@
                         "thermostat": {
                             "name": "Termostatas"
                         },
+                        "vertical-stack": {
+                            "name": "Vertikalai išdėstyta grupė"
+                        },
                         "weather-forecast": {
                             "name": "Orų prognozė"
                         }
@@ -1920,6 +2166,7 @@
                         "move_after": "Perkelti kortelę po",
                         "move_before": "Perkelti kortelę prieš",
                         "pick_card": "Pasirinkite kortelę, kurią norite pridėti.",
+                        "show_code_editor": "Rodyti kodo redaktorių",
                         "toggle_editor": "Perjungti redaktorių",
                         "unsaved_changes": "Turite neišsaugotų pakeitimų"
                     },
@@ -1931,8 +2178,14 @@
                         "delete": "Ištrinti rodinį",
                         "edit": "Redaguoti rodinį",
                         "header": "Peržiūrėti konfigūraciją",
+                        "header_name": "Peržiūrėti {name} konfigūracija",
                         "move_left": "Perkelti rodinį į kairę",
-                        "move_right": "Perkelti rodinį į dešinę"
+                        "move_right": "Perkelti rodinį į dešinę",
+                        "type": "Peržiūros tipas",
+                        "types": {
+                            "panel": "Skydelis (1 kortelė)",
+                            "sidebar": "Šoninė juosta"
+                        }
                     },
                     "header": "Redaguoti UI",
                     "header-footer": {
@@ -1970,7 +2223,6 @@
                         "unsaved_changes": "Neišsaugoti pakeitimai"
                     },
                     "save_config": {
-                        "cancel": "Nesvarbu",
                         "empty_config": "Pradėti nuo tuščio prietaisų skydelio",
                         "header": "Valdykite savo „Lovelace“ vartotojo sąsają",
                         "para_sure": "Ar tikrai norite kontroliuoti savo vartotojo sąsają?",
@@ -1983,6 +2235,9 @@
                             "row": "Objekto eilučių rengyklė"
                         }
                     },
+                    "suggest_card": {
+                        "add": "Pridėti į Lovelace UI"
+                    },
                     "view": {
                         "panel_mode": {
                             "warning_multiple_cards": "Šiame rodinyje yra daugiau nei viena kortelė, tačiau skydelio rodinyje gali būti rodoma tik 1 kortelė."
@@ -2003,6 +2258,9 @@
                     "entity_id": "Subjekto ID",
                     "last_changed": "Paskutinį kartą pakeistas"
                 },
+                "views": {
+                    "confirm_delete": "Ištrinti vaizdą?"
+                },
                 "warning": {
                     "entity_non_numeric": "Subjektas nėra skaitinis: {entity}",
                     "entity_not_found": "Subjektas nepasiekiamas: {entity}"
@@ -2023,6 +2281,9 @@
                     "error": "Klaida: {error}",
                     "providers": {
                         "command_line": {
+                            "abort": {
+                                "login_expired": "Sesija baigėsi, prisijunkite iš naujo."
+                            },
                             "error": {
                                 "invalid_auth": "Netinkamas vartotojo vardas arba slaptažodis",
                                 "invalid_code": "Netinkamas autentifikacijos kodas"
@@ -2042,8 +2303,12 @@
                             }
                         },
                         "homeassistant": {
+                            "abort": {
+                                "login_expired": "Sesija baigėsi, prisijunkite iš naujo."
+                            },
                             "error": {
-                                "invalid_auth": "Neteisingas vartotojo vardas arba slaptažodis"
+                                "invalid_auth": "Neteisingas vartotojo vardas arba slaptažodis",
+                                "invalid_code": "Netinkamas autentifikavimo kodas"
                             },
                             "step": {
                                 "init": {
@@ -2055,6 +2320,9 @@
                             }
                         },
                         "legacy_api_password": {
+                            "abort": {
+                                "login_expired": "Sesija baigėsi, prisijunkite iš naujo"
+                            },
                             "error": {
                                 "invalid_auth": "Neteisingas API slaptažodis"
                             },
@@ -2096,18 +2364,24 @@
                     "arsaboo": {
                         "labels": {
                             "activity": "Veikla",
+                            "air": "Oras",
                             "entertainment": "Pramogos",
                             "hdmi_input": "HDMI įvestis",
                             "hdmi_switcher": "HDMI perjungiklis",
                             "information": "Informacija",
                             "lights": "Šviesos",
-                            "turn_tv_off": "Išjunkite televizorių"
+                            "total_tv_time": "Bendras TV laikas",
+                            "turn_tv_off": "Išjunkite televizorių",
+                            "volume": "Garsumas"
                         },
                         "names": {
                             "family_room": "Šeimos kambarys",
                             "hallway": "Prieškambaris",
                             "kitchen": "Virtuvė",
+                            "left": "Kairė",
                             "master_bedroom": "Pagrindinis miegamasis",
+                            "mirror": "Veidrodis",
+                            "right": "Dešinė",
                             "upstairs": "Viršuje"
                         },
                         "unit": {
@@ -2123,6 +2397,7 @@
                 "core-config": {
                     "button_detect": "Aptikti",
                     "finish": "Kitas",
+                    "intro": "Sveiki {name}, atvykę į Home Assistant. Kaip norėtumėte pavadinti savo namus?",
                     "location_name_default": "Namai"
                 },
                 "finish": "Baigti",
@@ -2132,10 +2407,15 @@
                 },
                 "next": "Kitas",
                 "restore": {
+                    "addons": "Priedai",
                     "description": "Taip pat galite atkurti iš ankstesnės momentinės kopijos.",
+                    "folders": "Aplankai",
                     "hide_log": "Slėpti visą žurnalą",
                     "in_progress": "Vykdomas atkūrimas",
-                    "show_log": "Rodyti visą žurnalą"
+                    "password": "Slaptažodis",
+                    "select_type": "Pasirinkite, ką atkurti",
+                    "show_log": "Rodyti visą žurnalą",
+                    "type": "Tipas"
                 },
                 "user": {
                     "create_account": "Sukurti paskyrą",
@@ -2159,6 +2439,7 @@
                     "title": "Išplėstinis režimas"
                 },
                 "change_password": {
+                    "confirm_new_password": "Patvirtinti naują slaptažodį",
                     "current_password": "Dabartinis slaptažodis",
                     "error_new_is_old": "Naujas slaptažodis turi skirtis nuo dabartinio slaptažodžio",
                     "error_new_mismatch": "Nesutampa naujojo slaptažodžio laukai",
@@ -2191,6 +2472,11 @@
                 "long_lived_access_tokens": {
                     "created": "Sukurta {date}"
                 },
+                "mfa": {
+                    "confirm_disable": "Ar jūs tikrai norite išjungti {name}?",
+                    "disable": "Išjungti",
+                    "enable": "Įgalinti"
+                },
                 "mfa_setup": {
                     "close": "Uždaryti",
                     "step_done": "{step} sąranka atlikta",
@@ -2198,11 +2484,6 @@
                     "title_aborted": "Nutraukta",
                     "title_success": "Sėkmė!"
                 },
-                "mfa": {
-                    "confirm_disable": "Ar jūs tikrai norite išjungti {name}?",
-                    "disable": "Išjungti",
-                    "enable": "Įgalinti"
-                },
                 "number_format": {
                     "description": "Pasirinkite, kaip formatuojami skaičiai.",
                     "dropdown_label": "Skaičių formatas",
@@ -2255,6 +2536,9 @@
                     "header": "Laiko formatas"
                 }
             }
+        },
+        "sidebar": {
+            "external_app_configuration": "Programos konfigūracija"
         }
     }
 }
\ No newline at end of file
diff --git a/translations/frontend/lv.json b/translations/frontend/lv.json
index ddf08735d7..5d0a17d649 100644
--- a/translations/frontend/lv.json
+++ b/translations/frontend/lv.json
@@ -26,6 +26,12 @@
         "shopping_list": "Iepirkumu saraksts",
         "states": "Pārskats"
     },
+    "state": {
+        "default": {
+            "unavailable": "Nepieejams",
+            "unknown": "Nezināms"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -81,12 +87,6 @@
             "not_home": "Prombūtne"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "Nepieejams",
-            "unknown": "Nezināms"
-        }
-    },
     "ui": {
         "auth_store": {
             "ask": "Vai vēlaties saglabāt šo pieteikšanos?",
@@ -531,7 +531,6 @@
                             "introduction": "Darbības nosaka, ko Home Assistant darīs, kad tiks aktivizēta automatizācija.",
                             "learn_more": "Uzziniet vairāk par darbībām",
                             "name": "Darbība",
-                            "type_select": "Darbības tips",
                             "type": {
                                 "condition": {
                                     "label": "Nosacījums"
@@ -563,6 +562,7 @@
                                     "wait_template": "Gaidīšanas veidne"
                                 }
                             },
+                            "type_select": "Darbības tips",
                             "unsupported_action": "Neatbalstīta darbība: {action}"
                         },
                         "alias": "Nosaukums",
@@ -575,7 +575,6 @@
                             "introduction": "Nosacījumi nav obligāti, tos var izmantot, lai novērstu automatizācijas tālāku izpildi, ja vien nav izpildījušies visi priekšnosacījumi.",
                             "learn_more": "Uzziniet vairāk par nosacījumiem",
                             "name": "Nosacījums",
-                            "type_select": "Nosacījuma tips",
                             "type": {
                                 "and": {
                                     "label": "Un"
@@ -628,6 +627,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Nosacījuma tips",
                             "unsupported_condition": "Neatbalstīts nosacījums: {condition}"
                         },
                         "default_name": "Jauna automatizācija",
@@ -651,7 +651,6 @@
                             "introduction": "Trigeri ir tas, kas sāk automatizācijas noteikuma apstrādi. Vienam noteikumam ir iespējams norādīt vairākus trigerus. Kad trigeris sāk, Home Assistant apstiprina nosacījumus, ja tādi ir, un izsauc darbību.",
                             "learn_more": "Uzziniet vairāk par trigeriem",
                             "name": "Izsaukt",
-                            "type_select": "Trigera veids",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -709,16 +708,16 @@
                                     "label": "Veidne",
                                     "value_template": "Vērtības veidne"
                                 },
+                                "time": {
+                                    "at": "plkst.",
+                                    "label": "Laiks"
+                                },
                                 "time_pattern": {
                                     "hours": "Stundas",
                                     "label": "Laika Modelis",
                                     "minutes": "Minūtes",
                                     "seconds": "Sekundes"
                                 },
-                                "time": {
-                                    "at": "plkst.",
-                                    "label": "Laiks"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -732,6 +731,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Trigera veids",
                             "unsupported_platform": "Neatbalstīta platforma: {platform}"
                         },
                         "unsaved_confirm": "Jums ir nesaglabātas izmaiņas. Vai tiešām vēlaties pamest?"
@@ -948,10 +948,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Notīrīt",
-                    "filtering_by": "Filtrēšana pēc"
-                },
                 "header": "Home Assistant konfigurēšana",
                 "helpers": {
                     "caption": "Palīgi",
@@ -1013,7 +1009,6 @@
                         "hub": "Savienots caur",
                         "manuf": "{manufacturer}",
                         "no_area": "Nav apgabala",
-                        "options": "Opcijas",
                         "reload": "Pārlādēt",
                         "reload_confirm": "Integrācija tika pārlādēta",
                         "reload_restart_confirm": "Restartējiet Home Assistant, lai pabeigtu šīs integrācijas pārlādēšanu",
@@ -1033,7 +1028,6 @@
                             "open_site": "Atvērt tīmekļa vietni"
                         },
                         "finish": "Pabeigt",
-                        "loading_first_time": "Lūdzu, uzgaidiet, kamēr tiek instalēta integrācija",
                         "not_all_required_fields": "Ne visi obligātie lauki ir aizpildīti.",
                         "submit": "Iesniegt"
                     },
@@ -1049,7 +1043,6 @@
                         "confirm_delete_ignore_title": "Pārtraukt ignorēt {name}?",
                         "confirm_ignore": "Vai tiešām nevēlaties iestatīt šo integrāciju? To varat atsaukt, augšējā labajā stūrī noklikšķinot uz “Rādīt ignorētās integrācijas” pārpildes izvēlnē.",
                         "confirm_ignore_title": "Ignorēt {name} atklāšanu?",
-                        "hide_ignored": "Slēpt ignorētās integrācijas",
                         "ignore": "Ignorēt",
                         "ignored": "Ignorētās",
                         "show_ignored": "Rādīt ignorētās integrācijas",
@@ -1412,30 +1405,6 @@
                     "introduction": "Zonas ļauj norādīt noteiktus reģionus uz zemes. Kad cilvēks atrodas zonā, vienības stāvoklim tiks izmantots zonas nosaukums. Zonas var izmantotas kā aktivators vai nosacījums automatizācijās.",
                     "no_zones_created_yet": "Izskatās, ka vēl neesat izveidojis nevienu zonu."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "view_device": "Skatīt Ierīci"
-                    },
-                    "common": {
-                        "close": "Aizvērt",
-                        "home_id": "Mājas ID",
-                        "network": "Tīkls"
-                    },
-                    "dashboard": {
-                        "driver_version": "Draivera versija",
-                        "dump_not_ready_confirm": "Lejupielādēt",
-                        "home_id": "Mājas ID",
-                        "server_version": "Servera versija"
-                    },
-                    "navigation": {
-                        "network": "Tīkls"
-                    },
-                    "network_status": {
-                        "connected": "Savienots",
-                        "connecting": "Savienojas",
-                        "unknown": "Nezināms"
-                    }
-                },
                 "zwave": {
                     "common": {
                         "index": "Indekss",
@@ -1482,6 +1451,30 @@
                     "values": {
                         "header": "Mezglu vērtības"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "view_device": "Skatīt Ierīci"
+                    },
+                    "common": {
+                        "close": "Aizvērt",
+                        "home_id": "Mājas ID",
+                        "network": "Tīkls"
+                    },
+                    "dashboard": {
+                        "driver_version": "Draivera versija",
+                        "dump_not_ready_confirm": "Lejupielādēt",
+                        "home_id": "Mājas ID",
+                        "server_version": "Servera versija"
+                    },
+                    "navigation": {
+                        "network": "Tīkls"
+                    },
+                    "network_status": {
+                        "connected": "Savienots",
+                        "connecting": "Savienojas",
+                        "unknown": "Nezināms"
+                    }
                 }
             },
             "custom": {
@@ -1507,14 +1500,6 @@
                     }
                 }
             },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Iepriekšējā nedēļā",
-                    "this_week": "Šonedēļ",
-                    "today": "Šodien",
-                    "yesterday": "Vakardien"
-                }
-            },
             "lovelace": {
                 "cards": {
                     "empty_state": {
@@ -1665,7 +1650,6 @@
                         "unsaved_changes": "Nesaglabātās izmaiņas"
                     },
                     "save_config": {
-                        "cancel": "Atcelt",
                         "close": "Aizvērt",
                         "header": "Pārņemt kontroli pār savu Lovelace lietotāja saskarni",
                         "para": "Šo infopaneli pašlaik konktrolē Home Assistant, automātiski atjauninot, kad kļūst pieejamas jaunas vienības vai Lovelace UI komponenti. Ja pārņemsiet kontroli, šis informācijas panelis vairs netiks automātiski atjaunināts. Izmēģinājumiem jūs vienmēr varat izveidot jaunu infopaneli konfigurācijā.",
@@ -1880,13 +1864,15 @@
             },
             "profile": {
                 "advanced_mode": {
-                    "description": "Dod piekļuvi papildu funcionalitātei",
+                    "description": "Atbloķē papildu funkcijas.",
                     "link_promo": "Uzziniet vairāk",
                     "title": "Detalizētais režīms"
                 },
                 "change_password": {
                     "confirm_new_password": "Apstipriniet jauno paroli",
                     "current_password": "Pašreizējā parole",
+                    "error_new_is_old": "Jaunajai parolei ir jāatšķiras no pašreizējās paroles",
+                    "error_new_mismatch": "Ievadītās jaunās paroles vērtības nesakrīt",
                     "error_required": "Obligāts",
                     "header": "Mainīt paroli",
                     "new_password": "Jauna parole",
@@ -1935,6 +1921,12 @@
                     "prompt_copy_token": "Kopējiet savu piekļuves pilnvaru. Tas vairs netiks rādīts.",
                     "prompt_name": "Pilnvaras nosaukums"
                 },
+                "mfa": {
+                    "confirm_disable": "Vai tiešām vēlaties atspējot {name}?",
+                    "disable": "Atspējot",
+                    "enable": "Iespējot",
+                    "header": "Daudzfaktoru autentifikācijas moduļi"
+                },
                 "mfa_setup": {
                     "close": "Aizvērt",
                     "step_done": "Iestatīšana ir pabeigta {step}",
@@ -1942,13 +1934,24 @@
                     "title_aborted": "Priekšlaikus pārtraukta",
                     "title_success": "Veiksmīgi!"
                 },
-                "mfa": {
-                    "confirm_disable": "Vai tiešām vēlaties atspējot {name}?",
-                    "disable": "Atspējot",
-                    "enable": "Iespējot",
-                    "header": "Daudzfaktoru autentifikācijas moduļi"
+                "number_format": {
+                    "description": "Izvēlieties skaitļu attēlošanas formātu.",
+                    "dropdown_label": "Skaitļu formāts",
+                    "formats": {
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
+                        "language": "Auto (izmantot valodas iestatījumu)",
+                        "none": "Nav",
+                        "space_comma": "1 234 567,89",
+                        "system": "Izmantot sistēmas lokalizāciju"
+                    },
+                    "header": "Skaitļu formāts"
                 },
                 "push_notifications": {
+                    "add_device_prompt": {
+                        "input_label": "Ierīces nosaukums",
+                        "title": "Kā šo ierīci vajadzētu saukt?"
+                    },
                     "description": "Sūtīt paziņojumus uz šo ierīci.",
                     "error_load_platform": "Konfigurēt notify.html5.",
                     "error_use_https": "Nepieciešama SSL iespējošana priekšgalsistēmai.",
@@ -1968,7 +1971,7 @@
                     "token_title": "{clientId} atsvaidzināšanas pilnvara"
                 },
                 "suspend": {
-                    "description": "Vai pārtraukt savienojumu ar serveri pēc 5 neativitātes minūtēm?",
+                    "description": "Vai pārtraukt savienojumu ar serveri pēc 5 neaktivitātes minūtēm?",
                     "header": "Automātiski pārtraukt savienojumu"
                 },
                 "themes": {
@@ -1985,6 +1988,17 @@
                     "primary_color": "Galvenā krāsa",
                     "reset": "Atiestatīt"
                 },
+                "time_format": {
+                    "description": "Izvēlieties laika attēlošanas formātu.",
+                    "dropdown_label": "Laika formāts",
+                    "formats": {
+                        "12": "12 stundas (AM/PM)",
+                        "24": "24 stundas",
+                        "language": "Auto (izmantot valodas iestatījumu)",
+                        "system": "Izmantot sistēmas lokalizāciju"
+                    },
+                    "header": "Laika formāts"
+                },
                 "vibrate": {
                     "description": "Iespējot vai atspējot vibrāciju šajā ierīcē, kontrolējot ierīces.",
                     "header": "Vibrācija"
diff --git a/translations/frontend/nb.json b/translations/frontend/nb.json
index 4238eb0c6c..ce4a96535c 100644
--- a/translations/frontend/nb.json
+++ b/translations/frontend/nb.json
@@ -17,6 +17,7 @@
         "calendar": "Kalender",
         "config": "Konfigurasjon",
         "developer_tools": "Utviklerverktøy",
+        "energy": "Energi",
         "history": "Historie",
         "logbook": "Loggbok",
         "mailbox": "Postkasse",
@@ -26,6 +27,14 @@
         "shopping_list": "Handleliste",
         "states": "Oversikt"
     },
+    "state": {
+        "default": {
+            "off": "Av",
+            "on": "På",
+            "unavailable": "Utilgjengelig",
+            "unknown": "Ukjent"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Borte"
         }
     },
-    "state": {
-        "default": {
-            "off": "Av",
-            "on": "På",
-            "unavailable": "Utilgjengelig",
-            "unknown": "Ukjent"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Tillegget er ikke installert"
             }
         },
+        "backup": {
+            "addons": "Tillegg",
+            "confirm_password": "Bekreft passord for øyeblikksbilde",
+            "could_not_create": "Kunne ikke opprette sikkerhetskopi",
+            "create": "Opprett",
+            "create_blocked_not_running": "Å lage en sikkerhetskopi er ikke mulig akkurat nå fordi systemet er i {state} status",
+            "created": "Opprettet",
+            "delete_backup_confirm": "slett",
+            "delete_selected": "Slett valgte sikkerhetskopier",
+            "enter_password": "Vennligst skriv inn et passord",
+            "failed_to_delete": "Kunne ikke slette",
+            "folders": "Mapper",
+            "name": "Navn på øyeblikksbilde",
+            "password": "Passord for øyeblikksbilde",
+            "password_protection": "Passordbeskyttelse",
+            "passwords_not_matching": "Passordene samsvarer ikke",
+            "select_type": "Velg hva du vil gjenopprette",
+            "selected": "{number} valgt",
+            "type": "Type øyeblikksbilde"
+        },
         "common": {
             "cancel": "Avbryt",
             "close": "Lukk",
@@ -366,9 +387,6 @@
                 "text": "Ønsker du å starte tillegget på nytt med endringene dine?"
             },
             "update": {
-                "create_snapshot": "Lag en sikkerhetskopi av {name} før du oppdaterer",
-                "snapshot": "Sikkerhetskopi",
-                "snapshotting": "Oppretter sikkerhetskopi av {name}",
                 "updating": "Oppdaterer {name} til version {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Dashboard",
-            "snapshots": "Snapshots",
             "store": "Tilleggsbutikk",
             "system": "System"
         },
-        "snapshot": {
-            "addons": "Tillegg",
-            "available_snapshots": "Tilgjengelige sikkerhetskopier",
-            "confirm_password": "Bekreft passord for øyeblikksbilde",
-            "could_not_create": "Kunne ikke opprette sikkerhetskopi",
-            "create": "Opprett",
-            "create_blocked_not_running": "Å lage en sikkerhetskopi er ikke mulig akkurat nå fordi systemet er i {state} status",
-            "create_snapshot": "Opprett sikkerhetskopi",
-            "created": "Opprettet",
-            "delete_selected": "Slett valgte sikkerhetskopier",
-            "delete_snapshot_confirm": "slett",
-            "delete_snapshot_text": "Vl du slette {number} {number, plural,\n  one {sikkerhetskopi}\n  other {sikkerhetskopier}\n}?",
-            "delete_snapshot_title": "Slett sikkerhetskopi",
-            "description": "Sikkerhetskopier lar deg enkelt sikkerhetskopiere og gjenopprette alle dataene fra din Home Assistant forekomst",
-            "enter_password": "Vennligst skriv inn et passord",
-            "failed_to_delete": "Kunne ikke slette",
-            "folder": {
-                "addons/local": "Lokale tillegg",
-                "homeassistant": "Home Assistant-konfigurasjon",
-                "media": "",
-                "share": "Delt",
-                "ssl": ""
-            },
-            "folders": "Mapper",
-            "full_snapshot": "Full sikkerhetskopi",
-            "name": "Navn på øyeblikksbilde",
-            "no_snapshots": "Du har ingen sikkerhetskopier ennå",
-            "partial_snapshot": "Delvis sikkerhetskopi",
-            "password": "Passord for øyeblikksbilde",
-            "password_protected": "Passordbeskyttet",
-            "password_protection": "Passordbeskyttelse",
-            "passwords_not_matching": "Passordene samsvarer ikke",
-            "security": "Sikkerhet",
-            "select_type": "Velg hva du vil gjenopprette",
-            "selected": "{number} valgt",
-            "type": "Type øyeblikksbilde",
-            "upload_snapshot": "Last opp sikkerhetskopi"
-        },
         "store": {
             "missing_addons": "Manglende tillegg? Aktivere avansert modus på din brukerprofilside",
             "no_results_found": "Ingen resultater funnet i {repository}",
@@ -471,7 +450,7 @@
                 "channel": "Kanal",
                 "cpu_usage": "Supervisor CPU forbruk",
                 "failed_to_reload": "Kunne ikke laste inn Supervisor på nytt",
-                "failed_to_set_option": "Kan ikke sette Supervisor instilling",
+                "failed_to_set_option": "Kunne ikke sette Supervisor-instilling",
                 "failed_to_update": "Kunne ikke oppdatere Supervisor",
                 "join_beta_action": "Bli med i beta-kanalen",
                 "join_beta_description": "Få beta-oppdateringer for Home Assistant (RCs), Supervisor og vert",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Sluttdato",
+                "ranges": {
+                    "last_week": "Forrige uke",
+                    "this_week": "Denne uken",
+                    "today": "I dag",
+                    "yesterday": "I går"
+                },
                 "select": "Velg",
                 "start_date": "Startdato"
             },
@@ -821,7 +806,7 @@
                     "was_unsafe": "var utrygt"
                 },
                 "retrieval_error": "Feil under henting av loggbokoppføring",
-                "show_trace": "Vis spor"
+                "show_trace": "Vis sporing"
             },
             "media-browser": {
                 "audio_not_supported": "Nettleseren din støtter ikke lydelementet.",
@@ -851,10 +836,10 @@
                 "documentation": "dokumentasjon",
                 "learn_adding_local_media": "Lær mer om å legge til medier i {documentation}.",
                 "local_media_files": "Plasser video-, lyd- og bildefilene dine i mediekatalogen for å kunne bla gjennom og spille dem av i nettleseren eller på støttede mediaspillere.",
+                "media-player-browser": "Nettleser for Mediespiller",
                 "media_browsing_error": "Feil ved medievisning",
                 "media_not_supported": "Browser Media Player støtter ikke denne typen medier",
                 "media_player": "Mediaspiller",
-                "media-player-browser": "Nettleser for Mediespiller",
                 "no_items": "Ingen elementer",
                 "no_local_media_found": "Ingen lokale medier funnet",
                 "no_media_folder": "Det ser ut til at du ennå ikke har opprettet en mediekatalog.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Tjeneste"
             },
+            "statistic-picker": {
+                "learn_more": "Lær mer om statistikk",
+                "missing_entity": "Hvorfor er ikke enheten min oppført?",
+                "no_match": "Fant ingen samsvarende statistikk",
+                "no_statistics": "Du har ingen statistikk",
+                "statistic": "Statistikk"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Laster inn statistikk...",
+                "no_statistics_found": "Ingen statistikk funnet.",
+                "statistic_types": {
+                    "max": "maks",
+                    "mean": "gjennomsnitt",
+                    "min": "min",
+                    "sum": "sum"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Velg område",
                 "add_device_id": "Velg enhet",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Alternativer"
                 },
+                "loading": {
+                    "loading_flow": "Vennligst vent mens alternativene for {integration} initialiseres",
+                    "loading_step": "Laster inn neste steg for {integration}"
+                },
                 "success": {
                     "description": "Alternativene er lagret."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Generelt",
                         "customize": "Tilpasninger",
                         "devices": "Enheter",
+                        "energy": "Energi",
                         "entities": "Entiteter",
                         "helpers": "Hjelpere",
                         "info": "Informasjon",
                         "integrations": "Integrasjoner",
                         "logs": "Logger",
                         "lovelace": "Lovelace instrumentbord",
-                        "navigate_to": "Naviger til {panel}",
                         "person": "Personer",
                         "scene": "Scener",
                         "script": "Skript",
@@ -1360,7 +1366,6 @@
                             "introduction": "Handlingene er det Home Assistant vil utføre når en automasjon utløses",
                             "learn_more": "Lær mer om handlinger",
                             "name": "Handling",
-                            "type_select": "Handlingstype",
                             "type": {
                                 "choose": {
                                     "add_option": "Legg til alternativ",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Gjenta",
                                     "sequence": "Handlinger",
-                                    "type_select": "Gjenta type",
                                     "type": {
                                         "count": {
                                             "label": "Antall"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Mens betingelser",
                                             "label": "Mens"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Gjenta type"
                                 },
                                 "scene": {
                                     "label": "Aktiver scene"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Ventemal"
                                 }
                             },
+                            "type_select": "Handlingstype",
                             "unsupported_action": "Ingen støtte for visuell redigering for handling: {action}"
                         },
                         "alias": "Navn",
@@ -1452,7 +1458,6 @@
                             "introduction": "Betingelsene er valgfrie og vil hindre at automasjonen kjøres med mindre alle betingelsene er oppfylt.",
                             "learn_more": "Lær mer om betingelser",
                             "name": "Betingelse",
-                            "type_select": "Betingelse",
                             "type": {
                                 "and": {
                                     "label": "Og"
@@ -1513,12 +1518,18 @@
                                         "wed": "Onsdag"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Utløser-ID",
+                                    "label": "Utløser",
+                                    "no_triggers": "Ingen utløsere tilgjengelig"
+                                },
                                 "zone": {
                                     "entity": "Entitet med posisjon",
                                     "label": "Sone",
                                     "zone": "Sone"
                                 }
                             },
+                            "type_select": "Betingelse",
                             "unsupported_condition": "Ingen støtte for visuell redigering for betingelse: {condition}"
                         },
                         "copy_to_clipboard": "Kopier til utklippstavle",
@@ -1549,17 +1560,17 @@
                         "move_down": "Flytt ned",
                         "move_up": "Flytt opp",
                         "save": "Lagre",
-                        "show_trace": "Vis spor",
+                        "show_trace": "Vis sporing",
                         "triggers": {
                             "add": "Legg til utløser",
                             "delete": "Slett",
                             "delete_confirm": "Er du sikker på at du vil slette dette?",
                             "duplicate": "Dupliser",
                             "header": "Utløsere",
+                            "id": "Utløser -ID (brukt av utløsertilstanden)",
                             "introduction": "Utløsere er det som starter en automasjonsregel. Det er mulig å spesifisere flere utløsere for samme regel. Når en utløser aktiveres, vil Home Assistant bekrefte betingelsene, hvis noen, og utføre handlingen. \n\n[Lær mer om utløsere.](https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "Lær mer om utløsere",
                             "name": "Utløser",
-                            "type_select": "Utløser",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1625,18 +1636,18 @@
                                     "label": "Mal",
                                     "value_template": "Verdimal"
                                 },
-                                "time_pattern": {
-                                    "hours": "Timer",
-                                    "label": "Tidsmønster",
-                                    "minutes": "Minutter",
-                                    "seconds": "Sekunder"
-                                },
                                 "time": {
                                     "at": "På tidspunktet",
                                     "label": "Tid",
                                     "type_input": "Verdien til en dato/tid hjelper",
                                     "type_value": "Bestemt tid"
                                 },
+                                "time_pattern": {
+                                    "hours": "Timer",
+                                    "label": "Tidsmønster",
+                                    "minutes": "Minutter",
+                                    "seconds": "Sekunder"
+                                },
                                 "webhook": {
                                     "label": "",
                                     "webhook_id": ""
@@ -1650,6 +1661,7 @@
                                     "zone": "Sone"
                                 }
                             },
+                            "type_select": "Utløser",
                             "unsupported_platform": "Ingen støtte for visuell redigering for plattform: {platform}"
                         },
                         "unsaved_confirm": "Du har ulagrede endringer. Er du sikker på at du vil lukke?"
@@ -1782,6 +1794,7 @@
                             "instance_will_be_available": "Din forekomst vil være tilgjengelig på",
                             "link_learn_how_it_works": "Lær hvordan det fungerer",
                             "not_connected": "Ikke tilkoblet",
+                            "reconnecting": "Kobler til på nytt",
                             "remote_enabled": {
                                 "caption": "Koble til automatisk",
                                 "description": "Aktiver dette alternativet for å sikre at Home Assistant-forekomsten alltid er eksternt tilgjengelig."
@@ -1812,9 +1825,9 @@
                             "loading": "Laster inn...",
                             "manage": "Administrer",
                             "no_hooks_yet": "Ser ut som du ikke har noen webhook'er ennå. Kom i gang ved å konfigurere en ",
+                            "no_hooks_yet2": " eller ved å opprette en ",
                             "no_hooks_yet_link_automation": "webhook-automasjon",
                             "no_hooks_yet_link_integration": "webhook-basert integrasjon",
-                            "no_hooks_yet2": " eller ved å opprette en ",
                             "title": "Webhook'er"
                         }
                     },
@@ -1929,41 +1942,13 @@
                     "description": "Enhetssystem, plassering, tidssone og andre generelle parametere",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Før du aktiverer dette, må du gå til analysedokumentasjonssiden {link} for å forstå hva du sender og hvordan den er lagret.",
-                                "header": "Analyser",
-                                "instance_id": "Forekomst-ID: {huuid}",
-                                "introduction": "Del installasjonsinformasjonen din for å gjøre Home Assistant bedre og hjelpe oss med å overbevise produsenter om å legge til lokal kontroll og personvernfokuserte funksjoner.",
-                                "learn_more": "Hvordan vi behandler dataene dine",
-                                "needs_base": "Du må aktivere basisanalyse for at dette alternativet skal være tilgjengelig",
-                                "preference": {
-                                    "base": {
-                                        "description": "Forekomst-ID, versjon og installasjonstype.",
-                                        "title": "Grunnleggende analyse"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Del krasjrapporter når uventede feil oppstår.",
-                                        "title": "Diagnostikk"
-                                    },
-                                    "statistics": {
-                                        "description": "Totalt brukte enheter, brukere og andre elementer.",
-                                        "title": "Bruksstatistikk"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Navn, versjoner og evner.",
-                                        "title": "Brukte integrasjoner og tillegg"
-                                    },
-                                    "usage": {
-                                        "description": "Navn og versjonsinformasjon.",
-                                        "title": "Brukte integrasjoner"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Valuta",
                                 "edit_requires_storage": "Redigering deaktivert da konfigurasjonen er lagret i configuration.yaml.",
                                 "elevation": "Høyde",
                                 "elevation_meters": "meter",
                                 "external_url": "Ekstern URL",
+                                "find_currency_value": "Finn din valutakode",
                                 "imperial_example": "Fahrenheit, pund",
                                 "internal_url": "Intern URL",
                                 "latitude": "Breddegrad",
@@ -2092,6 +2077,63 @@
                     "update": "Oppdater",
                     "update_device_error": "Oppdatering av enheten mislyktes"
                 },
+                "energy": {
+                    "caption": "Energi",
+                    "description": "Overvåk din energiproduksjon- og forbruk",
+                    "device_consumption": {
+                        "add_stat": "Velg entitet å spore energien til",
+                        "dialog": {
+                            "selected_stat_intro": "Velg entiteten som representerer enhetens energiforbruk."
+                        },
+                        "learn_more": "Mer informasjon om hvordan du kommer i gang.",
+                        "selected_stat": "Sporer energi for",
+                        "sub": "Ved å spore energiforbruket til individuelle enheter kan Home Assistant bryte ned energiforbruket ditt etter enhet.",
+                        "title": "Individuelle enheter"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Bruk en entitet med gjeldende pris",
+                                "cost_entity_input": "Entitet med gjeldende pris",
+                                "cost_number": "Bruk en statisk pris",
+                                "cost_number_input": "Pris per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Velg hvordan Home Assistant skal holde oversikt over kostnadene for forbrukt energi.",
+                                "cost_stat": "Bruk en enhet som sporer de totale kostnadene",
+                                "cost_stat_input": "Totale kostnader enhet",
+                                "energy_stat": "Forbrukt energi (kWh)",
+                                "header": "Konfigurer strømnettforbruk",
+                                "no_cost": "Ikke spor kostnader",
+                                "paragraph": "Strømnettforbruk er energien som flyter fra strømnettet til hjemmet ditt."
+                            },
+                            "to": {
+                                "cost_entity": "Bruk en entitet med gjeldende sats",
+                                "cost_entity_input": "Entitet med gjeldende sats",
+                                "cost_number": "Bruk en statisk sats",
+                                "cost_number_input": "Sats per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Får du penger tilbake når du returnerer energi til strømnettet?",
+                                "cost_stat": "Bruk en enhet som sporer de totale mottatte pengene",
+                                "cost_stat_input": "Total kompensasjonsenhet",
+                                "energy_stat": "Energi returnert til strømnettet (kWh)",
+                                "header": "Konfigurer strømnettproduksjon",
+                                "no_cost": "Jeg får ikke penger tilbake",
+                                "paragraph": "Strømnettproduksjon er energien som flyter fra dine solcellepaneler til strømnettet."
+                            }
+                        },
+                        "learn_more": "Mer informasjon om hvordan du kommer i gang.",
+                        "sub": "Konfigurer mengden energi du bruker fra strømnettet-, og gir tilbake til strømnettet hvis du produserer energi. Dette gjør at Home Assistant kan spore hele energiforbruket i hjemmet.",
+                        "title": "Strømnett"
+                    },
+                    "solar": {
+                        "learn_more": "Mer informasjon om hvordan du kommer i gang.",
+                        "stat_predicted_production": "Prediksjon av solenergiproduksjonen din",
+                        "stat_production": "Din solenergiproduksjon",
+                        "stat_return_to_grid": "Solenergi returnert til strømnettet",
+                        "sub": "La Home Assistant overvåke solcellepanelene dine og gi deg innsikt i ytelsen.",
+                        "title": "Solcellepaneler"
+                    }
+                },
                 "entities": {
                     "caption": "Entiteter",
                     "description": "Administrer kjente entiteter",
@@ -2142,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Tøm",
-                    "filtering_by": "Filtrering etter",
-                    "show": "Vis"
-                },
-                "hassio": {
-                    "button": "Konfigurer"
-                },
                 "header": "Konfigurer Home Assistant",
                 "helpers": {
                     "caption": "Hjelpere",
@@ -2199,16 +2233,11 @@
                     "server": "core",
                     "setup_time": "Oppsettstid",
                     "source": "Kilder:",
-                    "system_health_error": "System tilstand komponenten er ikke lastet inn. Legg til 'system_health:' i configuration.yaml",
                     "system_health": {
                         "manage": "Administrer",
                         "more_info": "mer informasjon"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "integrasjonssiden",
-                    "missing_zha": "Mangler ZHA konfigurasjonspanelet? Det ble flyttet til ZHA oppføringen på {integrations_page}.",
-                    "missing_zwave": "Mangler Z-Wave konfigurasjonspanelet? Det ble flyttet til Z-Wave oppføringen på {integrations_page}."
+                    },
+                    "system_health_error": "System tilstand komponenten er ikke lastet inn. Legg til 'system_health:' i configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Legg til integrasjon",
@@ -2223,8 +2252,6 @@
                         "depends_on_cloud": "Avhenger av skyen",
                         "device_unavailable": "Enheten er utilgjengelig",
                         "devices": "{count} {count, plural,\n  one {enhet}\n  other {enheter}\n}",
-                        "disable_error": "Aktivering eller deaktivering av integrasjonen mislyktes",
-                        "disable_restart_confirm": "Start Home Assistant på nytt for å fullføre deaktiveringen av denne integreringen",
                         "disable": {
                             "disable_confirm": "Er du sikker på at du vil deaktivere denne config-oppføringen? Enhetene og enhetene deaktiveres.",
                             "disabled": "Deaktivert",
@@ -2235,6 +2262,8 @@
                             },
                             "disabled_cause": "Deaktivert av {cause}"
                         },
+                        "disable_error": "Aktivering eller deaktivering av integrasjonen mislyktes",
+                        "disable_restart_confirm": "Start Home Assistant på nytt for å fullføre deaktiveringen av denne integreringen",
                         "disabled_polling": "Automatisk avstemning for oppdaterte data deaktivert",
                         "documentation": "Dokumentasjon",
                         "enable_restart_confirm": "Start Home Assistant på nytt for å fullføre aktiveringen av denne integreringen",
@@ -2242,11 +2271,9 @@
                         "entity_unavailable": "Enhet utilgjengelig",
                         "firmware": "Fastvare: {version}",
                         "hub": "Tilkoblet via",
-                        "logs": "Logger",
                         "manuf": "av {manufacturer}",
                         "no_area": "Intet område",
                         "not_loaded": "Ikke lastet",
-                        "options": "Alternativer",
                         "provided_by_custom_integration": "Levert av en tilpasset integrasjon",
                         "reload": "Last inn på nytt",
                         "reload_confirm": "Integrasjonen ble lastet på nytt",
@@ -2278,7 +2305,11 @@
                             "open_site": "Åpne nettsted"
                         },
                         "finish": "Fullfør",
-                        "loading_first_time": "Vennligst vent mens integrasjonen installeres",
+                        "loading": {
+                            "fallback_title": "integrasjonen",
+                            "loading_flow": "Vennligst vent mens {integration} settes opp",
+                            "loading_step": "Laster inn neste steg for {integration}"
+                        },
                         "next": "Neste",
                         "not_all_required_fields": "Ikke alle obligatoriske felt er fylt ut.",
                         "not_loaded": "Integrasjonen kunne ikke lastes, prøv å starte Home Assistant på nytt.",
@@ -2295,7 +2326,6 @@
                     "details": "Integrasjonsdetaljer",
                     "disable": {
                         "disabled_integrations": "{number} deaktivert",
-                        "hide_disabled": "Skjul deaktiverte integrasjoner",
                         "show": "Vis",
                         "show_disabled": "Vis deaktiverte integrasjoner"
                     },
@@ -2306,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Slutt å ignorere {name}?",
                         "confirm_ignore": "Er du sikker på at du ikke vil sette opp denne integrasjonen? Du kan angre ved å klikke på 'Vis ignorerte integrasjoner' i overflow-menyen øverst til høyre.",
                         "confirm_ignore_title": "Ignorer automatisk oppdagelse av {name}?",
-                        "hide_ignored": "Skjul ignorerte integrasjoner",
                         "ignore": "Ignorer",
                         "ignored": "Ignorert",
                         "show_ignored": "Vis ignorerte integrasjoner",
@@ -2426,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfigurer",
                     "description_listen": "Lytt til et emne",
                     "description_publish": "Publiser en pakke",
                     "listening_to": "Lytter til",
@@ -2440,7 +2468,6 @@
                     "topic": "emne"
                 },
                 "ozw": {
-                    "button": "Konfigurer",
                     "common": {
                         "controller": "Kontroller",
                         "instance": "Forekomst",
@@ -2465,6 +2492,11 @@
                         "nodes": "Noder",
                         "select_instance": "Velg Forekomst"
                     },
+                    "network": {
+                        "header": "Nettverksadministrasjon",
+                        "introduction": "Administrer funksjoner for hele nettverket.",
+                        "node_count": "{count} noder"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Alle noder har blitt spurt",
@@ -2485,10 +2517,9 @@
                         "starting": "Starter",
                         "unknown": "Ukjent"
                     },
-                    "network": {
-                        "header": "Nettverksadministrasjon",
-                        "introduction": "Administrer funksjoner for hele nettverket.",
-                        "node_count": "{count} noder"
+                    "node": {
+                        "button": "Node detaljer",
+                        "not_found": "Finner ikke noden"
                     },
                     "node_config": {
                         "header": "Nodekonfigurasjon",
@@ -2518,10 +2549,6 @@
                         "versions": "Henter informasjon om fastvare- og kommandoklasseversjoner",
                         "wakeup": "Konfigurere støtte for vekkekøer og meldinger"
                     },
-                    "node": {
-                        "button": "Node detaljer",
-                        "not_found": "Finner ikke noden"
-                    },
                     "nodes_table": {
                         "failed": "Mislyktes",
                         "id": "ID",
@@ -2664,10 +2691,12 @@
                         },
                         "save_script": "Lagre skript",
                         "sequence": "Sekvens",
-                        "sequence_sentence": "Sekvensen av handlingene til dette skriptet."
+                        "sequence_sentence": "Sekvensen av handlingene til dette skriptet.",
+                        "show_trace": "Vis sporing"
                     },
                     "picker": {
                         "add_script": "Legg til skript",
+                        "dev_script": "Feilsøk skript",
                         "duplicate": "Dupliser",
                         "duplicate_script": "Dupliser skript",
                         "edit_script": "Rediger skript",
@@ -2703,7 +2732,7 @@
                             "input_number": "Inndatanumre",
                             "input_select": "Inngang velges",
                             "input_text": "Inngangstekster",
-                            "introduction": "Noen deler av Home Assistant kan laste inn uten å kreve omstart. Hvis du trykker last på nytt, vil du bytte den nåværende konfigurasjonen med den nye.",
+                            "introduction": "Noen deler av Home Assistant kan lastes inn på nytt uten at det krever omstart. Hvis du klikker på et av alternativene nedenfor, vil den nåværende YAML -konfigurasjonen lastes ut og den nye lastes inn.",
                             "min_max": "Min/maks enheter",
                             "mqtt": "Manuelt konfigurerte MQTT-enheter",
                             "person": "Personer",
@@ -2824,7 +2853,6 @@
                         "search_again": "Søk på nytt",
                         "spinner": "Søker etter ZHA ZigBee-enheter..."
                     },
-                    "button": "Konfigurer",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attributter for den valgte klyngen",
                         "get_zigbee_attribute": "Hent ZigBee-attributt",
@@ -2854,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Snarveier",
-                        "update_button": "Oppdater konfigurasjon",
-                        "zha_options": {
-                            "default_light_transition": "Standard overgangstid for lys (sekunder)",
-                            "enable_identify_on_join": "Aktiver identifiseringseffekt når enheter blir med i nettverket",
-                            "title": "Globale alternativer"
-                        }
+                        "update_button": "Oppdater konfigurasjon"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Konfigurasjonen er fullført",
@@ -2941,123 +2964,7 @@
                     "introduction": "Med soner kan du angi bestemte områder på jorden. Når en person er innenfor en sone, vil tilstanden til enheten ta navnet fra sonen. Soner kan også brukes som en utløser eller betingelse i automasjoner.",
                     "no_zones_created_yet": "Det ser ikke ut som du har opprettet noen soner enda"
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Avbryt inkludering",
-                        "controller_in_inclusion_mode": "Z-Wave-kontrolleren er nå i inkluderingsmodus",
-                        "follow_device_instructions": "Følg instruksjonene som fulgte med enheten for å utløse sammenkobling på enheten",
-                        "inclusion_failed": "Noden kunne ikke legges til. Vennligst sjekk loggene for mer informasjon.",
-                        "inclusion_finished": "Noden er lagt til.",
-                        "interview_failed": "Enhetsintervjuet mislyktes. Ytterligere informasjon kan være tilgjengelig i loggene.",
-                        "interview_started": "Enheten blir intervjuet. Dette kan ta litt tid.",
-                        "introduction": "Denne veiviseren vil guide deg gjennom å legge til en node i Z-Wave-nettverket ditt",
-                        "secure_inclusion_warning": "Sikre enheter krever ekstra båndbredde; for mange sikre enheter kan redusere Z-Wave-nettverket. Vi anbefaler bare å bruke sikker inkludering for enheter som krever det, for eksempel låser eller garasjeportåpnere.",
-                        "start_inclusion": "Start inkludering",
-                        "start_secure_inclusion": "Start sikker inkludering",
-                        "title": "Legg til en Z-Wave-node",
-                        "use_secure_inclusion": "Bruk sikker inkludering",
-                        "view_device": "Vis enhet"
-                    },
-                    "button": "Konfigurer",
-                    "common": {
-                        "add_node": "Legg til node",
-                        "close": "Lukk",
-                        "heal_network": "Helbrede nettverk",
-                        "home_id": "Hjem-ID",
-                        "network": "Nettverk",
-                        "node_id": "Node-ID",
-                        "reconfigure_server": "Konfigurer server på nytt",
-                        "remove_node": "Fjern node"
-                    },
-                    "dashboard": {
-                        "driver_version": "Driverversjon",
-                        "dump_dead_nodes_text": "Noen av nodene dine svarte ikke og antas døde. Disse vil ikke bli fullstendig eksportert.",
-                        "dump_dead_nodes_title": "Noen av nodene dine er døde",
-                        "dump_debug": "Last ned en dump av nettverket ditt for å diagnostisere problemer",
-                        "dump_not_ready_confirm": "Last ned",
-                        "dump_not_ready_text": "Hvis du oppretter en eksport før alle noder er klare, kan du gå glipp av nødvendige data. Gi nettverket litt tid til å spørre alle noder. Vil du fortsette med dumpen?",
-                        "dump_not_ready_title": "Alle noder er ikke klare ennå",
-                        "header": "Administrere Z-Wave-nettverket",
-                        "home_id": "Hjem-ID",
-                        "introduction": "Administrer Z-Wave-nettverket og Z-Wave-nodene dine",
-                        "nodes_ready": "Noder klare",
-                        "server_version": "Serverversjon"
-                    },
-                    "device_info": {
-                        "device_config": "Konfigurer enhet",
-                        "node_ready": "Node klar",
-                        "node_status": "Node status",
-                        "zwave_info": "Z-Wave Informasjon"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Nettverkshelbredelse er avbrutt.",
-                        "healing_complete": "Nettverksheling er fullført.",
-                        "healing_failed": "Helbredelse mislyktes. Ytterligere informasjon kan være tilgjengelig i loggene.",
-                        "in_progress": "Nettverkshelbredelse pågår. Dette vil ta litt tid.",
-                        "introduction": "Start en nettverkshelbredelse på Z-Wave-nettverket. En nettverkshelbredelse vil føre til at alle enheter beregner rutene sine tilbake til kontrolleren, og anbefales hvis du nylig har flyttet enheter eller kontrolleren din.",
-                        "run_in_background": "Du kan lukke denne dialogboksen, og nettverksreparasjonen fortsetter i bakgrunnen.",
-                        "start_heal": "Begynn å helbrede",
-                        "stop_heal": "Stopp helbredelse",
-                        "title": "Helbred ditt Z-Wave-nettverk",
-                        "traffic_warning": "Helbredelsesprosessen genererer stor trafikk på Z-Wave-nettverket. Dette kan føre til at enheter reagerer sakte (eller ikke i det hele tatt) mens legingen pågår."
-                    },
-                    "logs": {
-                        "log_level": "Loggnivå",
-                        "log_level_changed": "Loggnivå endret til: {level}",
-                        "subscribed_to_logs": "Abonnerer på Z-Wave JS-loggmeldinger ...",
-                        "title": "Z-Wave JS-logger"
-                    },
-                    "navigation": {
-                        "logs": "Logger",
-                        "network": "Nettverk"
-                    },
-                    "network_status": {
-                        "connected": "Tilkoblet",
-                        "connecting": "Kobler til",
-                        "unknown": "Ukjent"
-                    },
-                    "node_config": {
-                        "attribution": "Enhetskonfigurasjonsparametere og beskrivelser er gitt av {device_database}",
-                        "battery_device_notice": "Batterienheter må være våken for å oppdatere konfigurasjonen. Se enhetshåndboken for instruksjoner om hvordan du vekker enheten.",
-                        "error_device_not_found": "Enhet ikke funnet",
-                        "header": "Z-Wave enhetskonfigurasjon",
-                        "introduction": "Administrer og juster enhets (node) spesifikke konfigurasjonsparametere for den valgte enheten",
-                        "parameter_is_read_only": "Denne parameteren er skrivebeskyttet.",
-                        "set_param_accepted": "Parameteren er oppdatert.",
-                        "set_param_error": "Det oppstod en feil.",
-                        "set_param_queued": "Parameterendringen har blitt satt i kø, og vil bli oppdatert når enheten våkner.",
-                        "zwave_js_device_database": "Z-Wave JS Device Database"
-                    },
-                    "node_status": {
-                        "alive": "Levende",
-                        "asleep": "Sover",
-                        "awake": "Våken",
-                        "dead": "Død",
-                        "unknown": "Ukjent"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Du må vekke batteridrevne enheter før du begynner på nytt intervju. Se enhetens håndbok for instruksjoner om hvordan du vekker enheten.",
-                        "in_progress": "Enheten blir intervjuet. Dette kan ta litt tid.",
-                        "interview_complete": "Enhetsintervjuet er fullført.",
-                        "interview_failed": "Enhetsintervjuet mislyktes. Ytterligere informasjon kan være tilgjengelig i loggene.",
-                        "introduction": "Intervju en enhet på nytt på Z-Wave-nettverket. Bruk denne funksjonen hvis enheten mangler eller ikke har feil funksjonalitet.",
-                        "run_in_background": "Du kan lukke denne dialogen, og intervjuet fortsetter i bakgrunnen.",
-                        "start_reinterview": "Start Re-intervju",
-                        "title": "Intervju en Z-Wave-enhet på nytt"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Avbryt ekskludering",
-                        "controller_in_exclusion_mode": "Z-Wave-kontrolleren er nå i ekskluderingsmodus",
-                        "exclusion_failed": "Noden kunne ikke fjernes. Vennligst sjekk loggene for mer informasjon.",
-                        "exclusion_finished": "Node {id} er fjernet fra Z-Wave-nettverket",
-                        "follow_device_instructions": "Følg instruksjonene som fulgte med enheten for å utløse ekskludering på enheten",
-                        "introduction": "Fjern en node fra Z-Wave-nettverket, og fjern den tilknyttede enheten og entitetene fra Home Assistant",
-                        "start_exclusion": "Start ekskludering",
-                        "title": "Fjern en Z-Wave-node"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfigurer",
                     "common": {
                         "index": "Indeks",
                         "instance": "Forekomst",
@@ -3146,6 +3053,144 @@
                     "values": {
                         "header": "Nodeverdier"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Avbryt inkludering",
+                        "controller_in_inclusion_mode": "Z-Wave-kontrolleren er nå i inkluderingsmodus",
+                        "follow_device_instructions": "Følg instruksjonene som fulgte med enheten for å utløse sammenkobling på enheten",
+                        "inclusion_failed": "Noden kunne ikke legges til. Vennligst sjekk loggene for mer informasjon.",
+                        "inclusion_finished": "Noden er lagt til.",
+                        "interview_failed": "Enhetsintervjuet mislyktes. Ytterligere informasjon kan være tilgjengelig i loggene.",
+                        "interview_started": "Enheten blir intervjuet. Dette kan ta litt tid.",
+                        "introduction": "Denne veiviseren vil guide deg gjennom å legge til en node i Z-Wave-nettverket ditt",
+                        "secure_inclusion_warning": "Sikre enheter krever ekstra båndbredde; for mange sikre enheter kan redusere Z-Wave-nettverket. Vi anbefaler bare å bruke sikker inkludering for enheter som krever det, for eksempel låser eller garasjeportåpnere.",
+                        "start_inclusion": "Start inkludering",
+                        "start_secure_inclusion": "Start sikker inkludering",
+                        "title": "Legg til en Z-Wave-node",
+                        "use_secure_inclusion": "Bruk sikker inkludering",
+                        "view_device": "Vis enhet"
+                    },
+                    "common": {
+                        "add_node": "Legg til node",
+                        "close": "Lukk",
+                        "heal_network": "Helbrede nettverk",
+                        "home_id": "Hjem-ID",
+                        "network": "Nettverk",
+                        "node_id": "Node-ID",
+                        "reconfigure_server": "Konfigurer server på nytt",
+                        "remove_node": "Fjern node",
+                        "source": "Kilde"
+                    },
+                    "dashboard": {
+                        "driver_version": "Driverversjon",
+                        "dump_dead_nodes_text": "Noen av nodene dine svarte ikke og antas døde. Disse vil ikke bli fullstendig eksportert.",
+                        "dump_dead_nodes_title": "Noen av nodene dine er døde",
+                        "dump_debug": "Last ned en dump av nettverket ditt for å diagnostisere problemer",
+                        "dump_not_ready_confirm": "Last ned",
+                        "dump_not_ready_text": "Hvis du oppretter en eksport før alle noder er klare, kan du gå glipp av nødvendige data. Gi nettverket litt tid til å spørre alle noder. Vil du fortsette med dumpen?",
+                        "dump_not_ready_title": "Alle noder er ikke klare ennå",
+                        "header": "Administrere Z-Wave-nettverket",
+                        "home_id": "Hjem-ID",
+                        "introduction": "Administrer Z-Wave-nettverket og Z-Wave-nodene dine",
+                        "nodes_ready": "Noder klare",
+                        "server_version": "Serverversjon"
+                    },
+                    "device_info": {
+                        "device_config": "Konfigurer enhet",
+                        "heal_node": "Helbrede node",
+                        "node_ready": "Node klar",
+                        "node_status": "Node status",
+                        "reinterview_device": "Intervju enheten på nytt",
+                        "remove_failed": "Fjern feilet enhet",
+                        "zwave_info": "Z-Wave Informasjon"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Nettverkshelbredelse er avbrutt.",
+                        "healing_complete": "Nettverksheling er fullført.",
+                        "healing_failed": "Helbredelse mislyktes. Ytterligere informasjon kan være tilgjengelig i loggene.",
+                        "in_progress": "Nettverkshelbredelse pågår. Dette vil ta litt tid.",
+                        "introduction": "Start en nettverkshelbredelse på Z-Wave-nettverket. En nettverkshelbredelse vil føre til at alle enheter beregner rutene sine tilbake til kontrolleren, og anbefales hvis du nylig har flyttet enheter eller kontrolleren din.",
+                        "run_in_background": "Du kan lukke denne dialogboksen, og nettverksreparasjonen fortsetter i bakgrunnen.",
+                        "start_heal": "Begynn å helbrede",
+                        "stop_heal": "Stopp helbredelse",
+                        "title": "Helbred ditt Z-Wave-nettverk",
+                        "traffic_warning": "Helbredelsesprosessen genererer stor trafikk på Z-Wave-nettverket. Dette kan føre til at enheter reagerer sakte (eller ikke i det hele tatt) mens legingen pågår."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} er helbredet.",
+                        "healing_failed": "{device} kunne ikke helbredes.",
+                        "healing_failed_check_logs": "Ytterligere informasjon kan være tilgjengelig i loggene.",
+                        "in_progress": "Helbredelse av {device} pågår.",
+                        "introduction": "Be {device} om å oppdatere sine ruter tilbake til kontrolleren. Dette kan hjelpe deg med kommunikasjonsproblemer hvis du nylig har flyttet enheten eller kontrolleren.",
+                        "network_heal_in_progress": "Helbredelse av Z-Wave-nettverket pågår allerede. Vent til den er ferdig før du helbreder en individuell enhet.",
+                        "start_heal": "Helbred Enhet",
+                        "title": "Helbred en Z-Wave-enhet",
+                        "traffic_warning": "Helbredelsesprosessen genererer en stor mengde trafikk på Z-Wave-nettverket. Dette kan føre til at enheter reagerer sakte (eller ikke i det hele tatt) mens helbredelsen pågår."
+                    },
+                    "logs": {
+                        "log_level": "Loggnivå",
+                        "log_level_changed": "Loggnivå endret til: {level}",
+                        "subscribed_to_logs": "Abonnerer på Z-Wave JS-loggmeldinger ...",
+                        "title": "Z-Wave JS-logger"
+                    },
+                    "navigation": {
+                        "logs": "Logger",
+                        "network": "Nettverk"
+                    },
+                    "network_status": {
+                        "connected": "Tilkoblet",
+                        "connecting": "Kobler til",
+                        "unknown": "Ukjent"
+                    },
+                    "node_config": {
+                        "attribution": "Enhetskonfigurasjonsparametere og beskrivelser er gitt av {device_database}",
+                        "battery_device_notice": "Batterienheter må være våken for å oppdatere konfigurasjonen. Se enhetshåndboken for instruksjoner om hvordan du vekker enheten.",
+                        "error_device_not_found": "Enhet ikke funnet",
+                        "header": "Z-Wave enhetskonfigurasjon",
+                        "introduction": "Administrer og juster enhets (node) spesifikke konfigurasjonsparametere for den valgte enheten",
+                        "parameter": "Parameter",
+                        "parameter_is_read_only": "Denne parameteren er skrivebeskyttet.",
+                        "set_param_accepted": "Parameteren er oppdatert.",
+                        "set_param_error": "Det oppstod en feil.",
+                        "set_param_queued": "Parameterendringen har blitt satt i kø, og vil bli oppdatert når enheten våkner.",
+                        "zwave_js_device_database": "Z-Wave JS Device Database"
+                    },
+                    "node_status": {
+                        "alive": "Levende",
+                        "asleep": "Sover",
+                        "awake": "Våken",
+                        "dead": "Død",
+                        "unknown": "Ukjent"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Du må vekke batteridrevne enheter før du begynner på nytt intervju. Se enhetens håndbok for instruksjoner om hvordan du vekker enheten.",
+                        "in_progress": "Enheten blir intervjuet. Dette kan ta litt tid.",
+                        "interview_complete": "Enhetsintervjuet er fullført.",
+                        "interview_failed": "Enhetsintervjuet mislyktes. Ytterligere informasjon kan være tilgjengelig i loggene.",
+                        "introduction": "Intervju en enhet på nytt på Z-Wave-nettverket. Bruk denne funksjonen hvis enheten mangler eller ikke har feil funksjonalitet.",
+                        "run_in_background": "Du kan lukke denne dialogen, og intervjuet fortsetter i bakgrunnen.",
+                        "start_reinterview": "Start Re-intervju",
+                        "title": "Intervju en Z-Wave-enhet på nytt"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Fjerning av enheten pågår.",
+                        "introduction": "Fjern en feilet enhet fra ditt Z-Wave-nettverk. Bruk dette hvis du ikke kan ekskludere en enhet på normalt vis, eksempelvis hvis enheten er ødelagt.",
+                        "removal_failed": "Enheten kunne ikke fjernes fra ditt Z-Wave-nettverk.",
+                        "removal_finished": "Node {id} er fjernet fra ditt Z-Wave-nettverk.",
+                        "remove_device": "Fjern enhet",
+                        "title": "Fjern en feilet Z-Wave-enhet"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Avbryt ekskludering",
+                        "controller_in_exclusion_mode": "Z-Wave-kontrolleren er nå i ekskluderingsmodus",
+                        "exclusion_failed": "Noden kunne ikke fjernes. Vennligst sjekk loggene for mer informasjon.",
+                        "exclusion_finished": "Node {id} er fjernet fra Z-Wave-nettverket",
+                        "follow_device_instructions": "Følg instruksjonene som fulgte med enheten for å utløse ekskludering på enheten",
+                        "introduction": "Fjern en node fra Z-Wave-nettverket, og fjern den tilknyttede enheten og entitetene fra Home Assistant",
+                        "start_exclusion": "Start ekskludering",
+                        "title": "Fjern en Z-Wave-node"
+                    }
                 }
             },
             "custom": {
@@ -3228,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Gå tilbake",
-                "supervisor": {
-                    "ask": "Be om hjelp",
-                    "observer": "Sjekk observatøren",
-                    "reboot": "Prøv en omstart av verten",
-                    "system_health": "Sjekk systemtilstand",
-                    "title": "Kunne ikke laste Supervisor-panelet!",
-                    "wait": "Hvis du nettopp startet, må du sørge for at du har gitt veilederen nok tid til å starte."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Forrige uke",
-                    "this_week": "Denne uken",
-                    "today": "I dag",
-                    "yesterday": "I går"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Forrige uke",
-                    "this_week": "Denne uken",
-                    "today": "I dag",
-                    "yesterday": "I går"
+            "energy": {
+                "charts": {
+                    "by_device": "Forbruk etter enhet",
+                    "solar": "Solenergi",
+                    "stat_house_energy_meter": "Totalt energiforbruk"
+                },
+                "setup": {
+                    "back": "Tilbake",
+                    "done": "Vis meg mitt energidashboard!",
+                    "next": "Neste"
                 }
             },
             "lovelace": {
@@ -3366,7 +3396,6 @@
                         "entities": {
                             "description": "Entities card er den vanligste typen kort. Den grupperer elementer i lister.",
                             "edit_special_row": "Vis detaljene for denne raden ved å klikke på redigeringsknappen",
-                            "entity_row_editor": "Redigeringsprogram for enhetsrad",
                             "entity_row": {
                                 "attribute": "Attributt",
                                 "button": "Knapp",
@@ -3378,6 +3407,7 @@
                                 "section": "Seksjon",
                                 "weblink": "Weblink"
                             },
+                            "entity_row_editor": "Redigeringsprogram for enhetsrad",
                             "name": "Entiteter",
                             "secondary_info_values": {
                                 "brightness": "Lysstyrke",
@@ -3404,6 +3434,7 @@
                         "gauge": {
                             "description": "Gauge-kortet er et grunnleggende kort som gjør det mulig å se sensordata visuelt.",
                             "name": "Måler",
+                            "needle_gauge": "Vis som måler med nål?",
                             "severity": {
                                 "define": "Definer alvorlighetsgrad?",
                                 "green": "Grønn",
@@ -3416,6 +3447,7 @@
                             "attribute": "Attributt",
                             "camera_image": "Kameraentitet",
                             "camera_view": "Kameravisning",
+                            "days_to_show": "Dager som skal vises",
                             "double_tap_action": "Dobbeltklikk handling",
                             "entities": "Entiteter",
                             "entity": "Entitet",
@@ -3529,6 +3561,10 @@
                             "integration_not_loaded": "Dette kortet krever at `shopping_list` integrasjonen er satt opp.",
                             "name": "Handleliste"
                         },
+                        "statistics-graph": {
+                            "description": "Med Statistics Graph -kortet kan du vise en graf over statistikken for hver av enhetene som er oppført.",
+                            "name": "Statistikkgraf"
+                        },
                         "thermostat": {
                             "description": "Termostatkortet gir kontroll over din klimaentitet. Lar deg endre temperatur og modus for entiteten.",
                             "name": "Termostat"
@@ -3598,6 +3634,12 @@
                         "tab_badges": "Merker",
                         "tab_settings": "Innstillinger",
                         "tab_visibility": "Synlighet",
+                        "type": "Vis type",
+                        "types": {
+                            "masonry": "Murverk (standard)",
+                            "panel": "Panel (1 kort)",
+                            "sidebar": "Sidepanel"
+                        },
                         "visibility": {
                             "select_users": "Velg hvilke brukere som skal se denne visningen i navigasjonen"
                         }
@@ -3652,7 +3694,6 @@
                         "unsaved_changes": "Ulagrede endringer"
                     },
                     "save_config": {
-                        "cancel": "Glem det",
                         "close": "Lukk",
                         "empty_config": "Start med et tomt instrumentbord",
                         "header": "Ta kontroll over Lovelace brukergrensesnittet ditt",
@@ -3681,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Dette gjengir det første kortet i full bredde. Andre kort i denne visningen samt merker vil ikke bli gjengitt.",
-                            "title": "Panel modus?",
                             "warning_multiple_cards": "Denne visningen inneholder mer enn ett kort, men en panelvisning kan bare vise 1 kort."
                         }
                     }
@@ -3885,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Neste",
-                    "intro": "Del analyser fra forekomsten din. Disse dataene vil være offentlig tilgjengelige på {link}"
+                    "finish": "Neste"
                 },
                 "core-config": {
                     "button_detect": "Oppdag",
@@ -3908,12 +3946,10 @@
                 "restore": {
                     "addons": "Tillegg",
                     "confirm_password": "Bekreft passord for øyeblikksbilde",
-                    "description": "Alternativt kan du gjenopprette fra et forrige snapshot.",
+                    "description": "Alternativt kan du gjenopprette fra et forrige backup.",
                     "folders": "Mapper",
-                    "full_snapshot": "Full sikkerhetskopi",
                     "hide_log": "Skjul full logg",
                     "in_progress": "Gjenoppretting pågår",
-                    "partial_snapshot": "Delvis sikkerhetskopi",
                     "password": "Passord for øyeblikksbilde",
                     "password_protection": "Passordbeskyttelse",
                     "select_type": "Velg hva du vil gjenopprette",
@@ -3995,6 +4031,12 @@
                     "prompt_copy_token": "Kopier tilgangstoken. Det blir ikke vist igjen.",
                     "prompt_name": "Gi tokenet et navn"
                 },
+                "mfa": {
+                    "confirm_disable": "Er du sikker på at du vil deaktivere {name}?",
+                    "disable": "Deaktiver",
+                    "enable": "Aktiver",
+                    "header": "Flerfaktor godkjenningsmoduler"
+                },
                 "mfa_setup": {
                     "close": "Lukk",
                     "step_done": "Oppsett fullført for {step}",
@@ -4002,12 +4044,6 @@
                     "title_aborted": "Avbrutt",
                     "title_success": "Suksess!"
                 },
-                "mfa": {
-                    "confirm_disable": "Er du sikker på at du vil deaktivere {name}?",
-                    "disable": "Deaktiver",
-                    "enable": "Aktiver",
-                    "header": "Flerfaktor godkjenningsmoduler"
-                },
                 "number_format": {
                     "description": "Velg hvordan tallene skal formateres.",
                     "dropdown_label": "Tallformat",
diff --git a/translations/frontend/nl.json b/translations/frontend/nl.json
index 2458787e5e..08012fba4c 100644
--- a/translations/frontend/nl.json
+++ b/translations/frontend/nl.json
@@ -17,6 +17,7 @@
         "calendar": "Kalender",
         "config": "Instellingen",
         "developer_tools": "Ontwikkelhulpmiddelen",
+        "energy": "Energie",
         "history": "Geschiedenis",
         "logbook": "Logboek",
         "mailbox": "Postvak",
@@ -26,6 +27,14 @@
         "shopping_list": "Boodschappenlijst",
         "states": "Overzicht"
     },
+    "state": {
+        "default": {
+            "off": "Uit",
+            "on": "Aan",
+            "unavailable": "Niet beschikbaar",
+            "unknown": "Onbekend"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Afwezig"
         }
     },
-    "state": {
-        "default": {
-            "off": "Uit",
-            "on": "Aan",
-            "unavailable": "Niet beschikbaar",
-            "unknown": "Onbekend"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Add-on is niet geïnstalleerd"
             }
         },
+        "backup": {
+            "addons": "Invoegtoepassingen",
+            "confirm_password": "Bevestig Backup-wachtwoord",
+            "could_not_create": "Kon geen backup maken",
+            "create": "Maak",
+            "create_blocked_not_running": "Het maken van een backup is nu niet mogelijk omdat het systeem in {state} staat.",
+            "created": "Gemaakt",
+            "delete_backup_confirm": "verwijder",
+            "delete_selected": "Verwijder geselecteerde backups",
+            "enter_password": "Voer een wachtwoord in.",
+            "failed_to_delete": "Verwijderen mislukt",
+            "folders": "Mappen",
+            "name": "Backup naam",
+            "password": "Backup wachtwoord",
+            "password_protection": "Wachtwoord bescherming",
+            "passwords_not_matching": "De wachtwoorden komen niet overeen",
+            "select_type": "Selecteer wat u wilt herstellen",
+            "selected": "{number} geselecteerd",
+            "type": "Backup type"
+        },
         "common": {
             "cancel": "Annuleren",
             "close": "Sluiten",
@@ -366,9 +387,6 @@
                 "text": "Wilt u de invoegtoepassing opnieuw starten met uw wijzigingen?"
             },
             "update": {
-                "create_snapshot": "Maak een snapshot van {name} voordat u gaat bijwerken",
-                "snapshot": "Snapshot",
-                "snapshotting": "Een snapshot van {name} aan het maken",
                 "updating": "Bijwerken van {name} naar versie {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Dashboard",
-            "snapshots": "Snapshots",
             "store": "Add-on Store",
             "system": "Systeem"
         },
-        "snapshot": {
-            "addons": "Invoegtoepassingen",
-            "available_snapshots": "Beschikbare snapshots",
-            "confirm_password": "Bevestig Snapshot-wachtwoord",
-            "could_not_create": "Kon geen snapshot maken",
-            "create": "Maak",
-            "create_blocked_not_running": "Het maken van een snapshot is nu niet mogelijk omdat het systeem in {state} staat.",
-            "create_snapshot": "Maak snapshot",
-            "created": "Gemaakt",
-            "delete_selected": "Verwijder geselecteerde snapshots",
-            "delete_snapshot_confirm": "verwijder",
-            "delete_snapshot_text": "Wilt u {number} {number, plural,\n  one {snapshot}\n  other {snapshots}\n} verwijderen?",
-            "delete_snapshot_title": "Verwijder snapshot",
-            "description": "Met snapshots kunt u gemakkelijk een back-up maken van alle gegevens van uw Home Assistant en ze herstellen.",
-            "enter_password": "Voer een wachtwoord in.",
-            "failed_to_delete": "Verwijderen mislukt",
-            "folder": {
-                "addons/local": "Lokale invoegtoepassingen",
-                "homeassistant": "Home Assistant configuratie",
-                "media": "Media",
-                "share": "Deel",
-                "ssl": "SSL"
-            },
-            "folders": "Mappen",
-            "full_snapshot": "Volledige snapshot",
-            "name": "Snapshot naam",
-            "no_snapshots": "Je hebt nog geen snapshots.",
-            "partial_snapshot": "Gedeeltelijke snapshot",
-            "password": "Snapshot wachtwoord",
-            "password_protected": "beveiligd met wachtwoord",
-            "password_protection": "Wachtwoord bescherming",
-            "passwords_not_matching": "De wachtwoorden komen niet overeen",
-            "security": "Beveiliging",
-            "select_type": "Selecteer wat u wilt herstellen",
-            "selected": "{number} geselecteerd",
-            "type": "Snapshot type",
-            "upload_snapshot": "Upload snapshot"
-        },
         "store": {
             "missing_addons": "Mis je de invoegtoepassingen? Schakel de geavanceerde modus in op uw gebruikersprofiel pagina",
             "no_results_found": "Geen resultaten gevonden in {repository}.",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Einddatum",
+                "ranges": {
+                    "last_week": "Vorige week",
+                    "this_week": "Deze week",
+                    "today": "Vandaag",
+                    "yesterday": "Gisteren"
+                },
                 "select": "Selecteer",
                 "start_date": "Startdatum"
             },
@@ -851,10 +836,10 @@
                 "documentation": "documentatie",
                 "learn_adding_local_media": "Leer meer over media toevoegen in de {documentation}.",
                 "local_media_files": "Plaats je video, audio en foto bestanden in de media map om bestanden te kunnen doorzoeken en afspelen in de browser of op ondersteunde mediaspelers.",
+                "media-player-browser": "Mediaspeler-browser",
                 "media_browsing_error": "Fout bij bladeren door media",
                 "media_not_supported": "De Browser Media Player ondersteunt dit type media niet",
                 "media_player": "Mediaspeler",
-                "media-player-browser": "Mediaspeler-browser",
                 "no_items": "Niets gevonden",
                 "no_local_media_found": "Geen lokale media gevonden",
                 "no_media_folder": "Het lijkt erop dat je nog geen media map hebt gemaakt.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Service"
             },
+            "statistic-picker": {
+                "learn_more": "Meer informatie over statistieken",
+                "missing_entity": "Waarom staat mijn entiteit niet in de lijst?",
+                "no_match": "Geen overeenkomende statistieken gevonden",
+                "no_statistics": "U heeft geen statistieken",
+                "statistic": "Statistiek"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Statistieken laden...",
+                "no_statistics_found": "Geen statistieken gevonden.",
+                "statistic_types": {
+                    "max": "max",
+                    "mean": "gemiddeld",
+                    "min": "min",
+                    "sum": "som"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Kies gebied",
                 "add_device_id": "Kies apparaat",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Instellingen"
                 },
+                "loading": {
+                    "loading_flow": "Even geduld a.u.b. terwijl de opties voor {integration} worden geïnitialiseerd",
+                    "loading_step": "Volgende stap laden voor {integration}"
+                },
                 "success": {
                     "description": "Instellingen succesvol opgeslagen."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Algemeen",
                         "customize": "Aanpassingen",
                         "devices": "Apparaten",
+                        "energy": "Energie",
                         "entities": "Entiteiten",
                         "helpers": "Helpers",
                         "info": "Info",
                         "integrations": "Integraties",
                         "logs": "Logs",
                         "lovelace": "Lovelace Dashboards",
-                        "navigate_to": "Navigeer naar {panel}",
                         "person": "Personen",
                         "scene": "Scènes",
                         "script": "Scripts",
@@ -1360,7 +1366,6 @@
                             "introduction": "De acties zijn wat Home Assistant zal doen wanneer de automatisering wordt geactiveerd.",
                             "learn_more": "Meer informatie over acties",
                             "name": "Actie",
-                            "type_select": "Type actie",
                             "type": {
                                 "choose": {
                                     "add_option": "Optie toevoegen",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Herhaling",
                                     "sequence": "Acties",
-                                    "type_select": "Herhaal-type",
                                     "type": {
                                         "count": {
                                             "label": "Telling"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Zolang voldaan is aan voorwaarden",
                                             "label": "Zolang"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Herhaal-type"
                                 },
                                 "scene": {
                                     "label": "Activeer scène"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Wachtsjabloon"
                                 }
                             },
+                            "type_select": "Type actie",
                             "unsupported_action": "Geen UI-ondersteuning voor actie: {action}"
                         },
                         "alias": "Naam",
@@ -1452,7 +1458,6 @@
                             "introduction": "Voorwaarden zijn optioneel en verhinderen verdere uitvoering tenzij aan alle voorwaarden is voldaan.",
                             "learn_more": "Meer informatie over condities",
                             "name": "Voorwaarde",
-                            "type_select": "Type voorwaarde",
                             "type": {
                                 "and": {
                                     "label": "En"
@@ -1514,7 +1519,7 @@
                                     }
                                 },
                                 "trigger": {
-                                    "id": "Trigger Id",
+                                    "id": "Trigger ID",
                                     "label": "Trigger",
                                     "no_triggers": "Geen triggers beschikbaar"
                                 },
@@ -1524,6 +1529,7 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Type voorwaarde",
                             "unsupported_condition": "Geen UI-ondersteuning voor voorwaarde: {condition}"
                         },
                         "copy_to_clipboard": "Kopieer naar klembord",
@@ -1565,7 +1571,6 @@
                             "introduction": "Triggers starten de verwerking van een automatiseringsregel. Het is mogelijk om meerdere triggers voor dezelfde regel op te geven. Zodra een trigger start, valideert Home Assistant de eventuele voorwaarden en roept hij de actie aan.",
                             "learn_more": "Meer informatie over triggers",
                             "name": "Trigger",
-                            "type_select": "Trigger-type",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1636,18 @@
                                     "label": "Sjabloon",
                                     "value_template": "Waardesjabloon"
                                 },
-                                "time_pattern": {
-                                    "hours": "Uren",
-                                    "label": "Tijdspatroon",
-                                    "minutes": "Minuten",
-                                    "seconds": "Seconden"
-                                },
                                 "time": {
                                     "at": "Op tijd",
                                     "label": "Tijd",
                                     "type_input": "Waarde van een datum/tijdhelper",
                                     "type_value": "Vaste tijd"
                                 },
+                                "time_pattern": {
+                                    "hours": "Uren",
+                                    "label": "Tijdspatroon",
+                                    "minutes": "Minuten",
+                                    "seconds": "Seconden"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1656,6 +1661,7 @@
                                     "zone": "Zone"
                                 }
                             },
+                            "type_select": "Trigger-type",
                             "unsupported_platform": "Geen UI-ondersteuning voor platform: {platform}"
                         },
                         "unsaved_confirm": "Je hebt niet-opgeslagen wijzigingen. Weet je zeker dat je wilt afsluiten?"
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "Uw exemplaar zal beschikbaar zijn op",
                             "link_learn_how_it_works": "Leer hoe het werkt",
                             "not_connected": "Niet verbonden",
+                            "reconnecting": "Opnieuw verbinden",
                             "remote_enabled": {
                                 "caption": "Automatisch verbinden",
                                 "description": "Schakel deze optie in om ervoor te zorgen dat uw Home Assistant instantie altijd op afstand toegankelijk is."
@@ -1818,9 +1825,9 @@
                             "loading": "Laden...",
                             "manage": "Beheer",
                             "no_hooks_yet": "Het lijkt erop dat je nog geen webhooks hebt. Ga aan de slag door het configureren van een ",
+                            "no_hooks_yet2": "of door het maken van een",
                             "no_hooks_yet_link_automation": "webhook automatisering",
                             "no_hooks_yet_link_integration": "webhook gebaseerde integratie",
-                            "no_hooks_yet2": "of door het maken van een",
                             "title": "Webhooks"
                         }
                     },
@@ -1935,41 +1942,13 @@
                     "description": "Eenheidssysteem, locatie, tijdzone en andere algemene parameters",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Voordat u dit inschakelt, moet u de analytics documentatie pagina {link} bezoeken om te begrijpen wat u verstuurt en hoe het wordt opgeslagen.",
-                                "header": "Analytics",
-                                "instance_id": "Instantie-ID: {huuid}",
-                                "introduction": "Deel uw installatie-informatie om Home Assistant te helpen verbeteren en ons te helpen fabrikanten te overtuigen om lokale controle en privacygerichte functies toe te voegen.",
-                                "learn_more": "Hoe wij uw gegevens verwerken",
-                                "needs_base": "U moet basisanalyses inschakelen om deze optie beschikbaar te maken",
-                                "preference": {
-                                    "base": {
-                                        "description": "Instantie-ID, versie en installatietype.",
-                                        "title": "Basisanalyses"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Deel crashrapporten wanneer onverwachte fouten optreden.",
-                                        "title": "Diagnostiek"
-                                    },
-                                    "statistics": {
-                                        "description": "Totaal gebruikte entiteiten, gebruikers en andere elementen.",
-                                        "title": "Gebruiksstatistieken"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Namen, versies en mogelijkheden.",
-                                        "title": "Gebruikte integraties en add-ons"
-                                    },
-                                    "usage": {
-                                        "description": "Namen en versie-informatie.",
-                                        "title": "Gebruikte integraties"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Munteenheid",
                                 "edit_requires_storage": "Editor uitgeschakeld omdat de configuratie is opgeslagen in configuration.yaml",
                                 "elevation": "Hoogte",
                                 "elevation_meters": "meter",
                                 "external_url": "Externe URL",
+                                "find_currency_value": "Valutawaarde vinden",
                                 "imperial_example": "Fahrenheit, ponden",
                                 "internal_url": "Interne URL",
                                 "latitude": "Breedtegraad",
@@ -2098,6 +2077,63 @@
                     "update": "Bijwerken",
                     "update_device_error": "Bijwerken van het apparaat mislukt"
                 },
+                "energy": {
+                    "caption": "Energie",
+                    "description": "Monitor uw energieproductie en verbruik",
+                    "device_consumption": {
+                        "add_stat": "Kies entiteit om verbruik van bij te houden",
+                        "dialog": {
+                            "selected_stat_intro": "Selecteer de entiteit die het energieverbruik van het apparaat weergeeft."
+                        },
+                        "learn_more": "Meer informatie over hoe u aan de slag kunt gaan.",
+                        "selected_stat": "Verbruik bijhouden voor",
+                        "sub": "Door het energieverbruik van afzonderlijke apparaten bij te houden, kan Home Assistant uw energieverbruik per apparaat uitsplitsen.",
+                        "title": "Individuele apparaten"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Een entiteit met de huidige prijs gebruiken",
+                                "cost_entity_input": "Entiteit met de huidige prijs",
+                                "cost_number": "Gebruik een vaste prijs",
+                                "cost_number_input": "Prijs per kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Selecteer hoe Home Assistant de kosten van de verbruikte energie moet bijhouden.",
+                                "cost_stat": "Een entiteit gebruiken die de totale kosten bijhoudt",
+                                "cost_stat_input": "Totale kosten entiteit",
+                                "energy_stat": "Verbruikte energie (kWh)",
+                                "header": "Netverbruik configureren",
+                                "no_cost": "Kosten niet bijhouden",
+                                "paragraph": "Netverbruik is de energie die van het energienet naar uw woning stroomt."
+                            },
+                            "to": {
+                                "cost_entity": "Een entiteit met het huidige tarief gebruiken",
+                                "cost_entity_input": "Entiteit met het huidige tarief",
+                                "cost_number": "Gebruik een vaste prijs",
+                                "cost_number_input": "Prijs per kWh",
+                                "cost_number_suffix": "{currency} /kWh",
+                                "cost_para": "Krijg je geld terug als je energie teruglevert aan het net?",
+                                "cost_stat": "Een entiteit gebruiken die het totale ontvangen geld bijhoudt",
+                                "cost_stat_input": "Totale compensatie entiteit",
+                                "energy_stat": "Teruggeleverde energie (kWh)",
+                                "header": "Net productie configureren",
+                                "no_cost": "Ik krijg geen geld terug",
+                                "paragraph": "Netproductie is de energie die van uw zonnepanelen naar het net stroomt."
+                            }
+                        },
+                        "learn_more": "Meer informatie over hoe u aan de slag kunt gaan.",
+                        "sub": "Configureer de verschillende tarieven voor de energie die u van het net verbruikt en als u energie teruglevert aan het net, de energie die u teruglevert aan het net. Hierdoor kan Home Assistant het energieverbruik van uw gehele huis bijhouden.",
+                        "title": "Elektriciteitsnet"
+                    },
+                    "solar": {
+                        "learn_more": "Meer informatie over hoe u aan de slag kunt gaan.",
+                        "stat_predicted_production": "Voorspelling van uw zonne-energieproductie",
+                        "stat_production": "Uw zonne-energieproductie",
+                        "stat_return_to_grid": "Zonne-energie teruggeleverd aan het net",
+                        "sub": "Laat Home Assistant uw zonnepanelen monitoren en u inzicht geven in hun prestaties.",
+                        "title": "Zonnepanelen"
+                    }
+                },
                 "entities": {
                     "caption": "Entiteiten",
                     "description": "Overzicht van alle geregistreerde entiteiten",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Wis",
-                    "filtering_by": "Filteren op",
-                    "show": "Toon"
-                },
-                "hassio": {
-                    "button": "Configureer"
-                },
                 "header": "Configureer Home Assistant",
                 "helpers": {
                     "caption": "Helpers",
@@ -2205,16 +2233,11 @@
                     "server": "Server",
                     "setup_time": "Insteltijd",
                     "source": "Bron:",
-                    "system_health_error": "De systeemstatus component is niet geladen. Voeg ' system_health: ' toe aan het configuratiebestand.",
                     "system_health": {
                         "manage": "Beheer",
                         "more_info": "meer informatie"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "integraties pagina",
-                    "missing_zha": "Mis je de ZHA configuratie? Dit is verplaatst naar de ZHA integratie op de {integrations_page}.",
-                    "missing_zwave": "Mis je de Z-Wave configuratie? Dit is verplaatst naar de Z-Wave integratie op de {integrations_page}."
+                    },
+                    "system_health_error": "De systeemstatus component is niet geladen. Voeg ' system_health: ' toe aan het configuratiebestand."
                 },
                 "integrations": {
                     "add_integration": "Integratie toevoegen",
@@ -2229,8 +2252,6 @@
                         "depends_on_cloud": "Cloud afhankelijk",
                         "device_unavailable": "Apparaat niet beschikbaar",
                         "devices": "{count} {count, plural,\n  one {apparaat}\n  other {apparaten}\n}",
-                        "disable_error": "In- of uitschakelen van de integratie mislukt",
-                        "disable_restart_confirm": "Start Home Assistant opnieuw op om het uitzetten van deze integratie te voltooien",
                         "disable": {
                             "disable_confirm": "Weet je zeker dat je deze configuratie wilt uitschakelen? Al diens apparaten en entiteiten zullen worden uitgeschakeld.",
                             "disabled": "Uitgeschakeld",
@@ -2241,6 +2262,8 @@
                             },
                             "disabled_cause": "Uitgeschakeld door {cause}"
                         },
+                        "disable_error": "In- of uitschakelen van de integratie mislukt",
+                        "disable_restart_confirm": "Start Home Assistant opnieuw op om het uitzetten van deze integratie te voltooien",
                         "disabled_polling": "Automatische polling voor bijgewerkte gegevens uitgeschakeld",
                         "documentation": "Documentatie",
                         "enable_restart_confirm": "Start Home Assistant opnieuw op om het opzetten van deze integratie te voltooien",
@@ -2248,11 +2271,9 @@
                         "entity_unavailable": "Entiteit niet beschikbaar",
                         "firmware": "Firmware: {version}",
                         "hub": "Verbonden via",
-                        "logs": "logs",
                         "manuf": "door {manufacturer}",
                         "no_area": "Geen Gebied",
                         "not_loaded": "Niet geladen",
-                        "options": "Opties",
                         "provided_by_custom_integration": "Geleverd door een aangepaste integratie",
                         "reload": "Herlaad",
                         "reload_confirm": "De integratie is opnieuw geladen",
@@ -2284,7 +2305,11 @@
                             "open_site": "Open website"
                         },
                         "finish": "Voltooien",
-                        "loading_first_time": "Even geduld a.u.b. terwijl de integratie wordt geïnstalleerd",
+                        "loading": {
+                            "fallback_title": "de integratie",
+                            "loading_flow": "Een ogenblik geduld terwijl {integration} wordt ingesteld",
+                            "loading_step": "Volgende stap laden voor {integration}"
+                        },
                         "next": "Volgende",
                         "not_all_required_fields": "Niet alle verplichte velden zijn ingevuld.",
                         "not_loaded": "De integratie kan niet worden geladen, probeer Home Assistant opnieuw te starten.",
@@ -2301,7 +2326,6 @@
                     "details": "Integratiedetails",
                     "disable": {
                         "disabled_integrations": "{number} uitgeschakeld",
-                        "hide_disabled": "Verberg uitgeschakelde integraties",
                         "show": "Toon",
                         "show_disabled": "Toon uitgeschakelde integraties"
                     },
@@ -2312,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Stop met negeren van {name}?",
                         "confirm_ignore": "Weet je zeker dat je deze integratie niet wilt instellen? Je kan dit ongedaan maken door in het overloopmenu rechtsboven op 'Genegeerde integraties weergeven' te klikken.",
                         "confirm_ignore_title": "Detectie van {name} negeren?",
-                        "hide_ignored": "Verberg genegeerde integraties",
                         "ignore": "Negeren",
                         "ignored": "Genegeerd",
                         "show_ignored": "Toon genegeerde integraties",
@@ -2396,7 +2419,7 @@
                             "open": "Open"
                         }
                     },
-                    "description": "Maak aangepaste cards om uw huis te besturen",
+                    "description": "Maak aangepaste sets van cards om uw huis te besturen",
                     "resources": {
                         "cant_edit_yaml": "Je gebruikt Lovelace in YAML-modus, daarom kun je je bronnen niet beheren via de gebruikersinterface. Beheer ze in configuration.yaml.",
                         "caption": "Bronnen",
@@ -2432,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configureer",
                     "description_listen": "Luisteren naar onderwerp",
                     "description_publish": "Publiceer een pakket",
                     "listening_to": "Luisteren naar",
@@ -2446,7 +2468,6 @@
                     "topic": "onderwerp"
                 },
                 "ozw": {
-                    "button": "Configureer",
                     "common": {
                         "controller": "Controller",
                         "instance": "Instantie",
@@ -2471,6 +2492,11 @@
                         "nodes": "Knooppunten",
                         "select_instance": "Instantie selecteren"
                     },
+                    "network": {
+                        "header": "Netwerkbeheer",
+                        "introduction": "Beheer netwerkbrede functies.",
+                        "node_count": "{count} knooppunten"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Alle knooppunten zijn opgevraagd",
@@ -2491,10 +2517,9 @@
                         "starting": "Aan het starten",
                         "unknown": "Onbekend"
                     },
-                    "network": {
-                        "header": "Netwerkbeheer",
-                        "introduction": "Beheer netwerkbrede functies.",
-                        "node_count": "{count} knooppunten"
+                    "node": {
+                        "button": "Node details",
+                        "not_found": "Node niet gevonden"
                     },
                     "node_config": {
                         "header": "Node Configuratie",
@@ -2524,10 +2549,6 @@
                         "versions": "Het verkrijgen van informatie over firmware en commandoklasseversies",
                         "wakeup": "Ondersteuning instellen voor wek-wachtrijen en berichten"
                     },
-                    "node": {
-                        "button": "Node details",
-                        "not_found": "Node niet gevonden"
-                    },
                     "nodes_table": {
                         "failed": "Mislukt",
                         "id": "ID",
@@ -2711,7 +2732,7 @@
                             "input_number": "Input numbers",
                             "input_select": "Input selects",
                             "input_text": "Input texts",
-                            "introduction": "Sommige delen van Home Assistant kunnen opnieuw worden geladen zonder dat een herstart vereist is. Als je herladen gebruikt, wordt de huidige configuratie leeggemaakt en wordt de nieuwe geladen.",
+                            "introduction": "Sommige onderdelen van Home Assistant kunnen opnieuw geladen worden zonder dat een herstart nodig is. Als u op een van de onderstaande opties klikt, wordt de huidige YAML-configuratie verwijderd en de nieuwe geladen.",
                             "min_max": "Min/max entiteiten",
                             "mqtt": "Handmatig geconfigureerde MQTT-entiteiten",
                             "person": "Personen",
@@ -2740,7 +2761,7 @@
                         "validation": {
                             "check_config": "Controleer configuratie",
                             "heading": "Valideer configuratie",
-                            "introduction": "Controleer je configuratie als je onlangs wijzigingen hebt aangebracht en zeker wilt weten dat ze geldig zijn",
+                            "introduction": "Controleer uw configuratie als u onlangs wijzigingen hebt aangebracht en zeker wilt weten dat ze geldig zijn",
                             "invalid": "Ongeldige configuratie",
                             "valid": "Geldige configuratie!"
                         }
@@ -2832,7 +2853,6 @@
                         "search_again": "Opnieuw zoeken",
                         "spinner": "Zoeken naar ZHA Zigbee-apparaten ..."
                     },
-                    "button": "Configureer",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attributen van het geselecteerde cluster",
                         "get_zigbee_attribute": "Haal Zigbee attribuut op",
@@ -2862,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Snelkoppelingen",
-                        "update_button": "Update configuratie",
-                        "zha_options": {
-                            "default_light_transition": "Standaard lichttransitietijd (seconden)",
-                            "enable_identify_on_join": "Schakel het identificatie-effect in wanneer apparaten in het netwerk komen",
-                            "title": "Globale opties"
-                        }
+                        "update_button": "Update configuratie"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuratie voltooid",
@@ -2949,123 +2964,7 @@
                     "introduction": "Met zones kan je bepaalde regio's op aarde opgeven. Wanneer een persoon zich in een zone bevindt, dan wordt de staat de naam uit de zone. Zones kunnen ook worden gebruikt als trigger of voorwaarde in automatiseringen.",
                     "no_zones_created_yet": "Het lijkt erop dat je nog geen zones hebt aangemaakt."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Opname annuleren",
-                        "controller_in_inclusion_mode": "Uw Z-Wave controller bevindt zich nu in de opnamemodus.",
-                        "follow_device_instructions": "Volg de aanwijzingen die bij het apparaat zijn geleverd om de koppeling van het apparaat te activeren.",
-                        "inclusion_failed": "Het knooppunt kon niet worden toegevoegd. Controleer de logs voor meer informatie.",
-                        "inclusion_finished": "Het knooppunt is toegevoegd.",
-                        "interview_failed": "Het apparaat \"interview\" is mislukt. Aanvullende informatie is mogelijk beschikbaar in de logboeken.",
-                        "interview_started": "Het apparaat wordt \"geïnterviewd\". Dit kan wat tijd kosten.",
-                        "introduction": "Deze wizard begeleidt u bij het toevoegen van een knooppunt aan uw Z-Wave netwerk.",
-                        "secure_inclusion_warning": "Beveiligde apparaten vereisen extra bandbreedte; te veel beveiligde apparaten kunnen uw Z-Wave-netwerk vertragen. We raden aan om alleen veilige opname te gebruiken voor apparaten die dat vereisen, zoals sloten of garagedeuropeners.",
-                        "start_inclusion": "Start Opname",
-                        "start_secure_inclusion": "Start Veilige Opname",
-                        "title": "Voeg een Z-Wave knooppunt toe",
-                        "use_secure_inclusion": "Gebruik veilige opname",
-                        "view_device": "Bekijk apparaat"
-                    },
-                    "button": "Configureer",
-                    "common": {
-                        "add_node": "Knooppunt toevoegen",
-                        "close": "Sluiten",
-                        "heal_network": "Herstel netwerk",
-                        "home_id": "Home ID",
-                        "network": "Netwerk",
-                        "node_id": "Knooppunt-ID",
-                        "reconfigure_server": "Herconfigureer server",
-                        "remove_node": "Knooppunt verwijderen"
-                    },
-                    "dashboard": {
-                        "driver_version": "Driver Versie",
-                        "dump_dead_nodes_text": "Sommige van uw knooppunten reageerden niet en worden verondersteld onbereikbaar te zijn. Deze worden niet volledig geëxporteerd.",
-                        "dump_dead_nodes_title": "Sommige van uw knooppunten zijn onbereikbaar",
-                        "dump_debug": "Download een dump van uw netwerk om problemen te diagnosticeren",
-                        "dump_not_ready_confirm": "Downloaden",
-                        "dump_not_ready_text": "Als u een export maakt terwijl niet alle knooppunten gereed zijn, mist u mogelijk de benodigde gegevens. Geef uw netwerk wat tijd om alle knooppunten te doorzoeken. Wilt u doorgaan met de dump?",
-                        "dump_not_ready_title": "Nog niet alle knooppunten zijn gereed",
-                        "header": "Beheer je Z-Wave netwerk",
-                        "home_id": "Home ID",
-                        "introduction": "Beheer uw Z-Wave netwerk en Z-Wave knooppunten",
-                        "nodes_ready": "Knooppunten gereed",
-                        "server_version": "Server Versie"
-                    },
-                    "device_info": {
-                        "device_config": "Configureer Apparaat",
-                        "node_ready": "Knooppunt gereed",
-                        "node_status": "Knooppuntstatus",
-                        "zwave_info": "Z-Wave info"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Netwerkherstel is geannuleerd.",
-                        "healing_complete": "Netwerkherstel is compleet.",
-                        "healing_failed": "Herstellen mislukt. Aanvullende informatie is mogelijk beschikbaar in de logboeken.",
-                        "in_progress": "Netwerkherstel wordt uitgevoerd. Dit zal eveen duren.",
-                        "introduction": "Start een netwerkherstel op uw Z-Wave netwerk. Een netwerkherstel zorgt ervoor dat alle apparaten hun routes naar de controller opnieuw berekenen en wordt aanbevolen als je recent apparaten of uw controller hebt verplaatst.",
-                        "run_in_background": "U kunt dit dialoogvenster sluiten en het netwerkherstel zal voortzetten op de achtergrond.",
-                        "start_heal": "Start herstellen",
-                        "stop_heal": "Stop herstellen",
-                        "title": "Herstel uw Z-Wave netwerk",
-                        "traffic_warning": "Het herstelproces genereert een grote hoeveelheid verkeer op het Z-wave netwerk. Dit kan ertoe leiden dat apparaten traag reageren (of helemaal niet) als het herstel wordt uitgevoerd."
-                    },
-                    "logs": {
-                        "log_level": "Log niveau",
-                        "log_level_changed": "Logboekniveau gewijzigd in: {level}",
-                        "subscribed_to_logs": "Geabonneerd op Z-Wave JS log berichten ...",
-                        "title": "Z-Wave JS Logs"
-                    },
-                    "navigation": {
-                        "logs": "Logs",
-                        "network": "Netwerk"
-                    },
-                    "network_status": {
-                        "connected": "Verbonden",
-                        "connecting": "Verbinden",
-                        "unknown": "Onbekend"
-                    },
-                    "node_config": {
-                        "attribution": "Apparaat configuratie parameters en beschrijvingen worden geleverd door de {device_database}",
-                        "battery_device_notice": "Batterij-apparaten moeten wakker zijn om hun configuratie bij te werken. Raadpleeg de handleiding van uw toestel voor instructies over hoe u het toestel kunt wekken.",
-                        "error_device_not_found": "Apparaat niet gevonden",
-                        "header": "Z-Wave apparaatconfiguratie",
-                        "introduction": "Beheren en aanpassen van apparaat (node) specifieke configuratieparameters voor het geselecteerde apparaat",
-                        "parameter_is_read_only": "Deze parameter is alleen-lezen.",
-                        "set_param_accepted": "De parameter is bijgewerkt.",
-                        "set_param_error": "Er is een fout opgetreden.",
-                        "set_param_queued": "De parameterwijziging is in een wachtrij geplaatst, en zal worden bijgewerkt wanneer het apparaat wakker wordt.",
-                        "zwave_js_device_database": "Z-Wave JS Apparaat Database"
-                    },
-                    "node_status": {
-                        "alive": "Levend",
-                        "asleep": "In slaap",
-                        "awake": "Wakker",
-                        "dead": "Onbereikbaar",
-                        "unknown": "Onbekend"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "U moet apparaten met batterijvoeding uit de slaapstand halen voordat u een nieuw \"interview\" begint. Raadpleeg de handleiding van uw apparaat voor instructies over hoe u het apparaat uit de slaapstand haalt.",
-                        "in_progress": "Het apparaat wordt \"geïnterviewd\". Dit kan wat tijd kosten.",
-                        "interview_complete": "Apparaat interview voltooid.",
-                        "interview_failed": "Het apparaat \"interview\" is mislukt. Aanvullende informatie is mogelijk beschikbaar in de logboeken.",
-                        "introduction": "\"Interview\" een apparaat op uw Z-Wave-netwerk opnieuw. Gebruik deze functie als uw apparaat een ontbrekende of onjuiste functionaliteit heeft.",
-                        "run_in_background": "U kunt dit dialoogvenster sluiten en het \"interview\" zal op de achtergrond worden voortgezet.",
-                        "start_reinterview": "Start opnieuw \"interview\"",
-                        "title": "\"Interview\" een Z-Wave-apparaat opnieuw"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Uitsluiting annuleren",
-                        "controller_in_exclusion_mode": "Uw Z-Wave controller bevindt zich nu in de uitsluitingsmodus.",
-                        "exclusion_failed": "Het knooppunt kon niet worden verwijderd. Controleer de logboeken voor meer informatie.",
-                        "exclusion_finished": "Knooppunt {id} is verwijderd uit het Z-Wave-netwerk.",
-                        "follow_device_instructions": "Volg de instructies die bij uw apparaat zijn geleverd om uitsluiting op het apparaat te activeren.",
-                        "introduction": "Verwijder een knooppunt uit uw Z-Wave-netwerk en verwijder het gekoppelde apparaat met bijbehorende entiteiten uit Home Assistant.",
-                        "start_exclusion": "Start uitsluiting",
-                        "title": "Een Z-Wave Node verwijderen"
-                    }
-                },
                 "zwave": {
-                    "button": "Configureer",
                     "common": {
                         "index": "Index",
                         "instance": "Exemplaar",
@@ -3154,6 +3053,144 @@
                     "values": {
                         "header": "Knooppunt waarden"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Opname annuleren",
+                        "controller_in_inclusion_mode": "Uw Z-Wave controller bevindt zich nu in de opnamemodus.",
+                        "follow_device_instructions": "Volg de aanwijzingen die bij het apparaat zijn geleverd om de koppeling van het apparaat te activeren.",
+                        "inclusion_failed": "Het knooppunt kon niet worden toegevoegd. Controleer de logs voor meer informatie.",
+                        "inclusion_finished": "Het knooppunt is toegevoegd.",
+                        "interview_failed": "Het apparaat \"interview\" is mislukt. Aanvullende informatie is mogelijk beschikbaar in de logboeken.",
+                        "interview_started": "Het apparaat wordt \"geïnterviewd\". Dit kan wat tijd kosten.",
+                        "introduction": "Deze wizard begeleidt u bij het toevoegen van een knooppunt aan uw Z-Wave netwerk.",
+                        "secure_inclusion_warning": "Beveiligde apparaten vereisen extra bandbreedte; te veel beveiligde apparaten kunnen uw Z-Wave-netwerk vertragen. We raden aan om alleen veilige opname te gebruiken voor apparaten die dat vereisen, zoals sloten of garagedeuropeners.",
+                        "start_inclusion": "Start Opname",
+                        "start_secure_inclusion": "Start Veilige Opname",
+                        "title": "Voeg een Z-Wave knooppunt toe",
+                        "use_secure_inclusion": "Gebruik veilige opname",
+                        "view_device": "Bekijk apparaat"
+                    },
+                    "common": {
+                        "add_node": "Knooppunt toevoegen",
+                        "close": "Sluiten",
+                        "heal_network": "Herstel netwerk",
+                        "home_id": "Home ID",
+                        "network": "Netwerk",
+                        "node_id": "Knooppunt-ID",
+                        "reconfigure_server": "Herconfigureer server",
+                        "remove_node": "Knooppunt verwijderen",
+                        "source": "Bron"
+                    },
+                    "dashboard": {
+                        "driver_version": "Driver Versie",
+                        "dump_dead_nodes_text": "Sommige van uw knooppunten reageerden niet en worden verondersteld onbereikbaar te zijn. Deze worden niet volledig geëxporteerd.",
+                        "dump_dead_nodes_title": "Sommige van uw knooppunten zijn onbereikbaar",
+                        "dump_debug": "Download een dump van uw netwerk om problemen te diagnosticeren",
+                        "dump_not_ready_confirm": "Downloaden",
+                        "dump_not_ready_text": "Als u een export maakt terwijl niet alle knooppunten gereed zijn, mist u mogelijk de benodigde gegevens. Geef uw netwerk wat tijd om alle knooppunten te doorzoeken. Wilt u doorgaan met de dump?",
+                        "dump_not_ready_title": "Nog niet alle knooppunten zijn gereed",
+                        "header": "Beheer je Z-Wave netwerk",
+                        "home_id": "Home ID",
+                        "introduction": "Beheer uw Z-Wave netwerk en Z-Wave knooppunten",
+                        "nodes_ready": "Knooppunten gereed",
+                        "server_version": "Server Versie"
+                    },
+                    "device_info": {
+                        "device_config": "Configureer Apparaat",
+                        "heal_node": "Heal knooppunt",
+                        "node_ready": "Knooppunt gereed",
+                        "node_status": "Knooppuntstatus",
+                        "reinterview_device": "Apparaat opnieuw interviewen",
+                        "remove_failed": "Verwijder defect apparaat",
+                        "zwave_info": "Z-Wave info"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Netwerkherstel is geannuleerd.",
+                        "healing_complete": "Netwerkherstel is compleet.",
+                        "healing_failed": "Herstellen mislukt. Aanvullende informatie is mogelijk beschikbaar in de logboeken.",
+                        "in_progress": "Netwerkherstel wordt uitgevoerd. Dit zal eveen duren.",
+                        "introduction": "Start een netwerkherstel op uw Z-Wave netwerk. Een netwerkherstel zorgt ervoor dat alle apparaten hun routes naar de controller opnieuw berekenen en wordt aanbevolen als je recent apparaten of uw controller hebt verplaatst.",
+                        "run_in_background": "U kunt dit dialoogvenster sluiten en het netwerkherstel zal voortzetten op de achtergrond.",
+                        "start_heal": "Start herstellen",
+                        "stop_heal": "Stop herstellen",
+                        "title": "Herstel uw Z-Wave netwerk",
+                        "traffic_warning": "Het herstelproces genereert een grote hoeveelheid verkeer op het Z-wave netwerk. Dit kan ertoe leiden dat apparaten traag reageren (of helemaal niet) als het herstel wordt uitgevoerd."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} is gehealed",
+                        "healing_failed": "{device} kan niet worden gehealed",
+                        "healing_failed_check_logs": "Aanvullende informatie is mogelijk beschikbaar in de logboeken.",
+                        "in_progress": "{device} healing wordt uitgevoerd.",
+                        "introduction": "Vertel {device} om de routes terug naar de controller te updaten. Dit kan helpen bij communicatieproblemen als je het apparaat of je controller onlangs hebt verplaatst.",
+                        "network_heal_in_progress": "Een Z-Wave-netwerkherstel is al aan de gang.  Wacht tot het is voltooid voordat u een afzonderlijk apparaat herstelt.",
+                        "start_heal": "Heal apparaat",
+                        "title": "Heal een Z-Wave apparaat",
+                        "traffic_warning": "Het healing-proces genereert een grote hoeveelheid verkeer op het Z-Wave-netwerk. Dit kan ertoe leiden dat apparaten langzaam (of helemaal niet) reageren terwijl healing wordt uitgevoerd."
+                    },
+                    "logs": {
+                        "log_level": "Log niveau",
+                        "log_level_changed": "Logboekniveau gewijzigd in: {level}",
+                        "subscribed_to_logs": "Geabonneerd op Z-Wave JS log berichten ...",
+                        "title": "Z-Wave JS Logs"
+                    },
+                    "navigation": {
+                        "logs": "Logs",
+                        "network": "Netwerk"
+                    },
+                    "network_status": {
+                        "connected": "Verbonden",
+                        "connecting": "Verbinden",
+                        "unknown": "Onbekend"
+                    },
+                    "node_config": {
+                        "attribution": "Apparaat configuratie parameters en beschrijvingen worden geleverd door de {device_database}",
+                        "battery_device_notice": "Batterij-apparaten moeten wakker zijn om hun configuratie bij te werken. Raadpleeg de handleiding van uw toestel voor instructies over hoe u het toestel kunt wekken.",
+                        "error_device_not_found": "Apparaat niet gevonden",
+                        "header": "Z-Wave apparaatconfiguratie",
+                        "introduction": "Beheren en aanpassen van apparaat (node) specifieke configuratieparameters voor het geselecteerde apparaat",
+                        "parameter": "Parameter",
+                        "parameter_is_read_only": "Deze parameter is alleen-lezen.",
+                        "set_param_accepted": "De parameter is bijgewerkt.",
+                        "set_param_error": "Er is een fout opgetreden.",
+                        "set_param_queued": "De parameterwijziging is in een wachtrij geplaatst, en zal worden bijgewerkt wanneer het apparaat wakker wordt.",
+                        "zwave_js_device_database": "Z-Wave JS Apparaat Database"
+                    },
+                    "node_status": {
+                        "alive": "Levend",
+                        "asleep": "In slaap",
+                        "awake": "Wakker",
+                        "dead": "Onbereikbaar",
+                        "unknown": "Onbekend"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "U moet apparaten met batterijvoeding uit de slaapstand halen voordat u een nieuw \"interview\" begint. Raadpleeg de handleiding van uw apparaat voor instructies over hoe u het apparaat uit de slaapstand haalt.",
+                        "in_progress": "Het apparaat wordt \"geïnterviewd\". Dit kan wat tijd kosten.",
+                        "interview_complete": "Apparaat interview voltooid.",
+                        "interview_failed": "Het apparaat \"interview\" is mislukt. Aanvullende informatie is mogelijk beschikbaar in de logboeken.",
+                        "introduction": "\"Interview\" een apparaat op uw Z-Wave-netwerk opnieuw. Gebruik deze functie als uw apparaat een ontbrekende of onjuiste functionaliteit heeft.",
+                        "run_in_background": "U kunt dit dialoogvenster sluiten en het \"interview\" zal op de achtergrond worden voortgezet.",
+                        "start_reinterview": "Start opnieuw \"interview\"",
+                        "title": "\"Interview\" een Z-Wave-apparaat opnieuw"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Het verwijderen van het apparaat is bezig.",
+                        "introduction": "Verwijder een defect apparaat uit uw Z-Wave-netwerk. Gebruik dit als u een apparaat niet normaal kunt uitsluiten omdat het kapot is.",
+                        "removal_failed": "Het apparaat kon niet uit uw Z-Wave netwerk worden verwijderd.",
+                        "removal_finished": "Node {id} is verwijderd uit uw Z-Wave-netwerk.",
+                        "remove_device": "Verwijder apparaat",
+                        "title": "Een mislukt Z-Wave-apparaat verwijderen"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Uitsluiting annuleren",
+                        "controller_in_exclusion_mode": "Uw Z-Wave controller bevindt zich nu in de uitsluitingsmodus.",
+                        "exclusion_failed": "Het knooppunt kon niet worden verwijderd. Controleer de logboeken voor meer informatie.",
+                        "exclusion_finished": "Knooppunt {id} is verwijderd uit het Z-Wave-netwerk.",
+                        "follow_device_instructions": "Volg de instructies die bij uw apparaat zijn geleverd om uitsluiting op het apparaat te activeren.",
+                        "introduction": "Verwijder een knooppunt uit uw Z-Wave-netwerk en verwijder het gekoppelde apparaat met bijbehorende entiteiten uit Home Assistant.",
+                        "start_exclusion": "Start uitsluiting",
+                        "title": "Een Z-Wave Node verwijderen"
+                    }
                 }
             },
             "custom": {
@@ -3236,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Ga terug",
-                "supervisor": {
-                    "ask": "Vraag om hulp",
-                    "observer": "Controleer de Observer",
-                    "reboot": "Probeer de host opnieuw op te starten",
-                    "system_health": "Controleer de systeemstatus",
-                    "title": "Kan het supervisor scherm niet laden!",
-                    "wait": "Als Home Assistant net is gestart, zorg ervoor dat de supervisor genoeg tijd heeft gehad om op te starten."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Vorige week",
-                    "this_week": "Deze week",
-                    "today": "Vandaag",
-                    "yesterday": "Gisteren"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Vorige week",
-                    "this_week": "Deze week",
-                    "today": "Vandaag",
-                    "yesterday": "Gisteren"
+            "energy": {
+                "charts": {
+                    "by_device": "Verbruik per apparaat",
+                    "solar": "Zonne-energie",
+                    "stat_house_energy_meter": "Totaal energieverbruik"
+                },
+                "setup": {
+                    "back": "Terug",
+                    "done": "Laat me mijn energie dashboard zien!",
+                    "next": "Verder"
                 }
             },
             "lovelace": {
@@ -3374,7 +3396,6 @@
                         "entities": {
                             "description": "De Entities-kaart is het meest voorkomende type kaart. Het groepeert items samen in lijsten.",
                             "edit_special_row": "Bekijk de details van deze rij door op de knop Bewerken te klikken",
-                            "entity_row_editor": "Entiteitsrij editor",
                             "entity_row": {
                                 "attribute": "Attribuut",
                                 "button": "Knop",
@@ -3386,6 +3407,7 @@
                                 "section": "Sectie",
                                 "weblink": "Web link"
                             },
+                            "entity_row_editor": "Entiteitsrij editor",
                             "name": "Entiteiten",
                             "secondary_info_values": {
                                 "brightness": "Helderheid",
@@ -3412,6 +3434,7 @@
                         "gauge": {
                             "description": "De meterkaart is een basiskaart waarmee u sensorgegevens visueel kunt zien.",
                             "name": "Meter",
+                            "needle_gauge": "Weergeven als naaldmeter?",
                             "severity": {
                                 "define": "Ernst definiëren?",
                                 "green": "Groen",
@@ -3424,6 +3447,7 @@
                             "attribute": "Kenmerk",
                             "camera_image": "Camera-entiteit",
                             "camera_view": "Cameraweergave",
+                            "days_to_show": "Zichtbare dagen",
                             "double_tap_action": "Actie bij dubbel-tik",
                             "entities": "Entiteiten",
                             "entity": "Entiteit",
@@ -3537,6 +3561,10 @@
                             "integration_not_loaded": "Voor deze kaart moet de integratie 'shopping_list' zijn ingesteld.",
                             "name": "Boodschappenlijst"
                         },
+                        "statistics-graph": {
+                            "description": "Met de Statistieken grafiek kaart kunt u een grafiek van de statistieken voor elk van de aangegeven entiteiten weergeven.",
+                            "name": "Statistieken grafiek"
+                        },
                         "thermostat": {
                             "description": "De Thermostaat-kaart geeft controle over uw klimaateenheid. Hiermee kunt u de temperatuur en modus van de entiteit wijzigen.",
                             "name": "Thermostaat"
@@ -3606,6 +3634,12 @@
                         "tab_badges": "Badges",
                         "tab_settings": "Instellingen",
                         "tab_visibility": "Zichtbaarheid",
+                        "type": "Weergavetype",
+                        "types": {
+                            "masonry": "tegelvorm",
+                            "panel": "Paneel (1 kaart)",
+                            "sidebar": "Zijbalk"
+                        },
                         "visibility": {
                             "select_users": "Selecteer welke gebruikers deze weergave in de navigatie moeten zien"
                         }
@@ -3660,7 +3694,6 @@
                         "unsaved_changes": "Niet-opgeslagen wijzigingen"
                     },
                     "save_config": {
-                        "cancel": "Annuleer",
                         "close": "Sluiten",
                         "empty_config": "Begin met een leeg dashboard",
                         "header": "Neem de controle over je Lovelace UI",
@@ -3689,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Dit maakt de eerste kaart op volle breedte. Andere kaarten in deze weergave en badges worden niet weergegeven.",
-                            "title": "Paneelmodus?",
                             "warning_multiple_cards": "Deze weergave bevat meer dan één kaart, maar een paneelweergave kan slechts 1 kaart tonen."
                         }
                     }
@@ -3893,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Volgende",
-                    "intro": "Deel de analyses van uw instantie. Deze gegevens zullen publiekelijk beschikbaar zijn op {link}"
+                    "finish": "Volgende"
                 },
                 "core-config": {
                     "button_detect": "Detecteren",
@@ -3915,18 +3945,16 @@
                 "next": "Volgende",
                 "restore": {
                     "addons": "Invoegtoepassingen",
-                    "confirm_password": "Bevestig Snapshot-wachtwoord",
-                    "description": "Je kunt ook herstellen vanaf een eerdere snapshot.",
+                    "confirm_password": "Bevestig Backup-wachtwoord",
+                    "description": "Je kunt ook herstellen vanaf een eerdere backup.",
                     "folders": "Mappen",
-                    "full_snapshot": "Volledige snapshot",
                     "hide_log": "Verberg volledig logboek",
                     "in_progress": "Herstel in uitvoering",
-                    "partial_snapshot": "Gedeeltelijke snapshot",
-                    "password": "Snapshot wachtwoord",
+                    "password": "Backup wachtwoord",
                     "password_protection": "Wachtwoord bescherming",
                     "select_type": "Selecteer wat u wilt herstellen",
                     "show_log": "Volledig logboek weergeven",
-                    "type": "Snapshot type"
+                    "type": "Backup type"
                 },
                 "user": {
                     "create_account": "Account aanmaken",
@@ -4003,6 +4031,12 @@
                     "prompt_copy_token": "Kopieer je toegangstoken. Het wordt niet meer getoond.",
                     "prompt_name": "Geef het token een naam"
                 },
+                "mfa": {
+                    "confirm_disable": "Weet je zeker dat je {name} wilt uitschakelen?",
+                    "disable": "Uitschakelen",
+                    "enable": "Inschakelen",
+                    "header": "Twee-factor-authenticatie modules"
+                },
                 "mfa_setup": {
                     "close": "Sluiten",
                     "step_done": "Instellen voltooid voor {step}",
@@ -4010,12 +4044,6 @@
                     "title_aborted": "Afgebroken",
                     "title_success": "Gelukt!"
                 },
-                "mfa": {
-                    "confirm_disable": "Weet je zeker dat je {name} wilt uitschakelen?",
-                    "disable": "Uitschakelen",
-                    "enable": "Inschakelen",
-                    "header": "Twee-factor-authenticatie modules"
-                },
                 "number_format": {
                     "description": "Kies hoe getallen worden opgemaakt.",
                     "dropdown_label": "Getalnotatie",
diff --git a/translations/frontend/nn.json b/translations/frontend/nn.json
index b8a957ada8..1163f62923 100644
--- a/translations/frontend/nn.json
+++ b/translations/frontend/nn.json
@@ -23,6 +23,14 @@
         "shopping_list": "Handleliste",
         "states": "Oversikt"
     },
+    "state": {
+        "default": {
+            "off": "Av",
+            "on": "På",
+            "unavailable": "Utilgjengeleg",
+            "unknown": "Ukjent"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -78,14 +86,6 @@
             "not_home": "Borte "
         }
     },
-    "state": {
-        "default": {
-            "off": "Av",
-            "on": "På",
-            "unavailable": "Utilgjengeleg",
-            "unknown": "Ukjent"
-        }
-    },
     "supervisor": {
         "addon": {
             "panel": {
@@ -122,14 +122,10 @@
             },
             "restart_addon": {
                 "confirm_text": "Start tillegget på nytt"
-            },
-            "update": {
-                "snapshot": "Øyeblikksbilde"
             }
         },
         "panel": {
             "dashboard": "Skrivebord",
-            "snapshots": "Snapshots",
             "store": "Tillegsbutikk",
             "system": "System"
         }
@@ -312,6 +308,11 @@
             "data-table": {
                 "no-data": "Ingen data"
             },
+            "date-range-picker": {
+                "ranges": {
+                    "last_week": "Førre veke"
+                }
+            },
             "device-picker": {
                 "device": "Enhet",
                 "no_area": "Inga område",
@@ -524,7 +525,6 @@
                             "introduction": "Handlinga Home Assistant vil gjennomføre når automasjonen vert utløyst.",
                             "learn_more": "Lær meir om handlingar",
                             "name": "Handling",
-                            "type_select": "Handlingstype",
                             "type": {
                                 "condition": {
                                     "label": "Føresetnad"
@@ -557,6 +557,7 @@
                                     "wait_template": "Ventemal"
                                 }
                             },
+                            "type_select": "Handlingstype",
                             "unsupported_action": "Ikkje støtta handling: {action}"
                         },
                         "alias": "Namn",
@@ -569,7 +570,6 @@
                             "introduction": "Føresetnadar er valfrie og vil hindre vidare framgang i automasjonen med mindre alle føresetnadene er møtt.",
                             "learn_more": "Lær meir om føresetnader",
                             "name": "Betingelse",
-                            "type_select": "Føresetnadstype",
                             "type": {
                                 "device": {
                                     "condition": "Føresetnad ",
@@ -619,6 +619,7 @@
                                     "zone": "Sone"
                                 }
                             },
+                            "type_select": "Føresetnadstype",
                             "unsupported_condition": "Ikkje støtta føresetnad: {condition}"
                         },
                         "default_name": "Ny automasjon",
@@ -641,7 +642,6 @@
                             "introduction": "Utløysarar er det som startar ein prosess i ein automasjonsregel. Det er mogleg å spesifisere fleire utløysarar for same regel. Når ein utløysar startar, vil Home Assistant validere føresetnadane, dersom der er nokon, og så setje i gang handlinga.",
                             "learn_more": "Lær meir om utløysarar",
                             "name": "Utløysar",
-                            "type_select": "Utløysartype",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -698,16 +698,16 @@
                                     "label": "Mal",
                                     "value_template": "Verdimal"
                                 },
+                                "time": {
+                                    "at": "Ved",
+                                    "label": "Tid"
+                                },
                                 "time_pattern": {
                                     "hours": "Timar",
                                     "label": "Tidsmønster",
                                     "minutes": "Minutt",
                                     "seconds": "Sekundar"
                                 },
-                                "time": {
-                                    "at": "Ved",
-                                    "label": "Tid"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -721,6 +721,7 @@
                                     "zone": "Sone"
                                 }
                             },
+                            "type_select": "Utløysartype",
                             "unsupported_platform": "Ikkje støtta plattform: {platform}"
                         },
                         "unsaved_confirm": "Du har endringar som ikkje er lagra. Er du sikker på at du vil forlate?"
@@ -859,11 +860,6 @@
                         "search": "Søk i oppføringar"
                     }
                 },
-                "filtering": {
-                    "clear": "Klarer",
-                    "filtering_by": "Filtrerer etter",
-                    "show": "Vis "
-                },
                 "header": "Konfigurer Home Assistant",
                 "info": {
                     "caption": "Info",
@@ -879,7 +875,6 @@
                         "delete_confirm": "Er du sikker på at du vil slette denne integrasjonen?",
                         "device_unavailable": "Eininga utilgjengeleg",
                         "devices": "{count} {count, plural,\n  one {eining}\n  other {einingar}\n}",
-                        "disable_restart_confirm": "Start Home Assistant på nytt for å fullføre deaktiveringa av denne integrasjonen",
                         "disable": {
                             "disable_confirm": "Er du sikker på at du vil deaktivere denne konfigurasjonsoppføringa? Einingane og oppføringane vil verte deaktivert.",
                             "disabled": "Deaktivert ",
@@ -890,6 +885,7 @@
                             },
                             "disabled_cause": "Deaktivert av {cause}"
                         },
+                        "disable_restart_confirm": "Start Home Assistant på nytt for å fullføre deaktiveringa av denne integrasjonen",
                         "enable_restart_confirm": "Start Home Assistant på nytt for å fullføre aktiveringa av denne integrasjonen",
                         "entities": "{count} {count, plural,\n  one {oppføring}\n  other {oppføringar}\n}",
                         "entity_unavailable": "Oppføringa utilgjengeleg",
@@ -897,7 +893,6 @@
                         "hub": "Tilkopla via",
                         "manuf": "av {manufacturer}",
                         "no_area": "Inga område",
-                        "options": "Val",
                         "rename": "Endre namn",
                         "restart_confirm": "Restart Home Assistant for å fjerne denne integrasjonen",
                         "system_options": "Systemval",
@@ -925,7 +920,6 @@
                     "description": "Administrer tilkopla einingar og tenester",
                     "disable": {
                         "disabled_integrations": "{number} deaktivert ",
-                        "hide_disabled": "Skjul deaktivert integrasjonar",
                         "show_disabled": "Vis deaktiverte integrasjonar"
                     },
                     "discovered": "Oppdaga",
@@ -1348,7 +1342,6 @@
                         "unsaved_changes": "Ikkje lagra endringar"
                     },
                     "save_config": {
-                        "cancel": "Gløym det",
                         "empty_config": "Start med eit tomt dashboard",
                         "header": "Ta kontroll over Lovelace-brukargrensesnittet",
                         "para": "Som standard kjem Home Assistant til å vedlikehalde brukargrensesnittet, og oppdatere det når nye oppføringar eller Lovelace-komponentar vert tilgjengelege. Dersom du tek kontroll, vil vi ikkje lenger kunne lage dette til automatisk for deg.",
@@ -1610,6 +1603,12 @@
                     "prompt_copy_token": "Kopier tilgangstoken. Den vil ikkje visast igjen.",
                     "prompt_name": "Namn?"
                 },
+                "mfa": {
+                    "confirm_disable": "Er du sikker på at du vil deaktivere {name}?",
+                    "disable": "Deaktiver",
+                    "enable": "Aktiver",
+                    "header": "Flerfaktorautentiseringsmoduler"
+                },
                 "mfa_setup": {
                     "close": "Lukk",
                     "step_done": "Oppsett ferdig for {step}",
@@ -1617,12 +1616,6 @@
                     "title_aborted": "Avslutta",
                     "title_success": "Suksess!"
                 },
-                "mfa": {
-                    "confirm_disable": "Er du sikker på at du vil deaktivere {name}?",
-                    "disable": "Deaktiver",
-                    "enable": "Aktiver",
-                    "header": "Flerfaktorautentiseringsmoduler"
-                },
                 "push_notifications": {
                     "description": "Send varslar til denne einiga",
                     "error_load_platform": "Konfigurer notify.html5",
diff --git a/translations/frontend/pl.json b/translations/frontend/pl.json
index 2ba7b2486f..eb7b0a9af2 100644
--- a/translations/frontend/pl.json
+++ b/translations/frontend/pl.json
@@ -17,6 +17,7 @@
         "calendar": "Kalendarz",
         "config": "Konfiguracja",
         "developer_tools": "Narzędzia deweloperskie",
+        "energy": "Energia",
         "history": "Historia",
         "logbook": "Dziennik",
         "mailbox": "Poczta",
@@ -26,6 +27,14 @@
         "shopping_list": "Lista zakupów",
         "states": "Przegląd"
     },
+    "state": {
+        "default": {
+            "off": "wył.",
+            "on": "wł.",
+            "unavailable": "niedostępny",
+            "unknown": "nieznany"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "poza domem"
         }
     },
-    "state": {
-        "default": {
-            "off": "wył.",
-            "on": "wł.",
-            "unavailable": "niedostępny",
-            "unknown": "nieznany"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Dodatek nie jest zainstalowany"
             }
         },
+        "backup": {
+            "addons": "Dodatki",
+            "confirm_password": "Potwierdź hasło backupa",
+            "could_not_create": "Nie udało się utworzyć backupa",
+            "create": "Utwórz",
+            "create_blocked_not_running": "Tworzenie backupa nie jest teraz możliwe, ponieważ system jest w {state}.",
+            "created": "Utworzony",
+            "delete_backup_confirm": "usuń",
+            "delete_selected": "Usuń wybrane backupy",
+            "enter_password": "Proszę wprowadzić hasło",
+            "failed_to_delete": "Nie udało się usunąć",
+            "folders": "Foldery",
+            "name": "Nazwa backupa",
+            "password": "Hasło backupa",
+            "password_protection": "Ochrona hasłem",
+            "passwords_not_matching": "Hasła nie są takie same",
+            "select_type": "Wybierz, co przywrócić",
+            "selected": "wybrano {number}",
+            "type": "Typ backupa"
+        },
         "common": {
             "cancel": "Anuluj",
             "close": "Zamknij",
@@ -366,9 +387,6 @@
                 "text": "Czy chcesz ponownie uruchomić dodatek ze zmianami?"
             },
             "update": {
-                "create_snapshot": "Utwórz snapshot {name} przed aktualizacją",
-                "snapshot": "Snapshot",
-                "snapshotting": "Tworzenie snapshota {name}",
                 "updating": "Aktualizacja {name} do wersji {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Dashboard",
-            "snapshots": "Snapshoty",
             "store": "Sklep z dodatkami",
             "system": "System"
         },
-        "snapshot": {
-            "addons": "Dodatki",
-            "available_snapshots": "Dostępne snapshoty",
-            "confirm_password": "Potwierdź hasło snapshota",
-            "could_not_create": "Nie udało się utworzyć snapshota",
-            "create": "Utwórz",
-            "create_blocked_not_running": "Tworzenie snapshota nie jest teraz możliwe, ponieważ system jest w {state}.",
-            "create_snapshot": "Utwórz snapshot",
-            "created": "Utworzony",
-            "delete_selected": "Usuń wybrane snapshoty",
-            "delete_snapshot_confirm": "usuń",
-            "delete_snapshot_text": "Czy chcesz usunąć {number} {number, plural,\n  one {snapshota}\n  few {snapshoty}\n  many {snapshotów}\n  other {snapshoty}\n}?",
-            "delete_snapshot_title": "Usuń snapshota",
-            "description": "Snapshoty umożliwiają łatwe tworzenie kopii zapasowych i przywracanie wszystkich danych instancji Home Assistant.",
-            "enter_password": "Proszę wprowadzić hasło",
-            "failed_to_delete": "Nie udało się usunąć",
-            "folder": {
-                "addons/local": "Folder Local add-ons",
-                "homeassistant": "Folder konfiguracji Home Assistant",
-                "media": "Folder Media",
-                "share": "Folder Share",
-                "ssl": "Folder SSL"
-            },
-            "folders": "Foldery",
-            "full_snapshot": "Pełny snapshot",
-            "name": "Nazwa snapshota",
-            "no_snapshots": "Nie masz jeszcze żadnych snapshotów.",
-            "partial_snapshot": "Częściowy snapshot",
-            "password": "Hasło snapshota",
-            "password_protected": "chroniony hasłem",
-            "password_protection": "Ochrona hasłem",
-            "passwords_not_matching": "Hasła nie są takie same",
-            "security": "Bezpieczeństwo",
-            "select_type": "Wybierz, co przywrócić",
-            "selected": "wybrano {number}",
-            "type": "Typ snapshota",
-            "upload_snapshot": "Prześlij snapshota"
-        },
         "store": {
             "missing_addons": "Brakuje dodatków? Włącz tryb zaawansowany na stronie profilu użytkownika.",
             "no_results_found": "Brak wyników w {repository}.",
@@ -433,8 +412,8 @@
         },
         "system": {
             "core": {
-                "cpu_usage": "Użycie procesora przez HA Core",
-                "ram_usage": "Użycie pamięci przez HA Core"
+                "cpu_usage": "Użycie procesora przez Core",
+                "ram_usage": "Użycie pamięci przez Core"
             },
             "host": {
                 "change": "Zmień",
@@ -522,10 +501,10 @@
         },
         "card": {
             "alarm_control_panel": {
-                "arm_away": "Uzbrojenie pod nieobecność",
+                "arm_away": "Uzbrój (poza domem)",
                 "arm_custom_bypass": "Niestandardowy bypass",
-                "arm_home": "uzbrojenie (w domu)",
-                "arm_night": "Uzbrojenie na noc",
+                "arm_home": "Uzbrój (w domu)",
+                "arm_night": "Uzbrój (noc)",
                 "clear_code": "Wyczyść",
                 "code": "Kod",
                 "disarm": "rozbrojenie"
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "Data końcowa",
+                "ranges": {
+                    "last_week": "Poprzedni tydzień",
+                    "this_week": "Ten tydzień",
+                    "today": "Dziś",
+                    "yesterday": "Wczoraj"
+                },
                 "select": "Wybierz",
                 "start_date": "Data początkowa"
             },
@@ -851,10 +836,10 @@
                 "documentation": "dokumentacja",
                 "learn_adding_local_media": "Dowiedz się więcej o dodawaniu multimediów w {documentation}.",
                 "local_media_files": "Umieść pliki wideo, audio i obrazy w folderze multimediów, aby móc je przeglądać i odtwarzać w przeglądarce lub obsługiwanych odtwarzaczach multimedialnych.",
+                "media-player-browser": "Przeglądarka odtwarzacza mediów",
                 "media_browsing_error": "Błąd przeglądania multimediów",
                 "media_not_supported": "Przeglądarka odtwarzacza mediów nie obsługuje tego typu mediów",
                 "media_player": "Odtwarzacz mediów",
-                "media-player-browser": "Przeglądarka odtwarzacza mediów",
                 "no_items": "Brak elementów",
                 "no_local_media_found": "Nie znaleziono mediów lokalnych",
                 "no_media_folder": "Wygląda na to, że nie utworzyłeś jeszcze folderu multimediów.",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "Usługa"
             },
+            "statistic-picker": {
+                "learn_more": "Dowiedz się więcej o statystykach",
+                "missing_entity": "Dlaczego mojej encji nie ma na liście?",
+                "no_match": "Nie znaleziono pasujących statystyk",
+                "no_statistics": "Nie masz żadnych statystyk",
+                "statistic": "Statystyka"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Wczytywanie statystyk...",
+                "no_statistics_found": "Nie znaleziono statystyk.",
+                "statistic_types": {
+                    "max": "maks",
+                    "mean": "średnia",
+                    "min": "min",
+                    "sum": "suma"
+                }
+            },
             "target-picker": {
                 "add_area_id": "Wybierz obszar",
                 "add_device_id": "Wybierz urządzenie",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Opcje"
                 },
+                "loading": {
+                    "loading_flow": "Proszę czekać, trwa inicjalizacja opcji dla {integration}",
+                    "loading_step": "Wczytuję następny krok dla {integration}"
+                },
                 "success": {
                     "description": "Opcje pomyślnie zapisane."
                 }
@@ -1125,13 +1131,13 @@
                         "core": "Ogólne",
                         "customize": "Dostosowywanie",
                         "devices": "Urządzenia",
+                        "energy": "Energia",
                         "entities": "Rejestr encji",
                         "helpers": "Pomocnicy",
                         "info": "Informacje",
                         "integrations": "Integracje",
                         "logs": "Logi",
                         "lovelace": "Dashboardy",
-                        "navigate_to": "Przejdź do: {panel}",
                         "person": "Osoby",
                         "scene": "Sceny",
                         "script": "Skrypty",
@@ -1360,7 +1366,6 @@
                             "introduction": "Akcje są wykonywane przez Home Assistanta po uruchomieniu automatyzacji.",
                             "learn_more": "Dowiedz się więcej o akcjach",
                             "name": "Akcja",
-                            "type_select": "Typ akcji",
                             "type": {
                                 "choose": {
                                     "add_option": "Dodaj opcję",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Powtórzenie",
                                     "sequence": "Akcje",
-                                    "type_select": "Typ powtórzenia",
                                     "type": {
                                         "count": {
                                             "label": "Licznik"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Warunki podczas",
                                             "label": "Podczas"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Typ powtórzenia"
                                 },
                                 "scene": {
                                     "label": "Aktywuj scenę"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Szablon czekania"
                                 }
                             },
+                            "type_select": "Typ akcji",
                             "unsupported_action": "Brak wsparcia edytora wizualnego dla akcji: {action}"
                         },
                         "alias": "Nazwa",
@@ -1452,7 +1458,6 @@
                             "introduction": "Warunki nie są wymagane w automatyzacji, ale zastosowanie ich wykluczy jej potencjalnie niechciane uruchomienia, póki logika każdego z nich przyjmuje wartość pozytywną.",
                             "learn_more": "Dowiedz się więcej o warunkach",
                             "name": "Warunek",
-                            "type_select": "Typ warunku",
                             "type": {
                                 "and": {
                                     "label": "I"
@@ -1513,12 +1518,18 @@
                                         "wed": "Środa"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "Identyfikator wyzwalacza",
+                                    "label": "Wyzwalacz",
+                                    "no_triggers": "Brak dostępnych wyzwalaczy"
+                                },
                                 "zone": {
                                     "entity": "Encja z lokalizacją",
                                     "label": "Strefa",
                                     "zone": "Strefa"
                                 }
                             },
+                            "type_select": "Typ warunku",
                             "unsupported_condition": "Brak wsparcia edytora wizualnego dla warunku: {condition}"
                         },
                         "copy_to_clipboard": "Skopiuj do schowka",
@@ -1556,10 +1567,10 @@
                             "delete_confirm": "Czy na pewno chcesz to usunąć?",
                             "duplicate": "Duplikuj",
                             "header": "Wyzwalacze",
+                            "id": "Identyfikator wyzwalacza (używany przez warunek wyzwalacza)",
                             "introduction": "Wyzwalacze uruchamiają przetwarzanie automatyzacji. Możliwe jest stworzenie wielu wyzwalaczy dla tej samej automatyzacji. Po uruchomieniu wyzwalacza Home Assistant sprawdzi ewentualne warunki i wywoła akcje.",
                             "learn_more": "Dowiedz się więcej o wyzwalaczach",
                             "name": "Wyzwalacz",
-                            "type_select": "Typ wyzwalacza",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1625,18 +1636,18 @@
                                     "label": "Szablon",
                                     "value_template": "Szablon wartości"
                                 },
-                                "time_pattern": {
-                                    "hours": "Godziny",
-                                    "label": "Szablon czasu",
-                                    "minutes": "Minuty",
-                                    "seconds": "Sekundy"
-                                },
                                 "time": {
                                     "at": "O",
                                     "label": "Czas",
                                     "type_input": "Wartość pomocnika typu data/czas",
                                     "type_value": "Ustalony czas"
                                 },
+                                "time_pattern": {
+                                    "hours": "Godziny",
+                                    "label": "Szablon czasu",
+                                    "minutes": "Minuty",
+                                    "seconds": "Sekundy"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Identyfikator Webhook"
@@ -1650,6 +1661,7 @@
                                     "zone": "Strefa"
                                 }
                             },
+                            "type_select": "Typ wyzwalacza",
                             "unsupported_platform": "Brak wsparcia edytora wizualnego dla platformy: {platform}"
                         },
                         "unsaved_confirm": "Masz niezapisane zmiany. Na pewno chcesz wyjść?"
@@ -1782,6 +1794,7 @@
                             "instance_will_be_available": "Twoja instancja będzie dostępna pod adresem",
                             "link_learn_how_it_works": "Dowiedz się, jak to działa",
                             "not_connected": "Brak połączenia",
+                            "reconnecting": "Ponowne łączenie",
                             "remote_enabled": {
                                 "caption": "Połącz automatycznie",
                                 "description": "Włącz tę opcję, aby mieć pewność, że ta instancja Home Assistant jest zawsze dostępna zdalnie."
@@ -1812,9 +1825,9 @@
                             "loading": "Wczytywanie...",
                             "manage": "Zarządzanie",
                             "no_hooks_yet": "Wygląda na to, że nie ma jeszcze żadnych webhooków. Rozpocznij od skonfigurowania ",
+                            "no_hooks_yet2": " lub tworząc ",
                             "no_hooks_yet_link_automation": "Automatyzacja webhook",
                             "no_hooks_yet_link_integration": "Integracja oparta na webhookach",
-                            "no_hooks_yet2": " lub tworząc ",
                             "title": "Webhooki"
                         }
                     },
@@ -1929,41 +1942,13 @@
                     "description": "System metryczny, lokalizacja, strefa czasowa oraz inne parametry ogólne",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Zanim to włączysz, odwiedź stronę z dokumentacją analityczną {link}, aby zrozumieć, co wysyłasz i jak to jest przechowywane.",
-                                "header": "Dane analityczne",
-                                "instance_id": "Identyfikator instancji: {huuid}",
-                                "introduction": "Udostępnij informacje o instalacji, aby ulepszyć Home Assistant i pomóż nam przekonać producentów do dodania lokalnych funkcji sterowania i prywatności.",
-                                "learn_more": "Jak przetwarzamy Twoje dane",
-                                "needs_base": "Aby ta opcja była dostępna, musisz włączyć podstawowe dane analityczne",
-                                "preference": {
-                                    "base": {
-                                        "description": "Identyfikator instancji, wersja i typ instalacji.",
-                                        "title": "Podstawowe dane analityczne"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Udostępniaj raporty o awariach, gdy wystąpią nieoczekiwane błędy.",
-                                        "title": "Diagnostyka"
-                                    },
-                                    "statistics": {
-                                        "description": "Suma wykorzystanych encji, użytkowników i innych elementów.",
-                                        "title": "Statystyki użycia"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Nazwy, wersje i możliwości.",
-                                        "title": "Użyte integracje i dodatki"
-                                    },
-                                    "usage": {
-                                        "description": "Informacje o nazwie i wersji.",
-                                        "title": "Używane integracje"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Waluta",
                                 "edit_requires_storage": "Edytor wyłączony, ponieważ konfiguracja jest przechowywana w pliku configuration.yaml.",
                                 "elevation": "Wysokość",
                                 "elevation_meters": "metry/-ów",
                                 "external_url": "Publiczny adres URL",
+                                "find_currency_value": "Znajdź wartość",
                                 "imperial_example": "stopnie Fahrenheita, funty",
                                 "internal_url": "Lokalny adres URL",
                                 "latitude": "Szerokość geograficzna",
@@ -2092,6 +2077,63 @@
                     "update": "Aktualizuj",
                     "update_device_error": "Aktualizacja urządzenia nie powiodła się"
                 },
+                "energy": {
+                    "caption": "Energia",
+                    "description": "Monitoruj produkcję i użycie energii",
+                    "device_consumption": {
+                        "add_stat": "Wybierz encję do śledzenia energii",
+                        "dialog": {
+                            "selected_stat_intro": "Wybierz encję, która reprezentuje zużycie energii przez urządzenie."
+                        },
+                        "learn_more": "Więcej informacji o tym, jak zacząć.",
+                        "selected_stat": "Śledzenie energii dla",
+                        "sub": "Śledzenie użycia energii przez poszczególne urządzenia pozwala Home Assistantowi na rozbicie użycia energii według urządzeń.",
+                        "title": "Poszczególne urządzenia"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Użyj encji z bieżącą ceną",
+                                "cost_entity_input": "Encja z bieżącą ceną",
+                                "cost_number": "Użyj stałej ceny",
+                                "cost_number_input": "Cena za kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Wybierz sposób, w jaki Home Assistant powinien śledzić koszty użytej energii.",
+                                "cost_stat": "Użyj encji do śledzenia całkowitych kosztów",
+                                "cost_stat_input": "Encja kosztów całkowitych",
+                                "energy_stat": "Użyta energia (kWh)",
+                                "header": "Konfiguracja użycia energii",
+                                "no_cost": "Nie śledź kosztów",
+                                "paragraph": "Użycie to energia, która płynie z sieci energetycznej do Twojego domu."
+                            },
+                            "to": {
+                                "cost_entity": "Użyj encji z aktualną stawką",
+                                "cost_entity_input": "Encja z bieżącą stawką",
+                                "cost_number": "Użyj stałej stawki",
+                                "cost_number_input": "Stawka za kWh",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "Czy otrzymujesz zwrot pieniędzy, gdy zwracasz energię do sieci?",
+                                "cost_stat": "Użyj encji do śledzenia łącznej kwoty zarobionych pieniędzy",
+                                "cost_stat_input": "Encja całkowitego zwrotu",
+                                "energy_stat": "Energia zwrócona do sieci (kWh)",
+                                "header": "Konfiguracja produkcji energii",
+                                "no_cost": "Nie otrzymuję zwrotu pieniędzy",
+                                "paragraph": "Produkcja to energia, która przepływa z paneli słonecznych do sieci."
+                            }
+                        },
+                        "learn_more": "Więcej informacji o tym, jak zacząć.",
+                        "sub": "Skonfiguruj ilość energii, której używasz i, jeśli produkujesz energię, którą oddajesz z powrotem. Dzięki temu Home Assistant może śledzić całe użycie energii w domu.",
+                        "title": "Sieć elektryczna"
+                    },
+                    "solar": {
+                        "learn_more": "Więcej informacji o tym, jak zacząć.",
+                        "stat_predicted_production": "Prognoza produkcji energii słonecznej",
+                        "stat_production": "Twoja produkcja energii słonecznej",
+                        "stat_return_to_grid": "Energia słoneczna oddana do sieci",
+                        "sub": "Pozwól Home Assistantowi monitorować panele słoneczne i dać Ci wgląd w ich wydajność.",
+                        "title": "Panele słoneczne"
+                    }
+                },
                 "entities": {
                     "caption": "Rejestr encji",
                     "description": "Zarządzaj znanymi encjami",
@@ -2142,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Wyczyść",
-                    "filtering_by": "Filtrowanie przez",
-                    "show": "Pokaż"
-                },
-                "hassio": {
-                    "button": "Konfiguruj"
-                },
                 "header": "Konfiguruj Home Assistanta",
                 "helpers": {
                     "caption": "Pomocnicy",
@@ -2199,16 +2233,11 @@
                     "server": "serwer",
                     "setup_time": "Czas konfiguracji",
                     "source": "Źródło:",
-                    "system_health_error": "Komponent kondycji systemu nie jest wczytany. Dodaj 'system_health:' do pliku configuration.yaml",
                     "system_health": {
                         "manage": "Zarządzaj",
                         "more_info": "więcej info"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "stronie integracji",
-                    "missing_zha": "Nie możesz znaleźć konfiguracji ZHA? Została ona przeniesiona do wpisu Z-Wave na {integrations_page}.",
-                    "missing_zwave": "Nie możesz znaleźć konfiguracji Z-Wave? Została ona przeniesiona do wpisu Z-Wave na {integrations_page}."
+                    },
+                    "system_health_error": "Komponent kondycji systemu nie jest wczytany. Dodaj 'system_health:' do pliku configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Dodaj integrację",
@@ -2223,8 +2252,6 @@
                         "depends_on_cloud": "Zależny od chmury",
                         "device_unavailable": "Urządzenie niedostępne",
                         "devices": "{count} {count, plural,\n  one {urządzenie}\n  few {urządzenia}\n  many {urządzeń}\n  other {urządzeń}\n}",
-                        "disable_error": "Nie udało się włączyć lub wyłączyć integracji",
-                        "disable_restart_confirm": "Zrestartuj Home Assistanta, aby zakończyć wyłączanie tej integracji",
                         "disable": {
                             "disable_confirm": "Czy na pewno chcesz wyłączyć ten wpis w konfiguracji? Jego urządzenia i instancje zostaną wyłączone.",
                             "disabled": "Wyłączone",
@@ -2235,6 +2262,8 @@
                             },
                             "disabled_cause": "Wyłączone przez {cause}."
                         },
+                        "disable_error": "Nie udało się włączyć lub wyłączyć integracji",
+                        "disable_restart_confirm": "Zrestartuj Home Assistanta, aby zakończyć wyłączanie tej integracji",
                         "disabled_polling": "Automatyczne odpytywanie o zaktualizowane dane jest wyłączone",
                         "documentation": "Dokumentacja",
                         "enable_restart_confirm": "Uruchom ponownie Home Assistanta, aby dokończyć uruchamianie tej integracji",
@@ -2242,11 +2271,9 @@
                         "entity_unavailable": "encja niedostępna",
                         "firmware": "oprogramowanie: {version}",
                         "hub": "połączony poprzez:",
-                        "logs": "logi",
                         "manuf": "producent: {manufacturer}",
                         "no_area": "brak",
                         "not_loaded": "Nie wczytano",
-                        "options": "Opcje",
                         "provided_by_custom_integration": "Dostarczone przez niestandardowy komponent",
                         "reload": "Wczytaj ponownie",
                         "reload_confirm": "Integracja została ponownie wczytana",
@@ -2278,7 +2305,11 @@
                             "open_site": "Otwórz stronę"
                         },
                         "finish": "Zakończ",
-                        "loading_first_time": "Proszę czekać, trwa instalowanie integracji...",
+                        "loading": {
+                            "fallback_title": "integracja",
+                            "loading_flow": "Proszę czekać, trwa konfiguracja {integration}",
+                            "loading_step": "Wczytuję następny krok dla {integration}"
+                        },
                         "next": "Dalej",
                         "not_all_required_fields": "Nie wszystkie wymagane pola są wypełnione.",
                         "not_loaded": "Nie udało się wczytać integracji, spróbuj ponownie uruchomić Home Assistanta.",
@@ -2295,7 +2326,6 @@
                     "details": "Szczegóły integracji",
                     "disable": {
                         "disabled_integrations": "Wyłączonych: {number}",
-                        "hide_disabled": "Ukryj wyłączone integracje",
                         "show": "Pokaż",
                         "show_disabled": "Pokaż wyłączone integracje"
                     },
@@ -2306,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Wyłączenie ignorowania {name}",
                         "confirm_ignore": "Czy na pewno chcesz ignorować tę integrację? Możesz cofnąć ignorowanie, wybierając 'Wyświetlaj ignorowane integracje' w menu w prawym górnym rogu.",
                         "confirm_ignore_title": "Ignorowanie {name}",
-                        "hide_ignored": "Ukrywaj ignorowane integracje",
                         "ignore": "Ignoruj",
                         "ignored": "Ignorowana",
                         "show_ignored": "Wyświetlaj ignorowane integracje",
@@ -2426,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfiguracja",
                     "description_listen": "Nasłuch tematu",
                     "description_publish": "Opublikuj pakiet",
                     "listening_to": "Nasłuchiwanie...",
@@ -2440,7 +2468,6 @@
                     "topic": "temat"
                 },
                 "ozw": {
-                    "button": "Konfiguruj",
                     "common": {
                         "controller": "Kontroler",
                         "instance": "Instancja",
@@ -2465,6 +2492,11 @@
                         "nodes": "Węzły",
                         "select_instance": "Wybierz instancję"
                     },
+                    "network": {
+                        "header": "Zarządzanie siecią",
+                        "introduction": "Zarządzaj funkcjami w całej sieci.",
+                        "node_count": "{count} węzłów"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Wszystkie węzły zostały odpytane",
@@ -2485,10 +2517,9 @@
                         "starting": "Uruchamianie",
                         "unknown": "Nieznany"
                     },
-                    "network": {
-                        "header": "Zarządzanie siecią",
-                        "introduction": "Zarządzaj funkcjami w całej sieci.",
-                        "node_count": "{count} węzłów"
+                    "node": {
+                        "button": "Szczegóły węzła",
+                        "not_found": "Nie znaleziono węzła"
                     },
                     "node_config": {
                         "header": "Konfiguracja węzła",
@@ -2518,10 +2549,6 @@
                         "versions": "Pobieranie informacji o wersjach oprogramowania i klas poleceń",
                         "wakeup": "Konfigurowanie obsługi kolejek wybudzania i wiadomości"
                     },
-                    "node": {
-                        "button": "Szczegóły węzła",
-                        "not_found": "Nie znaleziono węzła"
-                    },
                     "nodes_table": {
                         "failed": "Uszkodzony",
                         "id": "Identyfikator",
@@ -2664,10 +2691,12 @@
                         },
                         "save_script": "Zapisz skrypt",
                         "sequence": "Sekwencja",
-                        "sequence_sentence": "Sekwencja akcji tego skryptu."
+                        "sequence_sentence": "Sekwencja akcji tego skryptu.",
+                        "show_trace": "Pokaż ślad"
                     },
                     "picker": {
                         "add_script": "Dodaj skrypt",
+                        "dev_script": "Debuguj skrypt",
                         "duplicate": "Duplikuj",
                         "duplicate_script": "Duplikuj skrypt",
                         "edit_script": "Edytuj skrypt",
@@ -2824,7 +2853,6 @@
                         "search_again": "Szukaj ponownie",
                         "spinner": "Wyszukiwanie urządzeń ZHA Zigbee..."
                     },
-                    "button": "Konfiguracja",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atrybuty wybranego klastra",
                         "get_zigbee_attribute": "Wyświetl atrybut Zigbee",
@@ -2854,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Skróty",
-                        "update_button": "Zaktualizuj konfigurację",
-                        "zha_options": {
-                            "default_light_transition": "Domyślny czas efektu przejścia dla światła (w sekundach)",
-                            "enable_identify_on_join": "Włącz efekt identyfikacji, gdy urządzenia dołączają do sieci",
-                            "title": "Opcje ogólne"
-                        }
+                        "update_button": "Zaktualizuj konfigurację"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Konfigurowanie zakończone",
@@ -2941,123 +2964,7 @@
                     "introduction": "Strefy pozwalają określić regiony na ziemi. Gdy dana osoba znajduje się w strefie, jej encja pobierze stan z nazwy strefy. Strefy mogą być również używane jako wyzwalacz lub warunek w automatyzacjach.",
                     "no_zones_created_yet": "Wygląda na to, że nie utworzyłeś jeszcze żadnych stref."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Anuluj dodawanie węzła",
-                        "controller_in_inclusion_mode": "Kontroler Z-Wave jest teraz w trybie dodawania węzła.",
-                        "follow_device_instructions": "Postępuj zgodnie ze wskazówkami dołączonymi do urządzenia, aby wywołać dodawanie do sieci.",
-                        "inclusion_failed": "Nie można dodać węzła. Sprawdź logi, aby uzyskać więcej informacji.",
-                        "inclusion_finished": "Węzeł został dodany.",
-                        "interview_failed": "Odpytywanie urządzenia nie powiodło się. Dodatkowe informacje mogą być dostępne w logach.",
-                        "interview_started": "Urządzenie jest odpytywane. To może zająć trochę czasu.",
-                        "introduction": "Ten kreator poprowadzi Cię przez proces dodawania węzła do sieci Z-Wave.",
-                        "secure_inclusion_warning": "Bezpieczne węzły wymagają dodatkowej przepustowości; zbyt wiele bezpiecznych węzłów może spowolnić twoją sieć Z-Wave. Zalecamy używanie bezpiecznego dodawania tylko w przypadku urządzeń, które tego wymagają, takich jak zamki lub urządzenia sterujące bramami garażowymi.",
-                        "start_inclusion": "Rozpocznij dodawanie węzła",
-                        "start_secure_inclusion": "Rozpocznij dodawanie bezpiecznego węzła",
-                        "title": "Dodaj węzeł Z-Wave",
-                        "use_secure_inclusion": "Użyj bezpiecznego dodawania",
-                        "view_device": "Wyświetl urządzenie"
-                    },
-                    "button": "Konfiguruj",
-                    "common": {
-                        "add_node": "Dodaj węzeł",
-                        "close": "Zamknij",
-                        "heal_network": "Uzdrawiaj sieć",
-                        "home_id": "Identyfikator domu",
-                        "network": "Sieć",
-                        "node_id": "Identyfikator węzła",
-                        "reconfigure_server": "Ponownie skonfiguruj serwer",
-                        "remove_node": "Usuń węzeł"
-                    },
-                    "dashboard": {
-                        "driver_version": "Wersja sterownika",
-                        "dump_dead_nodes_text": "Niektóre z Twoich węzłów nie odpowiedziały i są uznawane za martwe. Nie zostaną one w pełni wyeksportowane.",
-                        "dump_dead_nodes_title": "Niektóre z twoich węzłów są martwe",
-                        "dump_debug": "Pobierz zrzut swojej sieci, aby zdiagnozować problemy",
-                        "dump_not_ready_confirm": "Pobierz",
-                        "dump_not_ready_text": "Jeśli utworzysz zrzut, gdy nie wszystkie węzły są gotowe, może w nim brakować ważnych danych. Daj swojej sieci trochę czasu na odpytanie wszystkich węzłów. Czy chcesz kontynuować zrzut?",
-                        "dump_not_ready_title": "Jeszcze nie wszystkie węzły są gotowe",
-                        "header": "Zarządzaj siecią Z-Wave",
-                        "home_id": "Identyfikator domu",
-                        "introduction": "Zarządzaj siecią i węzłami Z-Wave",
-                        "nodes_ready": "Węzły gotowe",
-                        "server_version": "Wersja serwera"
-                    },
-                    "device_info": {
-                        "device_config": "Konfiguruj urządzenie",
-                        "node_ready": "gotowy",
-                        "node_status": "Stan węzła",
-                        "zwave_info": "Informacje Z-Wave"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Uzdrawianie sieci zostało anulowane.",
-                        "healing_complete": "Uzdrawianie sieci zostało zakończone.",
-                        "healing_failed": "Uzdrawianie nie powiodło się. Dodatkowe informacje mogą być dostępne w logach.",
-                        "in_progress": "Trwa uzdrawianie sieci. To zajmie trochę czasu.",
-                        "introduction": "Rozpocznij uzdrawianie sieci Z-Wave. Uzdrawianie sieci spowoduje, że wszystkie urządzenia ponownie obliczą swoje trasy z powrotem do kontrolera i jest zalecane, jeśli niedawno przeniesiono urządzenia lub kontroler.",
-                        "run_in_background": "Możesz zamknąć to okno, a uzdrawianie sieci będzie kontynuowane w tle.",
-                        "start_heal": "Rozpocznij uzdrawianie",
-                        "stop_heal": "Zatrzymaj uzdrawianie",
-                        "title": "Uzdrawianie sieci Z-Wave",
-                        "traffic_warning": "Proces uzdrawiania generuje duży ruch w sieci Z-Wave. Może to spowodować, że urządzenia będą reagować powoli (lub wcale) podczas trwania uzdrawiania."
-                    },
-                    "logs": {
-                        "log_level": "Poziom loga",
-                        "log_level_changed": "Poziom dziennika zmieniony na: {level}",
-                        "subscribed_to_logs": "Zasubskrybowano komunikaty dziennika Z-Wave JS...",
-                        "title": "Logi Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "Logi",
-                        "network": "Sieć"
-                    },
-                    "network_status": {
-                        "connected": "połączono",
-                        "connecting": "łączenie",
-                        "unknown": "nieznany"
-                    },
-                    "node_config": {
-                        "attribution": "Parametry konfiguracyjne urządzenia oraz opisy są dostarczane przez {device_database}",
-                        "battery_device_notice": "Urządzenia zasilane bateriami muszą być aktywne, aby zaktualizować ich konfigurację. Zapoznaj się z instrukcją obsługi urządzenia, aby uzyskać instrukcje dotyczące wybudzania urządzenia.",
-                        "error_device_not_found": "Nie znaleziono urządzenia",
-                        "header": "Konfiguracja urządzenia Z-Wave",
-                        "introduction": "Zarządzaj i dostosuj specyficznymi parametrami konfiguracyjnymi dla wybranego urządzenia (nody)",
-                        "parameter_is_read_only": "Ten parametr jest tylko do odczytu.",
-                        "set_param_accepted": "Parametr został zaktualizowany.",
-                        "set_param_error": "Wystąpił błąd.",
-                        "set_param_queued": "Zmiana parametru została umieszczona w kolejce i zostanie zaktualizowana po wybudzeniu urządzenia.",
-                        "zwave_js_device_database": "Baza danych urządzeń Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "żywy",
-                        "asleep": "uśpiony",
-                        "awake": "wybudzony",
-                        "dead": "martwy",
-                        "unknown": "nieznany"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Przed rozpoczęciem odpytywania, urządzenia zasilane bateryjnie muszą zostać wybudzone. Zapoznaj się z instrukcją obsługi urządzenia, aby uzyskać informacje dotyczące wybudzania.",
-                        "in_progress": "Urządzenie jest odpytywane. To może zająć trochę czasu.",
-                        "interview_complete": "Odpytywanie urządzenia zakończone.",
-                        "interview_failed": "Odpytywanie urządzenia nie powiodło się. Dodatkowe informacje mogą być dostępne w logach.",
-                        "introduction": "Odpytaj urządzenie w swojej sieci Z-Wave. Użyj tej funkcji, jeśli Twoje urządzenie nie działa lub działa nieprawidłowo.",
-                        "run_in_background": "Możesz zamknąć to okno, a odpytywanie będzie kontynuowane w tle.",
-                        "start_reinterview": "Rozpocznij ponowne odpytywanie",
-                        "title": "Ponowne odpytywanie urządzenia Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Anuluj usuwanie węzła",
-                        "controller_in_exclusion_mode": "Kontroler Z-Wave jest teraz w trybie usuwania węzła.",
-                        "exclusion_failed": "Nie można usunąć węzła. Sprawdź logi, aby uzyskać więcej informacji.",
-                        "exclusion_finished": "Węzeł {id} został usunięty z sieci Z-Wave.",
-                        "follow_device_instructions": "Postępuj zgodnie ze wskazówkami dołączonymi do urządzenia, aby wywołać usuwanie z sieci.",
-                        "introduction": "Usuń węzeł ze swojej sieci Z-Wave i usuń powiązane urządzenie i encje z Home Assistanta.",
-                        "start_exclusion": "Rozpocznij usuwanie węzła",
-                        "title": "Usuń węzeł Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfiguracja",
                     "common": {
                         "index": "Indeks",
                         "instance": "Instancja",
@@ -3146,6 +3053,144 @@
                     "values": {
                         "header": "Wartości węzła"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Anuluj dodawanie węzła",
+                        "controller_in_inclusion_mode": "Kontroler Z-Wave jest teraz w trybie dodawania węzła.",
+                        "follow_device_instructions": "Postępuj zgodnie ze wskazówkami dołączonymi do urządzenia, aby wywołać dodawanie do sieci.",
+                        "inclusion_failed": "Nie można dodać węzła. Sprawdź logi, aby uzyskać więcej informacji.",
+                        "inclusion_finished": "Węzeł został dodany.",
+                        "interview_failed": "Odpytywanie urządzenia nie powiodło się. Dodatkowe informacje mogą być dostępne w logach.",
+                        "interview_started": "Urządzenie jest odpytywane. To może zająć trochę czasu.",
+                        "introduction": "Ten kreator poprowadzi Cię przez proces dodawania węzła do sieci Z-Wave.",
+                        "secure_inclusion_warning": "Bezpieczne węzły wymagają dodatkowej przepustowości; zbyt wiele bezpiecznych węzłów może spowolnić twoją sieć Z-Wave. Zalecamy używanie bezpiecznego dodawania tylko w przypadku urządzeń, które tego wymagają, takich jak zamki lub urządzenia sterujące bramami garażowymi.",
+                        "start_inclusion": "Rozpocznij dodawanie węzła",
+                        "start_secure_inclusion": "Rozpocznij dodawanie bezpiecznego węzła",
+                        "title": "Dodaj węzeł Z-Wave",
+                        "use_secure_inclusion": "Użyj bezpiecznego dodawania",
+                        "view_device": "Wyświetl urządzenie"
+                    },
+                    "common": {
+                        "add_node": "Dodaj węzeł",
+                        "close": "Zamknij",
+                        "heal_network": "Uzdrawiaj sieć",
+                        "home_id": "Identyfikator domu",
+                        "network": "Sieć",
+                        "node_id": "Identyfikator węzła",
+                        "reconfigure_server": "Ponownie skonfiguruj serwer",
+                        "remove_node": "Usuń węzeł",
+                        "source": "Źródło"
+                    },
+                    "dashboard": {
+                        "driver_version": "Wersja sterownika",
+                        "dump_dead_nodes_text": "Niektóre z Twoich węzłów nie odpowiedziały i są uznawane za martwe. Nie zostaną one w pełni wyeksportowane.",
+                        "dump_dead_nodes_title": "Niektóre z twoich węzłów są martwe",
+                        "dump_debug": "Pobierz zrzut swojej sieci, aby zdiagnozować problemy",
+                        "dump_not_ready_confirm": "Pobierz",
+                        "dump_not_ready_text": "Jeśli utworzysz zrzut, gdy nie wszystkie węzły są gotowe, może w nim brakować ważnych danych. Daj swojej sieci trochę czasu na odpytanie wszystkich węzłów. Czy chcesz kontynuować zrzut?",
+                        "dump_not_ready_title": "Jeszcze nie wszystkie węzły są gotowe",
+                        "header": "Zarządzaj siecią Z-Wave",
+                        "home_id": "Identyfikator domu",
+                        "introduction": "Zarządzaj siecią i węzłami Z-Wave",
+                        "nodes_ready": "Węzły gotowe",
+                        "server_version": "Wersja serwera"
+                    },
+                    "device_info": {
+                        "device_config": "Konfiguruj urządzenie",
+                        "heal_node": "Uzdrawiaj węzeł",
+                        "node_ready": "gotowy",
+                        "node_status": "Stan węzła",
+                        "reinterview_device": "Ponownie odpytaj urządzenie",
+                        "remove_failed": "Usuń uszkodzone urządzenie",
+                        "zwave_info": "Informacje Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Uzdrawianie sieci zostało anulowane.",
+                        "healing_complete": "Uzdrawianie sieci zostało zakończone.",
+                        "healing_failed": "Uzdrawianie nie powiodło się. Dodatkowe informacje mogą być dostępne w logach.",
+                        "in_progress": "Trwa uzdrawianie sieci. To zajmie trochę czasu.",
+                        "introduction": "Rozpocznij uzdrawianie sieci Z-Wave. Uzdrawianie sieci spowoduje, że wszystkie urządzenia ponownie obliczą swoje trasy z powrotem do kontrolera i jest zalecane, jeśli niedawno przeniesiono urządzenia lub kontroler.",
+                        "run_in_background": "Możesz zamknąć to okno, a uzdrawianie sieci będzie kontynuowane w tle.",
+                        "start_heal": "Rozpocznij uzdrawianie",
+                        "stop_heal": "Zatrzymaj uzdrawianie",
+                        "title": "Uzdrawianie sieci Z-Wave",
+                        "traffic_warning": "Proces uzdrawiania generuje duży ruch w sieci Z-Wave. Może to spowodować, że urządzenia będą reagować powoli (lub wcale) podczas trwania uzdrawiania."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} zostało uzdrowione.",
+                        "healing_failed": "Nie udało się uzdrowić {device}.",
+                        "healing_failed_check_logs": "Dodatkowe informacje mogą być dostępne w logach.",
+                        "in_progress": "Trwa uzdrawianie {device}.",
+                        "introduction": "Poleć {device}, aby zaktualizowało swoje trasy połączeń z kontrolerem. Może to pomóc w problemach z komunikacją, jeśli lokalizacja urządzenia lub kontrolera została zmieniona.",
+                        "network_heal_in_progress": "Uzdrawianie sieci Z-Wave jest już w toku. Proszę poczekać na jego zakończenie, zanim zaczniesz uzdrawiać poszczególne urządzenia.",
+                        "start_heal": "Uzdrawiaj urządzenie",
+                        "title": "Uzdrawianie urządzenia Z-Wave",
+                        "traffic_warning": "Proces uzdrawiania generuje duży ruch w sieci Z-Wave. Może to spowodować, że urządzenia będą reagować wolno (lub wcale) podczas tego procesu."
+                    },
+                    "logs": {
+                        "log_level": "Poziom loga",
+                        "log_level_changed": "Poziom dziennika zmieniony na: {level}",
+                        "subscribed_to_logs": "Zasubskrybowano komunikaty dziennika Z-Wave JS...",
+                        "title": "Logi Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Logi",
+                        "network": "Sieć"
+                    },
+                    "network_status": {
+                        "connected": "połączono",
+                        "connecting": "łączenie",
+                        "unknown": "nieznany"
+                    },
+                    "node_config": {
+                        "attribution": "Parametry konfiguracyjne urządzenia oraz opisy są dostarczane przez {device_database}",
+                        "battery_device_notice": "Urządzenia zasilane bateriami muszą być aktywne, aby zaktualizować ich konfigurację. Zapoznaj się z instrukcją obsługi urządzenia, aby uzyskać instrukcje dotyczące wybudzania urządzenia.",
+                        "error_device_not_found": "Nie znaleziono urządzenia",
+                        "header": "Konfiguracja urządzenia Z-Wave",
+                        "introduction": "Zarządzaj i dostosuj specyficznymi parametrami konfiguracyjnymi dla wybranego urządzenia (nody)",
+                        "parameter": "Parametr",
+                        "parameter_is_read_only": "Ten parametr jest tylko do odczytu.",
+                        "set_param_accepted": "Parametr został zaktualizowany.",
+                        "set_param_error": "Wystąpił błąd.",
+                        "set_param_queued": "Zmiana parametru została umieszczona w kolejce i zostanie zaktualizowana po wybudzeniu urządzenia.",
+                        "zwave_js_device_database": "Baza danych urządzeń Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "żywy",
+                        "asleep": "uśpiony",
+                        "awake": "wybudzony",
+                        "dead": "martwy",
+                        "unknown": "nieznany"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Przed rozpoczęciem odpytywania, urządzenia zasilane bateryjnie muszą zostać wybudzone. Zapoznaj się z instrukcją obsługi urządzenia, aby uzyskać informacje dotyczące wybudzania.",
+                        "in_progress": "Urządzenie jest odpytywane. To może zająć trochę czasu.",
+                        "interview_complete": "Odpytywanie urządzenia zakończone.",
+                        "interview_failed": "Odpytywanie urządzenia nie powiodło się. Dodatkowe informacje mogą być dostępne w logach.",
+                        "introduction": "Odpytaj urządzenie w swojej sieci Z-Wave. Użyj tej funkcji, jeśli Twoje urządzenie nie działa lub działa nieprawidłowo.",
+                        "run_in_background": "Możesz zamknąć to okno, a odpytywanie będzie kontynuowane w tle.",
+                        "start_reinterview": "Rozpocznij ponowne odpytywanie",
+                        "title": "Ponowne odpytywanie urządzenia Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Trwa usuwanie urządzenia.",
+                        "introduction": "Usuń uszkodzone urządzenie z sieci Z-Wave. Użyj tego, jeśli nie możesz normalnie wykluczyć urządzenia, ponieważ jest zepsute.",
+                        "removal_failed": "Urządzenie nie mogło zostać usunięte z sieci Z-Wave.",
+                        "removal_finished": "Węzeł {id} został usunięty z sieci Z-Wave.",
+                        "remove_device": "Usuń urządzenie",
+                        "title": "Usuń uszkodzone urządzenie Z-Wave"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Anuluj usuwanie węzła",
+                        "controller_in_exclusion_mode": "Kontroler Z-Wave jest teraz w trybie usuwania węzła.",
+                        "exclusion_failed": "Nie można usunąć węzła. Sprawdź logi, aby uzyskać więcej informacji.",
+                        "exclusion_finished": "Węzeł {id} został usunięty z sieci Z-Wave.",
+                        "follow_device_instructions": "Postępuj zgodnie ze wskazówkami dołączonymi do urządzenia, aby wywołać usuwanie z sieci.",
+                        "introduction": "Usuń węzeł ze swojej sieci Z-Wave i usuń powiązane urządzenie i encje z Home Assistanta.",
+                        "start_exclusion": "Rozpocznij usuwanie węzła",
+                        "title": "Usuń węzeł Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3228,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Wróć",
-                "supervisor": {
-                    "ask": "Poproś o pomoc",
-                    "observer": "Sprawdź obserwatora",
-                    "reboot": "Spróbuj ponownie uruchomić hosta",
-                    "system_health": "Sprawdź kondycję systemu",
-                    "title": "Nie można wczytać panelu Supervisora!",
-                    "wait": "Jeśli właśnie uruchomiłeś system, upewnij się, że dałeś Supervisorowi wystarczająco dużo czasu na start."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Poprzedni tydzień",
-                    "this_week": "Ten tydzień",
-                    "today": "Dzisiaj",
-                    "yesterday": "Wczoraj"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Poprzedni tydzień",
-                    "this_week": "Ten tydzień",
-                    "today": "Dzisiaj",
-                    "yesterday": "Wczoraj"
+            "energy": {
+                "charts": {
+                    "by_device": "Użycie według urządzenia",
+                    "solar": "Panele słoneczne",
+                    "stat_house_energy_meter": "Całkowite użycie energii"
+                },
+                "setup": {
+                    "back": "Wstecz",
+                    "done": "Pokaż mój dashboard energetyczny!",
+                    "next": "Dalej"
                 }
             },
             "lovelace": {
@@ -3366,7 +3396,6 @@
                         "entities": {
                             "description": "Karta encji jest najbardziej popularnym rodzajem karty. Grupuje ona encje w listy.",
                             "edit_special_row": "Wyświetl szczegóły tego wiersza, klikając przycisk edycji",
-                            "entity_row_editor": "Edytor wiersza encji",
                             "entity_row": {
                                 "attribute": "Atrybut",
                                 "button": "Przycisk",
@@ -3378,6 +3407,7 @@
                                 "section": "Sekcja",
                                 "weblink": "Łącze internetowe"
                             },
+                            "entity_row_editor": "Edytor wiersza encji",
                             "name": "Encje",
                             "secondary_info_values": {
                                 "brightness": "Jasność",
@@ -3404,6 +3434,7 @@
                         "gauge": {
                             "description": "Karta wskaźnika to podstawowa karta, która umożliwia wizualne przedstawienie danych liczbowych sensora.",
                             "name": "Wskaźnik",
+                            "needle_gauge": "Wyświetlać jako wskaźnik igłowy?",
                             "severity": {
                                 "define": "Zdefiniować progi kolorów?",
                                 "green": "Zielony",
@@ -3416,6 +3447,7 @@
                             "attribute": "Atrybut",
                             "camera_image": "Encja kamery",
                             "camera_view": "Widok kamery",
+                            "days_to_show": "Dni do wyświetlenia",
                             "double_tap_action": "Akcja podwójnego dotknięcia",
                             "entities": "Encje",
                             "entity": "Encja",
@@ -3529,6 +3561,10 @@
                             "integration_not_loaded": "Ta karta wymaga ustawienia integracji `shopping_list`.",
                             "name": "Lista zakupów"
                         },
+                        "statistics-graph": {
+                            "description": "Karta \"Wykres statystyk\" umożliwia wyświetlenie wykresu statystyk dla każdej z wymienionych encji.",
+                            "name": "Wykres statystyk"
+                        },
                         "thermostat": {
                             "description": "Karta termostatu zapewnia kontrolę nad klimatem umożliwiając zmianę temperatury i trybu pracy encji.",
                             "name": "Termostat"
@@ -3598,6 +3634,12 @@
                         "tab_badges": "Odznaki",
                         "tab_settings": "Ustawienia",
                         "tab_visibility": "Widzialność",
+                        "type": "Typ widoku",
+                        "types": {
+                            "masonry": "Kafelki (domyślny)",
+                            "panel": "Panel (1 karta)",
+                            "sidebar": "Pasek boczny"
+                        },
                         "visibility": {
                             "select_users": "Wybierz, którzy użytkownicy powinni mieć dostęp do tego widoku"
                         }
@@ -3652,7 +3694,6 @@
                         "unsaved_changes": "Niezapisane zmiany"
                     },
                     "save_config": {
-                        "cancel": "Nieważne",
                         "close": "Zamknij",
                         "empty_config": "Zacznij od pustego dashboardu",
                         "header": "Przejmij kontrolę nad interfejsem użytkownika Lovelace",
@@ -3681,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Pierwsza karta renderowana jest w pełnej szerokości. Inne karty w tym widoku, jak i odznaki nie będą renderowane.",
-                            "title": "Tryb panelu?",
                             "warning_multiple_cards": "Ten widok zawiera więcej niż jedną kartę, a widok panelu może wyświetlać tylko jedną kartę."
                         }
                     }
@@ -3885,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Dalej",
-                    "intro": "Udostępniaj dane analityczne ze swojej instancji. Te dane będą publicznie dostępne pod adresem {link}"
+                    "finish": "Dalej"
                 },
                 "core-config": {
                     "button_detect": "Wykryj",
@@ -3907,18 +3945,16 @@
                 "next": "Dalej",
                 "restore": {
                     "addons": "Dodatki",
-                    "confirm_password": "Potwierdź hasło snapshota",
+                    "confirm_password": "Potwierdź hasło backupa",
                     "description": "Alternatywnie możesz przywrócić z poprzedniej migawki.",
                     "folders": "Foldery",
-                    "full_snapshot": "Pełny snapshot",
                     "hide_log": "Ukryj cały log",
                     "in_progress": "Trwa przywracanie",
-                    "partial_snapshot": "Częściowy snapshot",
-                    "password": "Hasło snapshota",
+                    "password": "Hasło backupa",
                     "password_protection": "Ochrona hasłem",
                     "select_type": "Wybierz, co przywrócić",
                     "show_log": "Pokaż cały log",
-                    "type": "Typ snapshota"
+                    "type": "Typ backupa"
                 },
                 "user": {
                     "create_account": "Utwórz konto",
@@ -3995,6 +4031,12 @@
                     "prompt_copy_token": "Skopiuj token. Nie będzie on już ponownie wyświetlany.",
                     "prompt_name": "Nazwij token"
                 },
+                "mfa": {
+                    "confirm_disable": "Czy na pewno chcesz wyłączyć {name}?",
+                    "disable": "Wyłącz",
+                    "enable": "Włącz",
+                    "header": "Moduły uwierzytelniania wieloskładnikowego"
+                },
                 "mfa_setup": {
                     "close": "Zamknij",
                     "step_done": "Konfiguracja wykonana dla {step}",
@@ -4002,12 +4044,6 @@
                     "title_aborted": "Przerwano",
                     "title_success": "Powodzenie!"
                 },
-                "mfa": {
-                    "confirm_disable": "Czy na pewno chcesz wyłączyć {name}?",
-                    "disable": "Wyłącz",
-                    "enable": "Włącz",
-                    "header": "Moduły uwierzytelniania wieloskładnikowego"
-                },
                 "number_format": {
                     "description": "Wybierz sposób formatowania liczb.",
                     "dropdown_label": "Format liczbowy",
diff --git a/translations/frontend/pt-BR.json b/translations/frontend/pt-BR.json
index 67fa944000..5452115f20 100644
--- a/translations/frontend/pt-BR.json
+++ b/translations/frontend/pt-BR.json
@@ -26,6 +26,14 @@
         "shopping_list": "Lista de compras",
         "states": "Visão geral"
     },
+    "state": {
+        "default": {
+            "off": "Desligado",
+            "on": "Ligado",
+            "unavailable": "Indisponível",
+            "unknown": "Desconhecido"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,24 +102,35 @@
             "not_home": "Ausente"
         }
     },
-    "state": {
-        "default": {
-            "off": "Desligado",
-            "on": "Ligado",
-            "unavailable": "Indisponível",
-            "unknown": "Desconhecido"
-        }
-    },
     "supervisor": {
         "addon": {
             "dashboard": {
                 "visit_addon_page": "Visite a página {name} para mais detalhes"
             }
         },
+        "backup": {
+            "confirm_password": "Confirme a senha da Imagem",
+            "created": "Criado",
+            "delete_backup_confirm": "Excluir",
+            "delete_selected": "Excluir backups selecionados",
+            "failed_to_delete": "Falha ao excluir",
+            "passwords_not_matching": "As senhas não coincidem",
+            "select_type": "Selecione o que restaurar",
+            "selected": "{number} selecionado"
+        },
         "common": {
+            "close": "Fechar",
             "save": "Salvar"
         },
         "dialog": {
+            "hardware": {
+                "attributes": "Atributos",
+                "device_path": "Caminho do dispositivo",
+                "id": "ID",
+                "search": "Procurar dispositivos",
+                "subsystem": "Subsistema",
+                "title": "Hardware"
+            },
             "network": {
                 "scan_ap": "Procurar pontos de acesso"
             },
@@ -119,18 +138,8 @@
                 "updating": "Atualizando {name} para a versão {version}"
             }
         },
-        "snapshot": {
-            "created": "Criado",
-            "delete_selected": "Excluir snapshots selecionados",
-            "delete_snapshot_confirm": "Excluir",
-            "delete_snapshot_text": "Deseja excluir {number} {number, plural,\n  one {snapshot}\n  other {snapshots}\n}?",
-            "delete_snapshot_title": "Excluir snapshot",
-            "failed_to_delete": "Falha ao excluir",
-            "folder": {
-                "homeassistant": "Configuração do Home Assistant"
-            },
-            "select_type": "Selecione o que restaurar",
-            "selected": "{number} selecionado"
+        "my": {
+            "error_addon_no_ingress": "O complemento solicitado não suporta entrada"
         },
         "system": {
             "supervisor": {
@@ -206,8 +215,11 @@
             },
             "light": {
                 "brightness": "Brilho",
+                "cold_white_value": "Brilho do branco frio",
+                "color_brightness": "Brilho da cor",
                 "color_temperature": "Temperatura de cor",
                 "effect": "Efeito",
+                "warm_white_value": "Brilho do branco quente",
                 "white_value": "Balanço de branco"
             },
             "lock": {
@@ -353,11 +365,19 @@
                 "remove_user": "Remover usuário"
             },
             "data-table": {
+                "clear": "Limpar",
+                "hidden": "{number} escondido",
                 "no-data": "Sem dados",
                 "search": "Procurar"
             },
             "date-range-picker": {
                 "end_date": "Data final",
+                "ranges": {
+                    "last_week": "Semana anterior",
+                    "this_week": "Esta semana",
+                    "today": "Hoje",
+                    "yesterday": "Ontem"
+                },
                 "select": "Selecione",
                 "start_date": "Data de início"
             },
@@ -410,7 +430,9 @@
                     "was_unlocked": "foi destrancada",
                     "was_unplugged": "foi desconectado",
                     "was_unsafe": "estava inseguro"
-                }
+                },
+                "retrieval_error": "Erro durante a recuperação da entrada no registro",
+                "show_trace": "Mostrar traço"
             },
             "media-browser": {
                 "class": {
@@ -433,8 +455,8 @@
                     "video": "Vídeo"
                 },
                 "documentation": "Documentação",
-                "media_player": "Reprodutor de Mídia",
                 "media-player-browser": "Navegador do Reprodutor de Mídia",
+                "media_player": "Reprodutor de Mídia",
                 "no_items": "Sem itens",
                 "pick": "Escolher",
                 "pick-media": "Escolher mídia",
@@ -468,9 +490,19 @@
                 "just_now": "Agora",
                 "never": "Nunca"
             },
+            "service-control": {
+                "integration_doc": "Documentação da Integração"
+            },
             "service-picker": {
                 "service": "Serviço"
             },
+            "statistic-picker": {
+                "learn_more": "Saiba mais sobre as estatísticas",
+                "missing_entity": "Por que minha estidade não está listada:",
+                "no_match": "Nenhuma estatística foi encontrada",
+                "no_statistics": "Você não tem estatísticas",
+                "statistic": "Estatísticas"
+            },
             "target-picker": {
                 "add_area_id": "Escolher área",
                 "add_device_id": "Escolher dispositivo",
@@ -488,6 +520,9 @@
             "config_entry_system_options": {
                 "enable_new_entities_description": "Se desativadas, as entidades recém-descobertas de {integration} não serão automaticamente adicionadas ao Home Assistant.",
                 "enable_new_entities_label": "Habilitar entidades recém-adicionadas.",
+                "enable_polling_description": "Se o Home Assistant deve automaticamente buscar atualizações para as entidades de {integration}.",
+                "enable_polling_label": "Habilitar busca de atualizações.",
+                "restart_home_assistant": "Você precisa reiniciar o Home Assistant para que as mudanças façam efeito.",
                 "title": "Opções do sistema para {integration}",
                 "update": "Atualizar"
             },
@@ -671,6 +706,9 @@
                     "server_control": {
                         "restart": "Reiniciar",
                         "stop": "Parar"
+                    },
+                    "types": {
+                        "server_control": "Servidor"
                     }
                 },
                 "filter_placeholder": "Filtro de Entidades"
@@ -818,7 +856,6 @@
                             "introduction": "As ações são o que o Home Assistant fará quando a automação for acionada.",
                             "learn_more": "Saiba mais sobre ações",
                             "name": "Açao",
-                            "type_select": "Tipo de acão",
                             "type": {
                                 "choose": {
                                     "add_option": "Adicionar opção",
@@ -839,7 +876,9 @@
                                 "device_id": {
                                     "action": "Açao",
                                     "extra_fields": {
-                                        "code": "Código"
+                                        "brightness_pct": "Brilho",
+                                        "code": "Código",
+                                        "humidity": "Umidade"
                                     },
                                     "label": "Dispositivo"
                                 },
@@ -851,7 +890,6 @@
                                 "repeat": {
                                     "label": "Repetir",
                                     "sequence": "Ações",
-                                    "type_select": "Tipo de repetição",
                                     "type": {
                                         "count": {
                                             "label": "Contagem"
@@ -864,7 +902,8 @@
                                             "conditions": "Condições (enquanto...)",
                                             "label": "Enquanto"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Tipo de repetição"
                                 },
                                 "scene": {
                                     "label": "Ativar cena"
@@ -878,6 +917,7 @@
                                     "wait_template": "Modelo de Espera"
                                 }
                             },
+                            "type_select": "Tipo de acão",
                             "unsupported_action": "Ação não suportada: {action}"
                         },
                         "alias": "Nome",
@@ -890,7 +930,6 @@
                             "introduction": "Condições são opcionais e impedirão a continuação da execução, a menos que todas as condições sejam satisfeitas.",
                             "learn_more": "Saiba mais sobre condições",
                             "name": "Condição",
-                            "type_select": "Tipo de Condição",
                             "type": {
                                 "and": {
                                     "label": "E"
@@ -948,12 +987,18 @@
                                         "wed": "Quarta-feira"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "ID do gatilho",
+                                    "label": "Gatilho",
+                                    "no_triggers": "Nenhum gatilho disponível"
+                                },
                                 "zone": {
                                     "entity": "Entidade com localização",
                                     "label": "Zona",
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de Condição",
                             "unsupported_condition": "Condição não suportada: {condition}"
                         },
                         "default_name": "Nova Automação",
@@ -989,10 +1034,10 @@
                             "delete_confirm": "Tem certeza que deseja excluir?",
                             "duplicate": "Duplicar",
                             "header": "Gatilhos",
+                            "id": "ID do gatilho (usado pela condição de disparo)",
                             "introduction": "Gatilhos são responsáveis por iniciar o processamento de uma regra de automação. É possível especificar vários gatilhos para a mesma regra. Quando o gatilho é iniciado, o Home Assistant validará as condições, se houver, e chamará a ação.",
                             "learn_more": "Saiba mais sobre gatilhos",
                             "name": "Gatilho",
-                            "type_select": "Tipo de gatilho",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1055,17 +1100,17 @@
                                     "label": "Modelo",
                                     "value_template": "Valor modelo"
                                 },
+                                "time": {
+                                    "at": "Em",
+                                    "label": "Tempo",
+                                    "type_value": "Horário fixo"
+                                },
                                 "time_pattern": {
                                     "hours": "Horas",
                                     "label": "Padrão de hora",
                                     "minutes": "Minutos",
                                     "seconds": "Segundos"
                                 },
-                                "time": {
-                                    "at": "Em",
-                                    "label": "Tempo",
-                                    "type_value": "Horário fixo"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "ID da Webhook"
@@ -1079,6 +1124,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de gatilho",
                             "unsupported_platform": "Plataforma não suportada: {platform}"
                         },
                         "unsaved_confirm": "Você tem alterações não salvas. Tem certeza que deseja sair?"
@@ -1189,9 +1235,9 @@
                             "loading": "Carregando ...",
                             "manage": "Gerenciar",
                             "no_hooks_yet": "Parece que você ainda não tem webhooks. Comece configurando um ",
+                            "no_hooks_yet2": " ou criando um ",
                             "no_hooks_yet_link_automation": "automação de webhook",
                             "no_hooks_yet_link_integration": "integração baseada em webhook",
-                            "no_hooks_yet2": " ou criando um ",
                             "title": "Webhook"
                         }
                     },
@@ -1303,10 +1349,12 @@
                     "section": {
                         "core": {
                             "core_config": {
+                                "currency": "Moeda",
                                 "edit_requires_storage": "Editor desativado porque a configuração está armazenada em configuration.yaml.",
                                 "elevation": "Elevação",
                                 "elevation_meters": "metros",
                                 "external_url": "URL externa",
+                                "find_currency_value": "Encontre seu valor",
                                 "imperial_example": "Fahrenheit, libras",
                                 "internal_url": "URL interna",
                                 "latitude": "Latitude",
@@ -1421,6 +1469,25 @@
                     "unnamed_device": "Dispositivo sem nome",
                     "update": "Atualizar"
                 },
+                "energy": {
+                    "device_consumption": {
+                        "dialog": {
+                            "selected_stat_intro": "Selecione a entidade que representa o uso de energia do dispositivo."
+                        },
+                        "learn_more": "Mais informações sobre como começar",
+                        "selected_stat": "Exibir energia para",
+                        "sub": "Rastrear o uso de energia de dispositivos individuais permite que o Home Assistant exiba o uso de energia por dispositivo",
+                        "title": "Dispositivos individuais"
+                    },
+                    "grid": {
+                        "learn_more": "Mais informações sobre como começar"
+                    },
+                    "solar": {
+                        "learn_more": "Mais informações sobre como começar",
+                        "sub": "Deixe o Home Assistant monitorar seus painéis solares e forneça informações sobre seu desempenho",
+                        "title": "Painéis solares"
+                    }
+                },
                 "entities": {
                     "caption": "Registro de Entidades",
                     "description": "Visão geral de todas as entidades conhecidas.",
@@ -1470,10 +1537,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Limpar",
-                    "filtering_by": "Filtrando por"
-                },
                 "header": "Configurar o Home Assistant",
                 "helpers": {
                     "caption": "Ajudantes",
@@ -1520,15 +1583,10 @@
                     "server": "servidor",
                     "setup_time": "Tempo de configuração",
                     "source": "Código fonte:",
-                    "system_health_error": "O componente System Health não foi carregado. Adicione 'system_health:' ao configuration.yaml",
                     "system_health": {
                         "more_info": "Mais Informações"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Página de integrações",
-                    "missing_zha": "Procurando o painel de configuração do ZHA? Ele foi movido para a entrada ZHA em {integrations_page}.",
-                    "missing_zwave": "Procurando o painel de configuração do Z-Wave? Ele foi movido para a entrada Z-Wave em {integrations_page}."
+                    },
+                    "system_health_error": "O componente System Health não foi carregado. Adicione 'system_health:' ao configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Adicionar integração",
@@ -1540,6 +1598,7 @@
                         "delete_confirm": "Tem certeza de que deseja excluir essa integração?",
                         "device_unavailable": "Dispositivo indisponível",
                         "devices": "{count} {count, plural,\none {dispositivo}\nother {dispositivos}\n}",
+                        "disabled_polling": "Busca automática de dados atualizados desativada",
                         "documentation": "Documentação",
                         "entities": "{count} {count, plural,\none {entidade}\nother {entidades}\n}",
                         "entity_unavailable": "Entidade indisponível",
@@ -1547,7 +1606,6 @@
                         "hub": "Conectado via",
                         "manuf": "por {manufacturer}",
                         "no_area": "Sem área",
-                        "options": "Opções",
                         "reload": "Recarregar",
                         "reload_confirm": "A integração foi recarregada",
                         "reload_restart_confirm": "Reinicie o Home Assistant para terminar o carregamento dessa integração",
@@ -1567,7 +1625,6 @@
                             "open_site": "Abrir site"
                         },
                         "finish": "Terminar",
-                        "loading_first_time": "Aguarde enquanto a integração está sendo instalada",
                         "next": "Próximo",
                         "not_all_required_fields": "Nem todos os campos obrigatórios são preenchidos.",
                         "submit": "Enviar"
@@ -1576,6 +1633,9 @@
                     "configured": "Configurado",
                     "description": "Gerenciar e configurar integrações",
                     "details": "Detalhes da integração",
+                    "disable": {
+                        "show": "Mostrar"
+                    },
                     "discovered": "Descoberto",
                     "home_assistant_website": "Site do Home Assistant",
                     "ignore": {
@@ -1583,7 +1643,6 @@
                         "confirm_delete_ignore_title": "Deixar de ignorar {name}?",
                         "confirm_ignore": "Tem certeza que não deseja configurar esta integração? Você pode desfazer isso clicando em 'Mostrar integrações ignoradas' no menu no canto superior direito.",
                         "confirm_ignore_title": "Ignorar o descobrimento de {name}?",
-                        "hide_ignored": "Esconder integrações ignoradas",
                         "ignore": "Ignorar",
                         "ignored": "Ignorada",
                         "show_ignored": "Mostrar integrações ignoradas",
@@ -1609,6 +1668,13 @@
                     "clear": "Limpar",
                     "description": "Exibir os logs do Home Assistant",
                     "details": "Detalhes do log ({level})",
+                    "level": {
+                        "critical": "CRÍTICO",
+                        "debug": "DEPURAÇÃO",
+                        "error": "ERRO",
+                        "info": "INFO",
+                        "warning": "ALERTA"
+                    },
                     "load_full_log": "Carregar todos os logs do Home Assistant",
                     "loading_log": "Carregando log de erros…",
                     "multiple_messages": "a mensagem ocorreu pela primeira às {time} e apareceu {counter} vezes",
@@ -1694,7 +1760,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configurar",
                     "description_listen": "Ouvir um tópico",
                     "description_publish": "Publicar um pacote",
                     "listening_to": "Ouvindo",
@@ -1708,7 +1773,6 @@
                     "topic": "tópico"
                 },
                 "ozw": {
-                    "button": "Configurar",
                     "common": {
                         "controller": "Controlador",
                         "instance": "Instância",
@@ -1727,6 +1791,9 @@
                         "nodes": "Nós",
                         "select_instance": "Selecione a instância"
                     },
+                    "network": {
+                        "header": "Gerenciamento de Rede"
+                    },
                     "network_status": {
                         "details": {
                             "driverready": "Inicializando o controlador Z-Wave",
@@ -1741,16 +1808,13 @@
                         "starting": "Iniciando",
                         "unknown": "Desconhecido"
                     },
-                    "network": {
-                        "header": "Gerenciamento de Rede"
+                    "node": {
+                        "not_found": "Nó não encontrado"
                     },
                     "node_query_stages": {
                         "nodeplusinfo": "Obtendo informações Z-Wave + do nó",
                         "versions": "Obtendo informações sobre versões de firmware e classe de comando"
                     },
-                    "node": {
-                        "not_found": "Nó não encontrado"
-                    },
                     "nodes_table": {
                         "failed": "Falhou",
                         "id": "ID",
@@ -1876,10 +1940,12 @@
                         },
                         "save_script": "Salvar script",
                         "sequence": "Seqüência",
-                        "sequence_sentence": "A sequência de ações deste script."
+                        "sequence_sentence": "A sequência de ações deste script.",
+                        "show_trace": "Mostrar traço"
                     },
                     "picker": {
                         "add_script": "Adicionar script",
+                        "dev_script": "Depurar script",
                         "duplicate": "Duplicar",
                         "duplicate_script": "Duplicar script",
                         "edit_script": "Editar script",
@@ -2026,7 +2092,6 @@
                         "search_again": "Pesquisar novamente",
                         "spinner": "Procurando por dispositivos ZHA Zigbee…"
                     },
-                    "button": "Configurar",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributos do cluster selecionado",
                         "get_zigbee_attribute": "Obter atributo do Zigbee",
@@ -2054,6 +2119,9 @@
                         "manufacturer_code_override": "Sobrescrever Código do Fabricante",
                         "value": "Valor"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Atalhos"
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuração Finalizada",
                         "CONFIGURED_status_text": "Iniciando",
@@ -2129,19 +2197,7 @@
                     "introduction": "As zonas permitem especificar determinadas regiões da Terra. Quando uma pessoa está dentro de uma zona, o estado assume o nome da zona. As zonas também podem ser usadas como gatilho ou condição nas configurações de automações.",
                     "no_zones_created_yet": "Parece que você ainda não criou nenhuma zona."
                 },
-                "zwave_js": {
-                    "logs": {
-                        "log_level": "Nível de Log",
-                        "log_level_changed": "Nível de Log mudou para: {level}",
-                        "subscribed_to_logs": "Inscrito em mensagens de log JS do Z-Wave ...",
-                        "title": "Logs Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "Logs"
-                    }
-                },
                 "zwave": {
-                    "button": "Configurar",
                     "common": {
                         "index": "Índice",
                         "instance": "Instância",
@@ -2224,6 +2280,71 @@
                     "values": {
                         "header": "Valores de nó"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "interview_failed": "A configuração do dispositivo falhou. Informações adicionais podem estar disponíveis nos relatórios.",
+                        "interview_started": "O dispositivo está sendo reconfigurado. Isto pode levar algum tempo."
+                    },
+                    "common": {
+                        "heal_network": "Reparar a Rede",
+                        "reconfigure_server": "Reconfigurar o Servidor",
+                        "source": "Fonte"
+                    },
+                    "device_info": {
+                        "remove_failed": "Remover Dispositivo com Falha"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "A reparação da rede foi cancelado.",
+                        "healing_complete": "A reparação da rede foi concluída.",
+                        "healing_failed": "A reparação falhou. Os relatórios podem contem informações adicionais.",
+                        "in_progress": "A reparação da rede está acontecendo. Isto pode levar algum tempo.",
+                        "introduction": "Inicia uma reparação na sua rede Z-Wave. Uma reparação de rede faraá com que todos os dispositivos recalculem as rotas para o controlador e é recomendada se você recentemente mudou dispositivos ou seu controlador de lugar.",
+                        "run_in_background": "Você pode fechar este diálogo e a reparação continuará em segundo plano.",
+                        "start_heal": "Iniciar Reparação",
+                        "stop_heal": "Parar Reparação",
+                        "title": "Reparar sua rede Z-Wave",
+                        "traffic_warning": "O processo de reparação gera uma grande quantidade de tráfego na rede Z-Wave. Isto pode fazer com que os dispositivos respondam lentamente (ou nem respondam) enquanto a reparação está em progresso."
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} foi restaurado",
+                        "healing_failed": "{device} não pôde ser restaurado.",
+                        "healing_failed_check_logs": "Informações adicionais podem estar disponíveis nos logs.",
+                        "in_progress": "A restauração do {device} está em andamento. ",
+                        "network_heal_in_progress": "Um reparo de rede Z-Wave já está em andamento. Aguarde a conclusão antes de reparar um dispositivo individual.",
+                        "start_heal": "Recuperar dispositivo.",
+                        "traffic_warning": "O processo de recuperação gera uma grande quantidade de tráfego na rede Z-Wave. Isto pode fazer com que os dispositivos respondam de forma mais lenta (ou não respondam) enquanto a recuperação está em curso."
+                    },
+                    "logs": {
+                        "log_level": "Nível de Log",
+                        "log_level_changed": "Nível de Log mudou para: {level}",
+                        "subscribed_to_logs": "Inscrito em mensagens de log JS do Z-Wave ...",
+                        "title": "Logs Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Logs"
+                    },
+                    "node_config": {
+                        "parameter": "Parâmetro",
+                        "set_param_accepted": "O parâmetro foi atualizado.",
+                        "set_param_error": "Aconteceu um erro."
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Você precisará acordar os dispositivos alimentados por bateria antes de iniciar o processo de reconfiguração. Consulte os manuais dos dispositivos para obter instruções sobre como acordar o dispositivo.",
+                        "in_progress": "O dispositivo está sendo reconfigurado. Isto pode levar algum tempo.",
+                        "interview_complete": "Reconfiguração do dispositivo concluída.",
+                        "interview_failed": "A configuração do dispositivo falhou. Informações adicionais podem estar disponíveis nos relatórios.",
+                        "run_in_background": "Você pode fechar esta caixa de diálogo e a reconfiguração continuará em segundo plano.",
+                        "start_reinterview": "Iniciar Reconfiguração"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "A remoção do dispositivo está em andamento",
+                        "introduction": "Remova um dispositivo com falha da sua rede Z-Wave. Use isso se você não conseguir excluir um dispositivo normalmente porque ele está quebrado.",
+                        "removal_failed": "O dispositivo não pôde ser removido da rede Z-Wave.",
+                        "removal_finished": "O nó {id} foi removido da sua rede Z-Wave.",
+                        "remove_device": "Remover dispositivo",
+                        "title": "Remover um dispositivo Z-Wave com falha"
+                    }
                 }
             },
             "custom": {
@@ -2292,25 +2413,16 @@
                     }
                 }
             },
-            "error": {
-                "supervisor": {
-                    "system_health": "Verificar integridade do sistema"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Semana Anterior",
-                    "this_week": "Esta semana",
-                    "today": "Hoje",
-                    "yesterday": "Ontem"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Semana anterior",
-                    "this_week": "Esta semana",
-                    "today": "Hoje",
-                    "yesterday": "Ontem"
+            "energy": {
+                "charts": {
+                    "by_device": "Consumo por dispositivo",
+                    "solar": "Solar",
+                    "stat_house_energy_meter": "Consumo total de energia"
+                },
+                "setup": {
+                    "back": "Voltar",
+                    "done": "Mostre-me meu dashboard de energia",
+                    "next": "Pr[o"
                 }
             },
             "lovelace": {
@@ -2437,6 +2549,7 @@
                         "gauge": {
                             "description": "O cartão Medidor é um cartão básico que permite ver visualmente os dados de um sensor.",
                             "name": "Indicador",
+                            "needle_gauge": "Exibir como medidor de ponteiro.",
                             "severity": {
                                 "define": "Definir gravidade?",
                                 "green": "Verde",
@@ -2449,6 +2562,7 @@
                             "attribute": "Atributo",
                             "camera_image": "Entidade da câmera",
                             "camera_view": "Vista da câmera",
+                            "days_to_show": "Dias a seremexibidos",
                             "double_tap_action": "Ação de toque duplo",
                             "entities": "Entidades",
                             "entity": "Entidade",
@@ -2551,6 +2665,10 @@
                             "integration_not_loaded": "Este cartão requer que a integração `shopping_list` tenha sido configurada.",
                             "name": "Lista de compras"
                         },
+                        "statistics-graph": {
+                            "description": "O cartão Gráfico de estatísticas permite que você exiba um gráfico das estatísticas de cada uma das entidades listadas.",
+                            "name": "Gráfico de Estatísticas"
+                        },
                         "thermostat": {
                             "description": "O cartão Termostato fornece controle da sua entidade climática. Permite alterar a temperatura e o modo da entidade.",
                             "name": "Termostato"
@@ -2614,6 +2732,11 @@
                         "tab_badges": "Distintivos",
                         "tab_settings": "Configurações",
                         "tab_visibility": "Visibilidade",
+                        "type": "Tipo de exibição",
+                        "types": {
+                            "panel": "Painel (1 cartão)",
+                            "sidebar": "Barra Lateral"
+                        },
                         "visibility": {
                             "select_users": "Selecione quais usuários devem ver essa visualização na navegação"
                         }
@@ -2663,7 +2786,6 @@
                         "unsaved_changes": "Alterações não salvas"
                     },
                     "save_config": {
-                        "cancel": "Esquecer",
                         "close": "Fechar",
                         "empty_config": "Comece com um painel de instrumentos vazio",
                         "header": "Assuma o controle da sua interface do Lovelace",
@@ -2691,8 +2813,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Isso renderiza o primeiro cartão em largura total; outros cartões nesta visualização não serão renderizados.",
-                            "title": "Modo Painel?",
                             "warning_multiple_cards": "Esta visualização contém mais de uma cartão, mas uma visualização de modo painel só pode mostrar 1 cartão."
                         }
                     }
@@ -2900,8 +3020,10 @@
                 },
                 "intro": "Você está pronto para despertar sua casa, recuperar sua privacidade e se juntar a uma comunidade mundial de consertadores?",
                 "restore": {
+                    "confirm_password": "Confirme a senha da Imagem",
                     "hide_log": "Ocultar registo completo",
                     "in_progress": "Restauração em andamento",
+                    "select_type": "Selecione o que restaurar",
                     "show_log": "Mostrar registo completo"
                 },
                 "user": {
@@ -2976,6 +3098,12 @@
                     "prompt_copy_token": "Copie seu token de acesso. Ele não será mostrado novamente.",
                     "prompt_name": "Nome?"
                 },
+                "mfa": {
+                    "confirm_disable": "Tem certeza de que deseja desativar {name} ?",
+                    "disable": "Desabilitar",
+                    "enable": "Habilitar",
+                    "header": "Módulos de Autenticação Multifator"
+                },
                 "mfa_setup": {
                     "close": "Fechar",
                     "step_done": "Configuração feita para {step}",
@@ -2983,11 +3111,15 @@
                     "title_aborted": "Abortado",
                     "title_success": "Sucesso!"
                 },
-                "mfa": {
-                    "confirm_disable": "Tem certeza de que deseja desativar {name} ?",
-                    "disable": "Desabilitar",
-                    "enable": "Habilitar",
-                    "header": "Módulos de Autenticação Multifator"
+                "number_format": {
+                    "description": "Escolha como os números são formatados.",
+                    "dropdown_label": "Fomato de número",
+                    "formats": {
+                        "language": "Automático (usar configuração de idioma)",
+                        "none": "Nenhum",
+                        "space_comma": "1 234 567,89"
+                    },
+                    "header": "Fomato de número"
                 },
                 "push_notifications": {
                     "add_device_prompt": {
diff --git a/translations/frontend/pt.json b/translations/frontend/pt.json
index 19b20f966f..b04951adc7 100644
--- a/translations/frontend/pt.json
+++ b/translations/frontend/pt.json
@@ -17,6 +17,7 @@
         "calendar": "Calendário",
         "config": "Configuração",
         "developer_tools": "Ferramentas de programação",
+        "energy": "Energia",
         "history": "Histórico",
         "logbook": "Diário de bordo",
         "mailbox": "Caixa de correio",
@@ -26,6 +27,14 @@
         "shopping_list": "Lista de compras",
         "states": "Visão Geral"
     },
+    "state": {
+        "default": {
+            "off": "Desligado",
+            "on": "Ligado",
+            "unavailable": "Indisponível",
+            "unknown": "Desconhecido"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Ausente"
         }
     },
-    "state": {
-        "default": {
-            "off": "Desligado",
-            "on": "Ligado",
-            "unavailable": "Indisponível",
-            "unknown": "Desconhecido"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -248,6 +249,20 @@
                 "not_installed": "Add-on não está instalado"
             }
         },
+        "backup": {
+            "addons": "Add-ons",
+            "could_not_create": "Não foi possível criar um backup",
+            "create": "Criar",
+            "create_blocked_not_running": "Não é possível criar um backup agora porque o sistema está {state}.",
+            "created": "Criado",
+            "enter_password": "Por favor introduza uma palavra-passe.",
+            "folders": "Pastas",
+            "name": "Nome",
+            "password": "Palavra-passe",
+            "password_protection": "Proteção por palavra-passe",
+            "select_type": "Selecione o que restaurar",
+            "type": "Tipo"
+        },
         "common": {
             "cancel": "Cancelar",
             "close": "Fechar",
@@ -338,9 +353,6 @@
                 "text": "Desejas reiniciar o add-on com as alterações?"
             },
             "update": {
-                "create_snapshot": "Criar um snapshot do {name} antes de atualizar",
-                "snapshot": "Snapshot",
-                "snapshotting": "A criar um snapshot de {name}",
                 "updating": "A actualizar {name} para a versão {version}"
             }
         },
@@ -352,40 +364,9 @@
         },
         "panel": {
             "dashboard": "Painel",
-            "snapshots": "Imagens do sistema",
             "store": "Loja de Add-ons",
             "system": "Sistema"
         },
-        "snapshot": {
-            "addons": "Add-ons",
-            "available_snapshots": "Imagens de sistema disponíveis",
-            "could_not_create": "Não foi possível criar um snapshot",
-            "create": "Criar",
-            "create_blocked_not_running": "Não é possível criar um snapshot agora porque o sistema está {state}.",
-            "create_snapshot": "Criar snapshot",
-            "created": "Criado",
-            "description": "As imagens de sistema permitem facilmente criar uma cópia de segurança e restauro de todos os dados da sua instância do Home Assistant",
-            "enter_password": "Por favor introduza uma palavra-passe.",
-            "folder": {
-                "addons/local": "Add-ons locais",
-                "homeassistant": "Configuração do Home Assistant",
-                "media": "Média",
-                "share": "Partilhar",
-                "ssl": "SSL"
-            },
-            "folders": "Pastas",
-            "full_snapshot": "Snapshot completo",
-            "name": "Nome",
-            "no_snapshots": "Ainda não existem imagens de sistema.",
-            "partial_snapshot": "Snapshot parcial",
-            "password": "Palavra-passe",
-            "password_protected": "Protegido por Palavra-passe",
-            "password_protection": "Proteção por palavra-passe",
-            "security": "Segurança",
-            "select_type": "Selecione o que restaurar",
-            "type": "Tipo",
-            "upload_snapshot": "Upload  snapshot"
-        },
         "store": {
             "missing_addons": "Complementos em falta? Active o modo avançado na sua pagina de perfil de utilizador",
             "no_results_found": "Nenhum resultado encontrado em {repository}.",
@@ -718,6 +699,12 @@
             },
             "date-range-picker": {
                 "end_date": "Data de fim",
+                "ranges": {
+                    "last_week": "Semana passada",
+                    "this_week": "Esta semana",
+                    "today": "Hoje",
+                    "yesterday": "Ontem"
+                },
                 "select": "Selecione",
                 "start_date": "Data de início"
             },
@@ -808,10 +795,10 @@
                 "documentation": "Documentação",
                 "learn_adding_local_media": "Saiba mais sobre como adicionar ficheiros de média na {documentation} .",
                 "local_media_files": "Coloque seus ficheiros de vídeo, áudio e imagem no diretório de multimédia para poder navegar e reproduzi-los no navegador ou em reprodutores de média compatíveis.",
+                "media-player-browser": "Navegador do Media Player",
                 "media_browsing_error": "Erro de Navegação de Multimédia",
                 "media_not_supported": "O Browser Media Player não suporta este tipo de ficheiro",
                 "media_player": "Leitor multimédia",
-                "media-player-browser": "Navegador do Media Player",
                 "no_items": "Sem itens",
                 "no_local_media_found": "Não existem ficheiros de média",
                 "no_media_folder": "Parece que ainda não criou um diretório de multimédia.",
@@ -880,6 +867,12 @@
             "service-picker": {
                 "service": "Serviço"
             },
+            "statistic-picker": {
+                "learn_more": "Saiba mais sobre estatísticas",
+                "missing_entity": "Por que a minha entidade não está disponível?",
+                "no_statistics": "Não tem nenhuma estatística",
+                "statistic": "Estatística"
+            },
             "target-picker": {
                 "add_area_id": "Escolha a área",
                 "add_device_id": "Escolha o dispositivo",
@@ -1077,13 +1070,13 @@
                         "core": "Geral",
                         "customize": "Personalização",
                         "devices": "Dispositivos",
+                        "energy": "Energia",
                         "entities": "Entidades",
                         "helpers": "Auxiliares",
                         "info": "Informação",
                         "integrations": "Integrações",
                         "logs": "Logs",
                         "lovelace": "Painéis Lovelace",
-                        "navigate_to": "Ir para {panel}",
                         "person": "Pessoas",
                         "scene": "Cenários",
                         "script": "Script",
@@ -1295,7 +1288,6 @@
                             "introduction": "As ações são o que o Home Assistant executará quando a automação for despoletada.",
                             "learn_more": "Saber mais sobre ações",
                             "name": "Ação",
-                            "type_select": "Tipo de ação",
                             "type": {
                                 "choose": {
                                     "add_option": "Adicionar opção",
@@ -1336,7 +1328,6 @@
                                 "repeat": {
                                     "label": "Repetir",
                                     "sequence": "Ações",
-                                    "type_select": "Tipo de repetição",
                                     "type": {
                                         "count": {
                                             "label": "Contagem"
@@ -1349,7 +1340,8 @@
                                             "conditions": "Enquanto as condições",
                                             "label": "Enquanto"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Tipo de repetição"
                                 },
                                 "scene": {
                                     "label": "Ativar cena"
@@ -1369,6 +1361,7 @@
                                     "wait_template": "Template de espera"
                                 }
                             },
+                            "type_select": "Tipo de ação",
                             "unsupported_action": "Ação não suportada: {action}"
                         },
                         "alias": "Nome",
@@ -1387,7 +1380,6 @@
                             "introduction": "As condições são opcionais e impedem a execução a menos que todas as condições sejam satisfeitas.",
                             "learn_more": "Saber mais sobre condições",
                             "name": "Condição",
-                            "type_select": "Tipo de condição",
                             "type": {
                                 "and": {
                                     "label": "E"
@@ -1454,6 +1446,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de condição",
                             "unsupported_condition": "Condição não suportada: {condition}"
                         },
                         "copy_to_clipboard": "Copiar para a Área de Transferência",
@@ -1493,7 +1486,6 @@
                             "introduction": "Os acionadores são o que iniciam o processamento de uma regra de automação. É possível especificar vários acionadores para a mesma regra. Uma vez iniciado um acionador, o Home Assistant irá validar as condições, e caso as mesmas ocorram, chamar a ação.\n\n[Saiba mais sobre acionadores.](https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "Saber mais sobre acionadores",
                             "name": "Acionador",
-                            "type_select": "Tipo de acionador",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1559,18 +1551,18 @@
                                     "label": "Template",
                                     "value_template": "Template para o valor"
                                 },
-                                "time_pattern": {
-                                    "hours": "Horas",
-                                    "label": "Padrão de tempo",
-                                    "minutes": "Minutos",
-                                    "seconds": "Segundos"
-                                },
                                 "time": {
                                     "at": "Às",
                                     "label": "Tempo",
                                     "type_input": "Valor de um auxiliar de data/hora",
                                     "type_value": "Hora marcada"
                                 },
+                                "time_pattern": {
+                                    "hours": "Horas",
+                                    "label": "Padrão de tempo",
+                                    "minutes": "Minutos",
+                                    "seconds": "Segundos"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1584,6 +1576,7 @@
                                     "zone": "Zona"
                                 }
                             },
+                            "type_select": "Tipo de acionador",
                             "unsupported_platform": "Plataforma não suportada: {platform}"
                         },
                         "unsaved_confirm": "Existem alterações não guardadas. Tem a certeza de que quer sair?"
@@ -1741,9 +1734,9 @@
                             "loading": "A carregar...",
                             "manage": "Gerir",
                             "no_hooks_yet": "Parece que ainda não tem webhooks. Comece, por configurar um",
+                            "no_hooks_yet2": " ou criando um ",
                             "no_hooks_yet_link_automation": "automação de webhook",
                             "no_hooks_yet_link_integration": "integração baseada em webhook",
-                            "no_hooks_yet2": " ou criando um ",
                             "title": "Webhooks"
                         }
                     },
@@ -1990,6 +1983,26 @@
                     "unnamed_device": "Dispositivo sem nome",
                     "update": "Atualizar"
                 },
+                "energy": {
+                    "caption": "Energia",
+                    "device_consumption": {
+                        "dialog": {
+                            "selected_stat_intro": "Seleccione a entidade que representa a utilização de energia do dispositivo."
+                        }
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_number_input": "Preço por kWh",
+                                "energy_stat": "Energia consumida (kWh)"
+                            }
+                        }
+                    },
+                    "solar": {
+                        "stat_return_to_grid": "Energia solar devolvida à rede",
+                        "title": "Painéis Solares"
+                    }
+                },
                 "entities": {
                     "caption": "Entidades",
                     "description": "Gerir entidades conhecidas",
@@ -2040,14 +2053,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Apagar",
-                    "filtering_by": "A filtrar por",
-                    "show": "Mostrar"
-                },
-                "hassio": {
-                    "button": "Configurar"
-                },
                 "header": "Configurar o Home Assistant",
                 "helpers": {
                     "caption": "Auxiliares",
@@ -2097,16 +2102,11 @@
                     "server": "servidor",
                     "setup_time": "Tempo de inicialização",
                     "source": "Fonte:",
-                    "system_health_error": "O componente System Health não está carregado. Adicione 'system_health:' ao configuration.yaml",
                     "system_health": {
                         "manage": "Gerir",
                         "more_info": "mais informações"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Página de Integrações",
-                    "missing_zha": "Falta o painel de configuração do Z-Wave? Foi movido para a entrada do Z-Wave na {integrations_page} .",
-                    "missing_zwave": "Falta o painel de configuração do Z-Wave? Foi movido para a entrada do Z-Wave na {integrations_page} ."
+                    },
+                    "system_health_error": "O componente System Health não está carregado. Adicione 'system_health:' ao configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Adicionar integração",
@@ -2121,7 +2121,6 @@
                         "depends_on_cloud": "Depende da nuvem",
                         "device_unavailable": "Dispositivo indisponível",
                         "devices": "{count} {count, plural,\n one {dispositivo}\n other {dispositivos}\n}",
-                        "disable_restart_confirm": "Reinicie o Home Assistant para termina a desactivação desta integração",
                         "disable": {
                             "disable_confirm": "Tem certeza de que deseja desativar esta entrada de configuração? Os respectivos dispositivos e entidades serão desativados.",
                             "disabled": "Desativado",
@@ -2132,17 +2131,16 @@
                             },
                             "disabled_cause": "Desativado por {cause}."
                         },
+                        "disable_restart_confirm": "Reinicie o Home Assistant para termina a desactivação desta integração",
                         "documentation": "Documentação",
                         "enable_restart_confirm": "Reinicie o Home Assistant para terminar a ativação desta integração",
                         "entities": "{count} {count, plural,\n  one {entidade}\n  other {entidades}\n}",
                         "entity_unavailable": "Entidade indisponível",
                         "firmware": "Firmware: {version}",
                         "hub": "Conectado via",
-                        "logs": "Logs",
                         "manuf": "por {manufacturer}",
                         "no_area": "Nenhuma Área",
                         "not_loaded": "Não carregado",
-                        "options": "Opções",
                         "provided_by_custom_integration": "Fornecido por uma integração personalizada",
                         "reload": "Recarregar",
                         "reload_confirm": "A integração foi recarregada",
@@ -2173,7 +2171,6 @@
                             "open_site": "Abrir site"
                         },
                         "finish": "Terminar",
-                        "loading_first_time": "Por favor, aguarde enquanto a integração está a ser instalada",
                         "next": "Próximo",
                         "not_all_required_fields": "Nem todos os campos obrigatórios estão preenchidos.",
                         "pick_flow_step": {
@@ -2188,7 +2185,6 @@
                     "details": "Detalhes da integração",
                     "disable": {
                         "disabled_integrations": "{number} desativado",
-                        "hide_disabled": "Ocultar integrações desativadas",
                         "show": "Mostrar",
                         "show_disabled": "Mostrar integrações desativadas"
                     },
@@ -2199,7 +2195,6 @@
                         "confirm_delete_ignore_title": "Parar de ignorar {name} ?",
                         "confirm_ignore": "De certeza que não quer configurar esta integração? Pode desfazer isto clicando em \"Mostrar integrações ignoradas' no menu deslizante no canto superior direito.",
                         "confirm_ignore_title": "Ignorar a descoberta de {name} ?",
-                        "hide_ignored": "Esconder integrações ignoradas",
                         "ignore": "Ignorar",
                         "ignored": "Ignorado",
                         "show_ignored": "Mostrar integrações ignoradas",
@@ -2317,7 +2312,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configurar",
                     "description_listen": "Ouvir um tópico",
                     "description_publish": "Publicar um pacote",
                     "listening_to": "A escutar",
@@ -2331,7 +2325,6 @@
                     "topic": "tópico"
                 },
                 "ozw": {
-                    "button": "Configurar",
                     "common": {
                         "controller": "Controlador",
                         "instance": "Instância",
@@ -2356,6 +2349,11 @@
                         "nodes": "Nós",
                         "select_instance": "Selecione a instância"
                     },
+                    "network": {
+                        "header": "Gestão de Rede",
+                        "introduction": "Gerir funções de rede.",
+                        "node_count": "{count} nós"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Todos os nós foram inquiridos.",
@@ -2376,10 +2374,9 @@
                         "starting": "A iniciar",
                         "unknown": "Desconhecido"
                     },
-                    "network": {
-                        "header": "Gestão de Rede",
-                        "introduction": "Gerir funções de rede.",
-                        "node_count": "{count} nós"
+                    "node": {
+                        "button": "Detalhes do nó",
+                        "not_found": "Nó não encontrado"
                     },
                     "node_config": {
                         "header": "Configuração do Nó",
@@ -2409,10 +2406,6 @@
                         "versions": "A obter informações sobre as versões de firmware e classe de comando",
                         "wakeup": "A configurar suporte para filas de ativação e mensagens"
                     },
-                    "node": {
-                        "button": "Detalhes do nó",
-                        "not_found": "Nó não encontrado"
-                    },
                     "nodes_table": {
                         "failed": "Falhou",
                         "id": "ID",
@@ -2715,7 +2708,6 @@
                         "search_again": "Pesquisar Novamente",
                         "spinner": "À procura de dispositivos ZHA Zigbee..."
                     },
-                    "button": "Configurar",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributos do cluster selecionado",
                         "get_zigbee_attribute": "Obter atributo Zigbee",
@@ -2744,10 +2736,7 @@
                         "value": "Valor"
                     },
                     "configuration_page": {
-                        "shortcuts_title": "Atalhos",
-                        "zha_options": {
-                            "title": "Opções Globais"
-                        }
+                        "shortcuts_title": "Atalhos"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuração Completa",
@@ -2829,95 +2818,7 @@
                     "introduction": "As zonas permitem especificar determinadas regiões da Terra. Quando uma pessoa está dentro de uma zona, o estado assume o nome da zona. As zonas também podem ser usadas como gatilho ou condição nas configurações de automação.",
                     "no_zones_created_yet": "Parece que ainda não criou nenhuma zona."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Cancelar Inclusão",
-                        "controller_in_inclusion_mode": "O seu controlador Z-Wave está agora em modo de inclusão.",
-                        "follow_device_instructions": "Siga as instruções do seu dispositivo para ativar o modo de emparelhamento",
-                        "inclusion_failed": "Não foi possível adicionar o nó. Por favor verifique os logs para mais informações.",
-                        "inclusion_finished": "O nó foi adicionado. Poderá demorar alguns minutos para que todas as entidades fiquem disponiveis, enquanto terminamos a configuração do nó em segundo plano.",
-                        "interview_failed": "A consulta do dispositivo falhou. Informações adicionais podem estar disponíveis nos logs.",
-                        "introduction": "Este assistente irá guiá-lo para adicionar um nó à sua rede Z-Wave.",
-                        "secure_inclusion_warning": "Dispositivos seguros requerem mais largura de banda; demasiados dispositivos seguros podem diminuir a performance da rede Z-Wave. Recomendamos que apenas sejam adicionados dispositivos seguros estritamente necessários, como fechaduras e aberturas de garagem.",
-                        "start_inclusion": "Iniciar Inclusão",
-                        "start_secure_inclusion": "Iniciar a Inclusão Segura",
-                        "title": "Adicionar um nó Z-Wave",
-                        "use_secure_inclusion": "Utilizar inclusão segura",
-                        "view_device": "Exibir dispositivo"
-                    },
-                    "button": "Configurar",
-                    "common": {
-                        "add_node": "Adicionar nó",
-                        "close": "Fechar",
-                        "home_id": "ID de Casa",
-                        "network": "Rede",
-                        "node_id": "ID de nó",
-                        "remove_node": "Remover nó"
-                    },
-                    "dashboard": {
-                        "driver_version": "Versão do driver",
-                        "dump_dead_nodes_title": "Alguns de seus nós estão desativados",
-                        "dump_not_ready_confirm": "Download",
-                        "dump_not_ready_title": "Nem todos os nós estão prontos",
-                        "header": "Gerir a sua rede Z-Wave",
-                        "home_id": "ID de Casa",
-                        "introduction": "Gerir a sua rede Z-Wave e respetivos nós",
-                        "nodes_ready": "Nós prontos",
-                        "server_version": "Versão do servidor"
-                    },
-                    "device_info": {
-                        "device_config": "Configurar Dispositivo",
-                        "node_ready": "Nó Pronto",
-                        "node_status": "Estado do Nó",
-                        "zwave_info": "Informações sobre Z-Wave"
-                    },
-                    "logs": {
-                        "log_level": "Nível de log",
-                        "log_level_changed": "Nível de log alterado para: {level}",
-                        "subscribed_to_logs": "Inscrito em mensagens de log do Z-Wave JS...",
-                        "title": "Z-Wave JS Logs"
-                    },
-                    "navigation": {
-                        "logs": "Logs",
-                        "network": "Rede"
-                    },
-                    "network_status": {
-                        "connected": "Conectado",
-                        "connecting": "A conectar",
-                        "unknown": "Desconhecido"
-                    },
-                    "node_config": {
-                        "error_device_not_found": "Dispositivo não encontrado",
-                        "parameter_is_read_only": "Este parâmetro é apenas de leitura.",
-                        "set_param_accepted": "O parâmetro foi atualizado.",
-                        "set_param_error": "Ocorreu um erro.",
-                        "set_param_queued": "A alteração do parâmetro foi colocada na fila e será atualizada quando o dispositivo for ativado."
-                    },
-                    "node_status": {
-                        "alive": "Ativo",
-                        "asleep": "Adormecido",
-                        "awake": "Acordado",
-                        "dead": "Inativo",
-                        "unknown": "Desconhecido"
-                    },
-                    "reinterview_node": {
-                        "in_progress": "A consultar dispositivo. Isto pode demorar algum tempo.",
-                        "interview_complete": "Consulta do dispositivo concluída.",
-                        "interview_failed": "A consulta do dispositivo falhou. Informações adicionais podem estar disponíveis nos logs.",
-                        "start_reinterview": "Iniciar nova consulta"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Cancelar Exclusão",
-                        "controller_in_exclusion_mode": "O seu controlador Z-Wave está agora em modo de exclusão.",
-                        "exclusion_failed": "Não foi possível remover o nó. Por favor verifique os logs para mais informações.",
-                        "exclusion_finished": "O nó {id} foi removido da sua rede Z-Wave.",
-                        "introduction": "Remova o nó da sua rede Z-Wave, e os dispositivos e entidades associadas do Home Assistant.",
-                        "start_exclusion": "Iniciar Exclusão",
-                        "title": "Remover um nó Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Configurar UI",
                     "common": {
                         "index": "Índice",
                         "instance": "Instância",
@@ -3005,6 +2906,92 @@
                     "values": {
                         "header": "Valores do Nó"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Cancelar Inclusão",
+                        "controller_in_inclusion_mode": "O seu controlador Z-Wave está agora em modo de inclusão.",
+                        "follow_device_instructions": "Siga as instruções do seu dispositivo para ativar o modo de emparelhamento",
+                        "inclusion_failed": "Não foi possível adicionar o nó. Por favor verifique os logs para mais informações.",
+                        "inclusion_finished": "O nó foi adicionado. Poderá demorar alguns minutos para que todas as entidades fiquem disponiveis, enquanto terminamos a configuração do nó em segundo plano.",
+                        "interview_failed": "A consulta do dispositivo falhou. Informações adicionais podem estar disponíveis nos logs.",
+                        "introduction": "Este assistente irá guiá-lo para adicionar um nó à sua rede Z-Wave.",
+                        "secure_inclusion_warning": "Dispositivos seguros requerem mais largura de banda; demasiados dispositivos seguros podem diminuir a performance da rede Z-Wave. Recomendamos que apenas sejam adicionados dispositivos seguros estritamente necessários, como fechaduras e aberturas de garagem.",
+                        "start_inclusion": "Iniciar Inclusão",
+                        "start_secure_inclusion": "Iniciar a Inclusão Segura",
+                        "title": "Adicionar um nó Z-Wave",
+                        "use_secure_inclusion": "Utilizar inclusão segura",
+                        "view_device": "Exibir dispositivo"
+                    },
+                    "common": {
+                        "add_node": "Adicionar nó",
+                        "close": "Fechar",
+                        "home_id": "ID de Casa",
+                        "network": "Rede",
+                        "node_id": "ID de nó",
+                        "remove_node": "Remover nó"
+                    },
+                    "dashboard": {
+                        "driver_version": "Versão do driver",
+                        "dump_dead_nodes_title": "Alguns de seus nós estão desativados",
+                        "dump_not_ready_confirm": "Download",
+                        "dump_not_ready_title": "Nem todos os nós estão prontos",
+                        "header": "Gerir a sua rede Z-Wave",
+                        "home_id": "ID de Casa",
+                        "introduction": "Gerir a sua rede Z-Wave e respetivos nós",
+                        "nodes_ready": "Nós prontos",
+                        "server_version": "Versão do servidor"
+                    },
+                    "device_info": {
+                        "device_config": "Configurar Dispositivo",
+                        "node_ready": "Nó Pronto",
+                        "node_status": "Estado do Nó",
+                        "zwave_info": "Informações sobre Z-Wave"
+                    },
+                    "logs": {
+                        "log_level": "Nível de log",
+                        "log_level_changed": "Nível de log alterado para: {level}",
+                        "subscribed_to_logs": "Inscrito em mensagens de log do Z-Wave JS...",
+                        "title": "Z-Wave JS Logs"
+                    },
+                    "navigation": {
+                        "logs": "Logs",
+                        "network": "Rede"
+                    },
+                    "network_status": {
+                        "connected": "Conectado",
+                        "connecting": "A conectar",
+                        "unknown": "Desconhecido"
+                    },
+                    "node_config": {
+                        "error_device_not_found": "Dispositivo não encontrado",
+                        "parameter_is_read_only": "Este parâmetro é apenas de leitura.",
+                        "set_param_accepted": "O parâmetro foi atualizado.",
+                        "set_param_error": "Ocorreu um erro.",
+                        "set_param_queued": "A alteração do parâmetro foi colocada na fila e será atualizada quando o dispositivo for ativado."
+                    },
+                    "node_status": {
+                        "alive": "Ativo",
+                        "asleep": "Adormecido",
+                        "awake": "Acordado",
+                        "dead": "Inativo",
+                        "unknown": "Desconhecido"
+                    },
+                    "reinterview_node": {
+                        "in_progress": "A consultar dispositivo. Isto pode demorar algum tempo.",
+                        "interview_complete": "Consulta do dispositivo concluída.",
+                        "interview_failed": "A consulta do dispositivo falhou. Informações adicionais podem estar disponíveis nos logs.",
+                        "start_reinterview": "Iniciar nova consulta"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Cancelar Exclusão",
+                        "controller_in_exclusion_mode": "O seu controlador Z-Wave está agora em modo de exclusão.",
+                        "exclusion_failed": "Não foi possível remover o nó. Por favor verifique os logs para mais informações.",
+                        "exclusion_finished": "O nó {id} foi removido da sua rede Z-Wave.",
+                        "introduction": "Remova o nó da sua rede Z-Wave, e os dispositivos e entidades associadas do Home Assistant.",
+                        "start_exclusion": "Iniciar Exclusão",
+                        "title": "Remover um nó Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3085,30 +3072,15 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Voltar",
-                "supervisor": {
-                    "ask": "Pedido de ajuda",
-                    "reboot": "Tente uma reinicialização do anfitrião",
-                    "system_health": "Integridade do Sistema",
-                    "title": "Impossível carregar o painel do Supervisor!",
-                    "wait": "Se acabou de começar, certifique-se de que deu tempo suficiente ao supervisor para iniciar."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Semana passada",
-                    "this_week": "Esta semana",
-                    "today": "Hoje",
-                    "yesterday": "Ontem"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Semana passada",
-                    "this_week": "Esta semana",
-                    "today": "Hoje",
-                    "yesterday": "Ontem"
+            "energy": {
+                "charts": {
+                    "by_device": "Consumo por dispositivo",
+                    "stat_house_energy_meter": "Consumo total de energia"
+                },
+                "setup": {
+                    "back": "Anterior",
+                    "done": "Apresentar o meu painel de energia!",
+                    "next": "Seguinte"
                 }
             },
             "lovelace": {
@@ -3221,7 +3193,6 @@
                         "entities": {
                             "description": "O cartão de entidades é o tipo mais comum de cartão. Ele agrupa itens em listas.",
                             "edit_special_row": "Visualize os detalhes desta linha pressionando o botão editar",
-                            "entity_row_editor": "Editor de Linha de Entidade",
                             "entity_row": {
                                 "attribute": "Atributo",
                                 "button": "Botão",
@@ -3233,6 +3204,7 @@
                                 "section": "Seção",
                                 "weblink": "Ligação Web"
                             },
+                            "entity_row_editor": "Editor de Linha de Entidade",
                             "name": "Entidades",
                             "secondary_info_values": {
                                 "brightness": "Brilho",
@@ -3507,7 +3479,6 @@
                         "unsaved_changes": "Alterações não guardadas"
                     },
                     "save_config": {
-                        "cancel": "Cancelar",
                         "close": "Fechar",
                         "empty_config": "Começar com um painel de instrumentos vazio",
                         "header": "Assumir controle sobre a interface do Lovelace",
@@ -3536,8 +3507,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Isto faz com que o primeiro cartão ocupe toda a vista, os outros cartões e crachás ficarão ocultos.",
-                            "title": "Modo Painel?",
                             "warning_multiple_cards": "Esta vista contém mais do que um cartão, mas a vista de painel só pode mostrar 1 cartão."
                         }
                     }
@@ -3757,10 +3726,16 @@
                 "intro": "Está pronto para despertar a sua casa, reclamar a sua privacidade e juntar-se a uma comunidade mundial de tecnólogos?",
                 "next": "Próximo",
                 "restore": {
-                    "description": "Em alternativa, pode restaurar a partir de um snapshot anterior.",
+                    "addons": "Add-ons",
+                    "description": "Em alternativa, pode restaurar a partir de um backup anterior.",
+                    "folders": "Pastas",
                     "hide_log": "Ocultar log completo",
                     "in_progress": "Restauração em curso",
-                    "show_log": "Mostrar log completo"
+                    "password": "Palavra-passe",
+                    "password_protection": "Proteção por palavra-passe",
+                    "select_type": "Selecione o que restaurar",
+                    "show_log": "Mostrar log completo",
+                    "type": "Tipo"
                 },
                 "user": {
                     "create_account": "Criar conta",
@@ -3837,6 +3812,12 @@
                     "prompt_copy_token": "Copie o seu token de acesso. Não será mostrado novamente.",
                     "prompt_name": "Nome?"
                 },
+                "mfa": {
+                    "confirm_disable": "Tem certeza de que deseja desativar {name} ?",
+                    "disable": "Desativar",
+                    "enable": "Ativar",
+                    "header": "Módulos de Autenticação por Multíplos-fatores"
+                },
                 "mfa_setup": {
                     "close": "Fechar",
                     "step_done": "Configuração concluída para {step}",
@@ -3844,12 +3825,6 @@
                     "title_aborted": "Abortado",
                     "title_success": "Sucesso!"
                 },
-                "mfa": {
-                    "confirm_disable": "Tem certeza de que deseja desativar {name} ?",
-                    "disable": "Desativar",
-                    "enable": "Ativar",
-                    "header": "Módulos de Autenticação por Multíplos-fatores"
-                },
                 "number_format": {
                     "dropdown_label": "Formatação numérica",
                     "formats": {
diff --git a/translations/frontend/ro.json b/translations/frontend/ro.json
index 554218de45..e00bc13bca 100644
--- a/translations/frontend/ro.json
+++ b/translations/frontend/ro.json
@@ -25,6 +25,14 @@
         "shopping_list": "Listă de cumpărături",
         "states": "Interfață principală"
     },
+    "state": {
+        "default": {
+            "off": "Oprit",
+            "on": "Pornit",
+            "unavailable": "Indisponibil",
+            "unknown": "Necunoscut"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -93,14 +101,6 @@
             "not_home": "Plecat"
         }
     },
-    "state": {
-        "default": {
-            "off": "Oprit",
-            "on": "Pornit",
-            "unavailable": "Indisponibil",
-            "unknown": "Necunoscut"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -131,6 +131,13 @@
                 "documentation": "Documentație"
             }
         },
+        "backup": {
+            "enter_password": "Vă rugăm să introduceți o parolă.",
+            "folders": "Dosare",
+            "name": "Nume",
+            "password": "Parolă",
+            "type": "Tip"
+        },
         "common": {
             "description": "Descriere",
             "error": {
@@ -169,13 +176,6 @@
         "panel": {
             "dashboard": "Tablou de bord"
         },
-        "snapshot": {
-            "enter_password": "Vă rugăm să introduceți o parolă.",
-            "folders": "Dosare",
-            "name": "Nume",
-            "password": "Parolă",
-            "type": "Tip"
-        },
         "system": {
             "host": {
                 "docker_version": "Versiune Docker",
@@ -748,7 +748,6 @@
                         "info": "Info",
                         "integrations": "Integrări",
                         "logs": "Jurnale",
-                        "navigate_to": "Navigați la {panel}",
                         "person": "Persoane",
                         "scene": "Scene",
                         "script": "Scripturi",
@@ -915,7 +914,6 @@
                             "introduction": "Acțiunile sunt ceea ce va face Home Assistant atunci când este declanșată automatizarea.",
                             "learn_more": "Aflați mai multe despre acțiuni",
                             "name": "Acțiune",
-                            "type_select": "Tipul de acțiune",
                             "type": {
                                 "choose": {
                                     "add_option": "Adăugați opțiune",
@@ -983,6 +981,7 @@
                                     "wait_template": "Șablon așteptare"
                                 }
                             },
+                            "type_select": "Tipul de acțiune",
                             "unsupported_action": "Fără suport pentru acțiune în interfața de utilizator: {action}"
                         },
                         "alias": "Nume",
@@ -1001,7 +1000,6 @@
                             "introduction": "Condițiile sunt opționale și vor împiedica executarea ulterioară, cu excepția cazului în care sunt îndeplinite toate condițiile.",
                             "learn_more": "Aflați mai multe despre condiții",
                             "name": "Condiție",
-                            "type_select": "Tip condiționare",
                             "type": {
                                 "and": {
                                     "label": "Și"
@@ -1065,6 +1063,7 @@
                                     "zone": "Zonă"
                                 }
                             },
+                            "type_select": "Tip condiționare",
                             "unsupported_condition": "Nu există suport în interfața de utilizator pentru condiția: {condition}"
                         },
                         "copy_to_clipboard": "Copiați în clipboard",
@@ -1103,7 +1102,6 @@
                             "introduction": "Declanșatoarele sunt cele ce încep procesarea unei reguli de automatizare. Este posibil să specificați mai multe declanșatoare pentru aceeași regulă. Odată ce începe declanșarea, Home Assistant o să valideze condițiile, dacă este cazul, și va apela acțiunea.",
                             "learn_more": "Aflați mai multe despre triggeri",
                             "name": "Activator",
-                            "type_select": "Tip acțiune",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1168,17 +1166,17 @@
                                     "label": "Şablon",
                                     "value_template": "Valoare șablon"
                                 },
+                                "time": {
+                                    "at": "La",
+                                    "label": "Timp",
+                                    "type_value": "Timp fix"
+                                },
                                 "time_pattern": {
                                     "hours": "Ore",
                                     "label": "Model de timp",
                                     "minutes": "Minute",
                                     "seconds": "Secunde"
                                 },
-                                "time": {
-                                    "at": "La",
-                                    "label": "Timp",
-                                    "type_value": "Timp fix"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "ID-ul Webhook"
@@ -1192,6 +1190,7 @@
                                     "zone": "Zonă"
                                 }
                             },
+                            "type_select": "Tip acțiune",
                             "unsupported_platform": "Fără suport pentru interfața de utilizator pentru platforma: {platform}"
                         },
                         "unsaved_confirm": "Aveți modificări nesalvate. Sunteți sigur că doriti să ieșiți?"
@@ -1336,9 +1335,9 @@
                             "loading": "Se încarcă ...",
                             "manage": "Gestionați",
                             "no_hooks_yet": "Se pare că nu aveți încă niciun webhook. Începeți configurând un ",
+                            "no_hooks_yet2": " sau prin crearea unui ",
                             "no_hooks_yet_link_automation": "automatizare webhook",
                             "no_hooks_yet_link_integration": "integrare bazată pe webhook",
-                            "no_hooks_yet2": " sau prin crearea unui ",
                             "title": "Webhook-uri"
                         }
                     },
@@ -1451,14 +1450,6 @@
                     "description": "Sistemul de unități, locația, fusul orar și alți parametri generali",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Inainte de activare acestuia asigurați-va ca vizitați pagina de documentare {link} pentru a înțelege ce trimiteți si cum este stocată",
-                                "preference": {
-                                    "statistics": {
-                                        "title": "Statistici de utilizare"
-                                    }
-                                }
-                            },
                             "core_config": {
                                 "edit_requires_storage": "Editorul a fost dezactivat deoarece configurația a fost stocata în configuration.yaml.",
                                 "elevation": "Altitudine",
@@ -1638,10 +1629,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Ştergeți",
-                    "filtering_by": "Filtrare după"
-                },
                 "header": "Configurați Home Assistant",
                 "helpers": {
                     "caption": "Ajutoare",
@@ -1693,10 +1680,6 @@
                         "more_info": "mai multe informații"
                     }
                 },
-                "integration_panel_move": {
-                    "link_integration_page": "Pagina de integrari",
-                    "missing_zwave": "Lipsește panoul de configurare Z-Wave? Acesta a fost mutat la intrarea Z-Wave din {integrations_page}."
-                },
                 "integrations": {
                     "add_integration": "Adăugați integrare",
                     "attention": "Atenție necesară",
@@ -1724,7 +1707,6 @@
                         "hub": "Conectat prin",
                         "manuf": "de {manufacturer}",
                         "no_area": "Nicio zonă",
-                        "options": "Opțiuni",
                         "reload": "Reîncărcați",
                         "reload_confirm": "Integrarea a fost reîncărcată",
                         "reload_restart_confirm": "Reporniți Home Assistant pentru a finaliza reîncărcarea acestei integrări",
@@ -1746,7 +1728,6 @@
                             "open_site": "Deschideți site-ul web"
                         },
                         "finish": "Finalizați",
-                        "loading_first_time": "Vă rugăm să așteptați în timp ce integrarea este instalată",
                         "not_all_required_fields": "Nu toate câmpurile obligatorii sunt completate.",
                         "submit": "Trimiteți"
                     },
@@ -1757,7 +1738,6 @@
                     "details": "Detalii integrare",
                     "disable": {
                         "disabled_integrations": "{number} dezactivat",
-                        "hide_disabled": "Ascundeți integrările dezactivate",
                         "show_disabled": "Afișați integrări dezactivate"
                     },
                     "discovered": "Descoperit",
@@ -1767,7 +1747,6 @@
                         "confirm_delete_ignore_title": "Încetați să ignorați {name}?",
                         "confirm_ignore": "Sunteți sigur că nu doriți să configurați această integrare? Puteți anula acest lucru făcând clic pe „Afișați integrări ignorate” din meniul overflow din partea dreaptă sus.",
                         "confirm_ignore_title": "Ignorați descoperirea {name}?",
-                        "hide_ignored": "Ascundeți integrările ignorate",
                         "ignore": "Ignorați",
                         "ignored": "Ignorat",
                         "show_ignored": "Afișați integrări ignorate",
@@ -1878,7 +1857,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Configurare",
                     "description_listen": "Ascultă un subiect",
                     "description_publish": "Publică un pachet",
                     "listening_to": "Ascultând",
@@ -1892,7 +1870,6 @@
                     "topic": "subiect"
                 },
                 "ozw": {
-                    "button": "Configurați",
                     "common": {
                         "instance": "Instanţă",
                         "network": "Rețea",
@@ -1916,6 +1893,10 @@
                         "nodes": "Noduri",
                         "select_instance": "Selectați Instanța"
                     },
+                    "network": {
+                        "header": "Administrare rețea",
+                        "node_count": "{count} noduri"
+                    },
                     "network_status": {
                         "details": {
                             "driverfailed": "Conectarea la controlerul Z-Wave nu a reușit",
@@ -1933,9 +1914,9 @@
                         "starting": "Pornește",
                         "unknown": "Necunoscut"
                     },
-                    "network": {
-                        "header": "Administrare rețea",
-                        "node_count": "{count} noduri"
+                    "node": {
+                        "button": "Detalii nod",
+                        "not_found": "Nodul nu a fost găsit"
                     },
                     "node_config": {
                         "header": "Configurare nod",
@@ -1960,10 +1941,6 @@
                         "static": "Obțin valorile statice de pe dispozitiv",
                         "versions": "Obțin informații despre versiunile de firmware și ale claselor de comandă"
                     },
-                    "node": {
-                        "button": "Detalii nod",
-                        "not_found": "Nodul nu a fost găsit"
-                    },
                     "nodes_table": {
                         "id": "ID",
                         "manufacturer": "Producător",
@@ -2240,7 +2217,6 @@
                         "search_again": "Caută din nou",
                         "spinner": "Se caută dispozitive ZHA Zigbee..."
                     },
-                    "button": "Configurează",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributele clusterului selectat",
                         "get_zigbee_attribute": "Obțineți atributul Zigbee",
@@ -2344,61 +2320,7 @@
                     "introduction": "Zonele vă permit să specificați anumite regiuni de pe pământ. Când o persoană se află într-o zonă, identificatorul va lua numele din zonă. Zonele pot fi de asemenea utilizate ca declanșator sau condiție în cadrul setărilor de automatizare.",
                     "no_zones_created_yet": "Se pare că nu ai creat încă nici o zonă."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Anulați includerea",
-                        "controller_in_inclusion_mode": "Controlerul dvs. Z-Wave este acum în modul de includere.",
-                        "inclusion_failed": "Nodul nu a putut fi adăugat. Vă rugăm să verificați jurnalele pentru mai multe informații.",
-                        "introduction": "Acest expert vă va ghida prin adăugarea unui nod în rețeaua dvs. Z-Wave.",
-                        "secure_inclusion_warning": "Dispozitivele securizate necesită lățime de bandă suplimentară; prea multe dispozitive sigure vă pot încetini rețeaua Z-Wave. Vă recomandăm să folosiți o includere sigură numai pentru dispozitivele care necesită acest lucru, cum ar fi încuietori sau deschizători de uși de garaj.",
-                        "start_inclusion": "Pornire includere",
-                        "start_secure_inclusion": "Pornire includere securizată",
-                        "title": "Adăugați un nod Z-Wave",
-                        "use_secure_inclusion": "Folosiți includere sigură"
-                    },
-                    "button": "Configurează",
-                    "common": {
-                        "add_node": "Adăugați nod",
-                        "close": "Închide",
-                        "home_id": "ID domiciliu",
-                        "network": "Rețea",
-                        "node_id": "ID Nod",
-                        "remove_node": "Eliminați nodul"
-                    },
-                    "dashboard": {
-                        "driver_version": "Versiune driver",
-                        "dump_not_ready_confirm": "Descarcă",
-                        "header": "Gestionați-vă rețeaua Z-Wave",
-                        "home_id": "ID domiciliu",
-                        "introduction": "Gestionați rețeaua Z-Wave și nodurile Z-Wave",
-                        "server_version": "Versiunea serverului"
-                    },
-                    "device_info": {
-                        "node_ready": "Nod gata",
-                        "node_status": "Stare nod",
-                        "zwave_info": "Informații Z-Wave"
-                    },
-                    "navigation": {
-                        "network": "Rețea"
-                    },
-                    "network_status": {
-                        "connected": "Conectat",
-                        "connecting": "Se conectează la",
-                        "unknown": "Necunoscut"
-                    },
-                    "node_status": {
-                        "alive": "Activ",
-                        "asleep": "Adormit",
-                        "awake": "Treaz",
-                        "dead": "Inactiv",
-                        "unknown": "Necunoscut"
-                    },
-                    "remove_node": {
-                        "title": "Eliminați un nod Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Configurează",
                     "common": {
                         "index": "Index",
                         "instance": "Instanţă",
@@ -2483,6 +2405,58 @@
                     "values": {
                         "header": "Valoare nod"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Anulați includerea",
+                        "controller_in_inclusion_mode": "Controlerul dvs. Z-Wave este acum în modul de includere.",
+                        "inclusion_failed": "Nodul nu a putut fi adăugat. Vă rugăm să verificați jurnalele pentru mai multe informații.",
+                        "introduction": "Acest expert vă va ghida prin adăugarea unui nod în rețeaua dvs. Z-Wave.",
+                        "secure_inclusion_warning": "Dispozitivele securizate necesită lățime de bandă suplimentară; prea multe dispozitive sigure vă pot încetini rețeaua Z-Wave. Vă recomandăm să folosiți o includere sigură numai pentru dispozitivele care necesită acest lucru, cum ar fi încuietori sau deschizători de uși de garaj.",
+                        "start_inclusion": "Pornire includere",
+                        "start_secure_inclusion": "Pornire includere securizată",
+                        "title": "Adăugați un nod Z-Wave",
+                        "use_secure_inclusion": "Folosiți includere sigură"
+                    },
+                    "common": {
+                        "add_node": "Adăugați nod",
+                        "close": "Închide",
+                        "home_id": "ID domiciliu",
+                        "network": "Rețea",
+                        "node_id": "ID Nod",
+                        "remove_node": "Eliminați nodul"
+                    },
+                    "dashboard": {
+                        "driver_version": "Versiune driver",
+                        "dump_not_ready_confirm": "Descarcă",
+                        "header": "Gestionați-vă rețeaua Z-Wave",
+                        "home_id": "ID domiciliu",
+                        "introduction": "Gestionați rețeaua Z-Wave și nodurile Z-Wave",
+                        "server_version": "Versiunea serverului"
+                    },
+                    "device_info": {
+                        "node_ready": "Nod gata",
+                        "node_status": "Stare nod",
+                        "zwave_info": "Informații Z-Wave"
+                    },
+                    "navigation": {
+                        "network": "Rețea"
+                    },
+                    "network_status": {
+                        "connected": "Conectat",
+                        "connecting": "Se conectează la",
+                        "unknown": "Necunoscut"
+                    },
+                    "node_status": {
+                        "alive": "Activ",
+                        "asleep": "Adormit",
+                        "awake": "Treaz",
+                        "dead": "Inactiv",
+                        "unknown": "Necunoscut"
+                    },
+                    "remove_node": {
+                        "title": "Eliminați un nod Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -2557,22 +2531,6 @@
                     }
                 }
             },
-            "history": {
-                "ranges": {
-                    "last_week": "Săptămâna trecută",
-                    "this_week": "Săptămâna aceasta",
-                    "today": "Astăzi",
-                    "yesterday": "Ieri"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Săptămâna trecută",
-                    "this_week": "Săptămâna aceasta",
-                    "today": "Astăzi",
-                    "yesterday": "Ieri"
-                }
-            },
             "lovelace": {
                 "add_entities": {
                     "generated_unsupported": "Puteți utiliza această funcție numai atunci când ați preluat controlul asupra UI Lovelace.",
@@ -2673,7 +2631,6 @@
                         "entities": {
                             "description": "Cardul entități este cel mai comun tip de card. Acesta grupează elementele împreună în liste.",
                             "edit_special_row": "Vizualizați detaliile acestui rând făcând clic pe butonul de editare",
-                            "entity_row_editor": "Editează rândul entității",
                             "entity_row": {
                                 "attribute": "Atribut",
                                 "button": "Buton",
@@ -2683,6 +2640,7 @@
                                 "section": "Secțiune",
                                 "weblink": "Legătură Web"
                             },
+                            "entity_row_editor": "Editează rândul entității",
                             "name": "Entități",
                             "secondary_info_values": {
                                 "brightness": "Luminozitate",
@@ -2940,7 +2898,6 @@
                         "unsaved_changes": "Modificări nesalvate"
                     },
                     "save_config": {
-                        "cancel": "Nu contează",
                         "close": "Închideți",
                         "empty_config": "Începeți cu un tablou de bord gol",
                         "header": "Preia controlul asupra interfața dvs. Lovelace",
@@ -2968,8 +2925,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Aceasta redă primul card la lățime completă; alte carduri din această vizualizare, precum și insignele nu vor fi redate.",
-                            "title": "Mod Panou?",
                             "warning_multiple_cards": "Această vizualizare conține mai multe carduri, dar un panel view poate afișa doar 1 card"
                         }
                     }
@@ -3186,9 +3141,12 @@
                 "intro": "Sunteți gata să vă treziți casa, să vă recuperați intimitatea și să vă alăturați unei comunități mondiale de creatori?",
                 "next": "Următorul",
                 "restore": {
+                    "folders": "Dosare",
                     "hide_log": "Ascundeți jurnalul complet",
                     "in_progress": "Restaurare în curs",
-                    "show_log": "Afișați jurnalul complet"
+                    "password": "Parolă",
+                    "show_log": "Afișați jurnalul complet",
+                    "type": "Tip"
                 },
                 "user": {
                     "create_account": "Creați cont",
@@ -3265,6 +3223,12 @@
                     "prompt_copy_token": "Copiați token-ul de acces. Aceasta nu va mai fi afișat.",
                     "prompt_name": "Dați un nume token-ului"
                 },
+                "mfa": {
+                    "confirm_disable": "Sigur doriți să dezactivați {name} ?",
+                    "disable": "Dezactivați",
+                    "enable": "Activați",
+                    "header": "Module de autentificare multi-factor"
+                },
                 "mfa_setup": {
                     "close": "Închideți",
                     "step_done": "Configurarea făcută pentru {step}",
@@ -3272,12 +3236,6 @@
                     "title_aborted": "Anulat",
                     "title_success": "Succes!"
                 },
-                "mfa": {
-                    "confirm_disable": "Sigur doriți să dezactivați {name} ?",
-                    "disable": "Dezactivați",
-                    "enable": "Activați",
-                    "header": "Module de autentificare multi-factor"
-                },
                 "push_notifications": {
                     "add_device_prompt": {
                         "input_label": "Nume dispozitiv",
diff --git a/translations/frontend/ru.json b/translations/frontend/ru.json
index 54c34806ef..d956c7573a 100644
--- a/translations/frontend/ru.json
+++ b/translations/frontend/ru.json
@@ -2,7 +2,7 @@
     "config_entry": {
         "disabled_by": {
             "config_entry": "конфигурацией",
-            "device": "Устройство",
+            "device": "устройством",
             "integration": "интеграцией",
             "user": "пользователем"
         }
@@ -17,6 +17,7 @@
         "calendar": "Календарь",
         "config": "Настройки",
         "developer_tools": "Панель разработчика",
+        "energy": "Энергия",
         "history": "История",
         "logbook": "Журнал событий",
         "mailbox": "Почтовый ящик",
@@ -26,6 +27,14 @@
         "shopping_list": "Список покупок",
         "states": "Обзор"
     },
+    "state": {
+        "default": {
+            "off": "Выключено",
+            "on": "Включено",
+            "unavailable": "Недоступно",
+            "unknown": "Неизвестно"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Не дома"
         }
     },
-    "state": {
-        "default": {
-            "off": "Выключено",
-            "on": "Включено",
-            "unavailable": "Недоступно",
-            "unknown": "Неизвестно"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "Дополнение не установлено"
             }
         },
+        "backup": {
+            "addons": "Дополнения",
+            "confirm_password": "Подтверждение пароля",
+            "could_not_create": "Не удалось создать снимок",
+            "create": "Создать",
+            "create_blocked_not_running": "Создание снимка сейчас невозможно, потому что система находится в состоянии {state}.",
+            "created": "Создан",
+            "delete_backup_confirm": "удалить",
+            "delete_selected": "Удалить выбранные снимки",
+            "enter_password": "Пожалуйста, введите пароль.",
+            "failed_to_delete": "Не удалось удалить",
+            "folders": "Папки",
+            "name": "Название",
+            "password": "Пароль",
+            "password_protection": "Защита паролем",
+            "passwords_not_matching": "Пароли не совпадают",
+            "select_type": "Выберите что нужно восстановить:",
+            "selected": "Выбрано: {number}",
+            "type": "Тип снимка файловой системы:"
+        },
         "common": {
             "cancel": "Отменить",
             "close": "Закрыть",
@@ -366,9 +387,6 @@
                 "text": "Перезапустить дополнение с внесенными изменениями?"
             },
             "update": {
-                "create_snapshot": "Создать снимок {name} перед обновлением",
-                "snapshot": "Снимок",
-                "snapshotting": "Создание снимка {name}",
                 "updating": "Обновление {name} до версии {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "Панель",
-            "snapshots": "Снимки",
             "store": "Магазин",
             "system": "Система"
         },
-        "snapshot": {
-            "addons": "Дополнения",
-            "available_snapshots": "Доступные снимки",
-            "confirm_password": "Подтверждение пароля",
-            "could_not_create": "Не удалось создать снимок",
-            "create": "Создать",
-            "create_blocked_not_running": "Создание снимка сейчас невозможно, потому что система находится в состоянии {state}.",
-            "create_snapshot": "Создать снимок",
-            "created": "Создан",
-            "delete_selected": "Удалить выбранные снимки",
-            "delete_snapshot_confirm": "удалить",
-            "delete_snapshot_text": "Вы уверены, что хотите удалить {number} {number, plural,\n  one {снимок}\n  few {снимка}\n  many {снимков}\n  other {снимков}\n}?",
-            "delete_snapshot_title": "Удалить снимок",
-            "description": "Снимок файловой системы (snapshot) позволяет легко создавать и восстанавливать резервную копию всех данных Вашего Home Assistant.",
-            "enter_password": "Пожалуйста, введите пароль.",
-            "failed_to_delete": "Не удалось удалить",
-            "folder": {
-                "addons/local": "Локальные дополнения",
-                "homeassistant": "Home Assistant configuration",
-                "media": "Media",
-                "share": "Share",
-                "ssl": "SSL"
-            },
-            "folders": "Папки",
-            "full_snapshot": "Полный снимок",
-            "name": "Название",
-            "no_snapshots": "Не найдено ни одного снимка",
-            "partial_snapshot": "Частичный снимок",
-            "password": "Пароль",
-            "password_protected": "защищено паролем",
-            "password_protection": "Защита паролем",
-            "passwords_not_matching": "Пароли не совпадают",
-            "security": "Безопасность",
-            "select_type": "Выберите что нужно восстановить:",
-            "selected": "Выбрано: {number}",
-            "type": "Тип снимка файловой системы:",
-            "upload_snapshot": "Загрузить снимок на сервер"
-        },
         "store": {
             "missing_addons": "Пропали дополнения? Активируйте расширенный режим на странице Вашего профиля пользователя",
             "no_results_found": "Не найдено результатов в {repository}.",
@@ -727,17 +706,17 @@
             "area-picker": {
                 "add_dialog": {
                     "add": "Добавить",
-                    "failed_create_area": "Не удалось создать помещение.",
+                    "failed_create_area": "Не удалось создать пространство.",
                     "name": "Название",
-                    "text": "Введите название нового помещения.",
-                    "title": "Добавить помещение"
+                    "text": "Введите название нового пространства.",
+                    "title": "Добавить пространство"
                 },
-                "add_new": "Добавить помещение...",
-                "area": "Помещение",
+                "add_new": "Добавить пространство...",
+                "area": "Пространство",
                 "clear": "Очистить",
-                "no_areas": "Не найдено ни одного помещения",
-                "no_match": "Подходящих помещений не найдено",
-                "show_areas": "Показать помещения"
+                "no_areas": "Не найдено ни одного пространства",
+                "no_match": "Подходящих пространств не найдено",
+                "show_areas": "Показать пространства"
             },
             "attributes": {
                 "expansion_header": "Атрибуты"
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "До даты",
+                "ranges": {
+                    "last_week": "Прошедшая неделя",
+                    "this_week": "Эта неделя",
+                    "today": "Сегодня",
+                    "yesterday": "Вчера"
+                },
                 "select": "Выбрать",
                 "start_date": "С даты"
             },
@@ -851,10 +836,10 @@
                 "documentation": "документации",
                 "learn_adding_local_media": "Подробнее о добавлении мультимедиа читайте в {documentation}.",
                 "local_media_files": "Поместите видео, аудио и графические файлы в каталог мультимедиа, чтобы иметь возможность просматривать и воспроизводить их в браузере или на поддерживаемых медиаплеерах.",
+                "media-player-browser": "Браузер мультимедиа",
                 "media_browsing_error": "Ошибка просмотра мультимедиа",
                 "media_not_supported": "Этот тип мультимедиа не поддерживается.",
                 "media_player": "Медиаплеер",
-                "media-player-browser": "Браузер мультимедиа",
                 "no_items": "Нет элементов",
                 "no_local_media_found": "В локальном хранилище медиафайлы не найдены.",
                 "no_media_folder": "Похоже, что Вы еще не создали каталог мультимедиа.",
@@ -871,15 +856,15 @@
                 "unsupported_format": "Неподдерживаемый формат. Выберите изображение в формате JPEG, PNG или GIF."
             },
             "related-filter-menu": {
-                "filter_by_area": "Фильтр по помещениям",
+                "filter_by_area": "Фильтр по пространствам",
                 "filter_by_device": "Фильтр по устройствам",
                 "filter_by_entity": "Фильтр по объектам",
-                "filtered_by_area": "помещению: {area_name}",
+                "filtered_by_area": "пространству: {area_name}",
                 "filtered_by_device": "устройству: {device_name}",
                 "filtered_by_entity": "объекту: {entity_name}"
             },
             "related-items": {
-                "area": "Помещение",
+                "area": "Пространство",
                 "automation": "Используется в автоматизациях",
                 "device": "Устройство",
                 "entity": "Связанные объекты",
@@ -919,18 +904,35 @@
                 "required": "Обязательное поле",
                 "service_data": "Данные службы",
                 "target": "Цели",
-                "target_description": "Помещения, устройства или объекты, которые следует использовать в качестве целевых для этой службы."
+                "target_description": "Пространства, устройства или объекты, которые следует использовать в качестве целевых для этой службы."
             },
             "service-picker": {
                 "service": "Служба"
             },
+            "statistic-picker": {
+                "learn_more": "Узнайте больше о статистике",
+                "missing_entity": "Нужного объекта нет в списке?",
+                "no_match": "Подходящей статистики не найдено",
+                "no_statistics": "Статистика отсутствует",
+                "statistic": "Статистика"
+            },
+            "statistics_charts": {
+                "loading_statistics": "Загрузка статистики...",
+                "no_statistics_found": "Статистика не найдена.",
+                "statistic_types": {
+                    "max": "максимум",
+                    "mean": "среднее",
+                    "min": "минимум",
+                    "sum": "сумма"
+                }
+            },
             "target-picker": {
-                "add_area_id": "Выбрать помещение",
+                "add_area_id": "Выбрать пространство",
                 "add_device_id": "Выбрать устройство",
                 "add_entity_id": "Выбрать объект",
-                "expand_area_id": "Разделить это помещение на отдельные дочерние устройства и объекты. После разделения устройства и объекты не будут обновляться при изменении помещения.",
+                "expand_area_id": "Разделить это пространство на отдельные дочерние устройства и объекты. В дальнейшем, при изменении параметров пространства, изменения не будут распространяться на эти устройства и объекты.",
                 "expand_device_id": "Разделить это устройство на отдельные дочерние объекты. После разделения объекты не будут обновляться при изменении устройства.",
-                "remove_area_id": "Удалить помещение",
+                "remove_area_id": "Удалить пространство",
                 "remove_device_id": "Удалить устройство",
                 "remove_entity_id": "Удалить объект"
             },
@@ -960,9 +962,9 @@
                 "dismiss": "Отклонить",
                 "editor": {
                     "advanced": "Дополнительные настройки",
-                    "area": "Задать помещение для этого объекта",
-                    "area_note": "По умолчанию объекты устройства находятся в том же помещении, что и устройство. Если Вы измените помещение для этого объекта, он больше не будет наследовать настройки помещения устройства.",
-                    "change_device_area": "Изменить помещение для устройства",
+                    "area": "Переназначить пространство для этого объекта",
+                    "area_note": "По умолчанию объекты наследуют настройки пространства от родительского устройства. Если Вы переназначите пространство для этого объекта, он больше не будет наследовать настройки пространства.",
+                    "change_device_area": "Переназначить пространство для устройства",
                     "confirm_delete": "Вы уверены, что хотите удалить эту запись?",
                     "delete": "Удалить",
                     "device_disabled": "Родительское устройство этого объекта деактивировано.",
@@ -972,7 +974,7 @@
                     "enabled_label": "Активировать объект",
                     "enabled_restart_confirm": "Перезапустите Home Assistant, чтобы завершить изменение объектов",
                     "entity_id": "ID объекта",
-                    "follow_device_area": "Получить настройки помещения от устройства",
+                    "follow_device_area": "Получить настройки пространства от устройства",
                     "icon": "Значок",
                     "icon_error": "Параметр должен быть в формате 'prefix:iconname' (например: 'mdi:home')",
                     "name": "Название",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "Настройки"
                 },
+                "loading": {
+                    "loading_flow": "Подождите, пока завершится инициализация {integration}",
+                    "loading_step": "Загрузка следующего шага настройки {integration}"
+                },
                 "success": {
                     "description": "Параметры успешно сохранены."
                 }
@@ -1119,19 +1125,19 @@
             "quick-bar": {
                 "commands": {
                     "navigation": {
-                        "areas": "Помещения",
+                        "areas": "Пространства",
                         "automation": "Автоматизации",
                         "blueprint": "Проекты",
                         "core": "Общие",
                         "customize": "Кастомизация",
                         "devices": "Устройства",
+                        "energy": "Энергия",
                         "entities": "Объекты",
                         "helpers": "Вспомогательное",
                         "info": "О системе",
                         "integrations": "Интеграции",
                         "logs": "Журнал сервера",
                         "lovelace": "Панели Lovelace",
-                        "navigate_to": "Открыть \"{panel}\"",
                         "person": "Люди",
                         "scene": "Сцены",
                         "script": "Скрипты",
@@ -1301,36 +1307,36 @@
                     "link_profile_page": "странице Вашего профиля"
                 },
                 "areas": {
-                    "caption": "Помещения",
+                    "caption": "Пространства",
                     "data_table": {
-                        "area": "Помещение",
+                        "area": "Пространство",
                         "devices": "Устройства",
                         "entities": "Объекты"
                     },
                     "delete": {
-                        "confirmation_text": "Связанные устройства потеряют привязку к помещению.",
-                        "confirmation_title": "Вы уверены, что хотите удалить это помещение?"
+                        "confirmation_text": "Связанные устройства потеряют привязку к этому пространству.",
+                        "confirmation_title": "Вы уверены, что хотите удалить это пространство?"
                     },
-                    "description": "Управление помещениями",
+                    "description": "Группировка устройств и объектов по пространствам",
                     "editor": {
-                        "area_id": "ID помещения",
+                        "area_id": "ID пространства",
                         "create": "Добавить",
-                        "default_name": "Новое помещение",
+                        "default_name": "Новое пространство",
                         "delete": "Удалить",
                         "linked_entities_caption": "Объекты",
                         "name": "Название",
-                        "name_required": "Укажите название помещения",
+                        "name_required": "Укажите название пространства",
                         "no_linked_entities": "Не найдено связей с объектами",
                         "unknown_error": "Неизвестная ошибка.",
                         "update": "Обновить"
                     },
                     "picker": {
-                        "create_area": "Добавить помещение",
-                        "header": "Помещения",
+                        "create_area": "Добавить пространство",
+                        "header": "Пространства",
                         "integrations_page": "Страница интеграций",
-                        "introduction": "Этот раздел используется для определения местоположения устройств. Данная информация будет использоваться в Home Assistant, чтобы помочь вам в организации вашего интерфейса, определении прав доступа и интеграции с другими системами.",
+                        "introduction": "Этот раздел используется для определения местоположения устройств. Данная информация будет использоваться в Home Assistant, чтобы помочь вам в организации Вашего интерфейса, определении прав доступа и интеграции с другими системами.",
                         "introduction2": "Чтобы назначить устройству местоположение, используйте указанную ниже ссылку для перехода на страницу интеграций, а затем откройте уже настроенную интеграцию.",
-                        "no_areas": "У Вас еще нет добавленных помещений."
+                        "no_areas": "У Вас еще нет добавленных пространств."
                     }
                 },
                 "automation": {
@@ -1360,7 +1366,6 @@
                             "introduction": "Действия — это то, что сделает Home Assistant, когда правило автоматизации сработает.",
                             "learn_more": "Узнайте больше о действиях",
                             "name": "Действие",
-                            "type_select": "Тип действия",
                             "type": {
                                 "choose": {
                                     "add_option": "Добавить вариант",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "Повтор",
                                     "sequence": "Действия",
-                                    "type_select": "Режим повторений",
                                     "type": {
                                         "count": {
                                             "label": "Счётчик"
@@ -1414,7 +1418,8 @@
                                             "conditions": "Действия будут выполняться в цикле, пока соблюдаются эти условия",
                                             "label": "Пока"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Режим повторений"
                                 },
                                 "scene": {
                                     "label": "Активировать сцену"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "Шаблон ожидания"
                                 }
                             },
+                            "type_select": "Тип действия",
                             "unsupported_action": "Отсутствует форма ввода для этого действия: {action}"
                         },
                         "alias": "Название",
@@ -1452,7 +1458,6 @@
                             "introduction": "Условия — это необязательная часть правила автоматизации. Действие автоматизации не будет запущено, пока не будут удовлетворены все условия.",
                             "learn_more": "Узнайте больше об условиях",
                             "name": "Условие",
-                            "type_select": "Тип условия",
                             "type": {
                                 "and": {
                                     "label": "И"
@@ -1524,6 +1529,7 @@
                                     "zone": "Зона"
                                 }
                             },
+                            "type_select": "Тип условия",
                             "unsupported_condition": "Отсутствует форма ввода для этого условия: {condition}"
                         },
                         "copy_to_clipboard": "Скопировать в буфер обмена",
@@ -1565,7 +1571,6 @@
                             "introduction": "Триггеры — это то, что запускает процесс автоматизации. Можно указать несколько триггеров на одно и то же правило. Когда триггер сработает, Home Assistant будет проверять условия (если таковые имеются), и выполнять действия.",
                             "learn_more": "Узнайте больше о триггерах",
                             "name": "Триггер",
-                            "type_select": "Тип триггера",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1636,18 @@
                                     "label": "Шаблон",
                                     "value_template": "Значение шаблона"
                                 },
-                                "time_pattern": {
-                                    "hours": "Часов",
-                                    "label": "Шаблон времени",
-                                    "minutes": "Минут",
-                                    "seconds": "Секунд"
-                                },
                                 "time": {
                                     "at": "Время",
                                     "label": "Время",
                                     "type_input": "Вспомогательный элемент даты и времени",
                                     "type_value": "Фиксированное время"
                                 },
+                                "time_pattern": {
+                                    "hours": "Часов",
+                                    "label": "Шаблон времени",
+                                    "minutes": "Минут",
+                                    "seconds": "Секунд"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Идентификатор Webhook"
@@ -1656,6 +1661,7 @@
                                     "zone": "Зона"
                                 }
                             },
+                            "type_select": "Тип триггера",
                             "unsupported_platform": "Отсутствует форма ввода для этой платформы: {platform}"
                         },
                         "unsaved_confirm": "У вас есть несохраненные изменения. Вы уверены, что хотите выйти?"
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "Ваш Home Assistant будет доступен по адресу",
                             "link_learn_how_it_works": "Узнайте, как это работает",
                             "not_connected": "Не подключено",
+                            "reconnecting": "Повторное подключение",
                             "remote_enabled": {
                                 "caption": "Подключаться автоматически",
                                 "description": "Включите этот параметр, чтобы всегда иметь удалённый доступ к Вашему Home Assistant."
@@ -1818,9 +1825,9 @@
                             "loading": "Загрузка...",
                             "manage": "Управление",
                             "no_hooks_yet": "У Вас еще нет добавленных Webhook. Начните с настройки ",
+                            "no_hooks_yet2": " или создайте ",
                             "no_hooks_yet_link_automation": "Webhook автоматизацию",
                             "no_hooks_yet_link_integration": "интеграции на основе Webhook",
-                            "no_hooks_yet2": " или создайте ",
                             "title": "Webhook"
                         }
                     },
@@ -1935,41 +1942,13 @@
                     "description": "Настройки общего назначения",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Прежде всего, посетите страницу документации по аналитике {link}, чтобы понять, что Вы будете отправлять и как это будет храниться.",
-                                "header": "Аналитика",
-                                "instance_id": "ID экземпляра Home Assistant: {huuid}",
-                                "introduction": "Поделитесь информацией о Вашем Home Assistant, чтобы помочь сделать его ещё лучше. Полученные данные также помогут нам убедить производителей добавлять в свои продукты локальный контроль и функции, ориентированные на конфиденциальность.",
-                                "learn_more": "Как будут обрабатываться Ваши данные",
-                                "needs_base": "Активируйте базовую аналитику, чтобы эта опция была доступна",
-                                "preference": {
-                                    "base": {
-                                        "description": "ID экземпляра Home Assistant, его версия и тип установки.",
-                                        "title": "Базовая аналитика"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Отправлять отчеты при сбоях и возникновении непредвиденных ошибок.",
-                                        "title": "Диагностика"
-                                    },
-                                    "statistics": {
-                                        "description": "Подсчёт количества объектов, пользователей и других элементов.",
-                                        "title": "Статистика использования"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Названия, версии и возможности.",
-                                        "title": "Используемые интеграции и дополнения"
-                                    },
-                                    "usage": {
-                                        "description": "Названия интеграций и информация о версиях.",
-                                        "title": "Используемые интеграции"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Валюта",
                                 "edit_requires_storage": "Редактор отключен, поскольку конфигурация уже хранится в файле configuration.yaml.",
                                 "elevation": "Высота",
                                 "elevation_meters": "метров",
                                 "external_url": "URL-адрес для глобальной сети",
+                                "find_currency_value": "Перечень кодов валют",
                                 "imperial_example": "Градус Фаренгейта, фунт",
                                 "internal_url": "URL-адрес для домашней сети",
                                 "latitude": "Широта",
@@ -2040,7 +2019,7 @@
                     "confirm_rename_entity_ids": "Хотите ли Вы также переименовать идентификаторы объектов?",
                     "confirm_rename_entity_ids_warning": "Переименование повлечёт за собой необходимость вручную обновлять изменённые данные в правилах автоматизации, скриптах, сценах и пользовательском интерфейсе.",
                     "data_table": {
-                        "area": "Помещение",
+                        "area": "Пространство",
                         "battery": "Аккумулятор",
                         "device": "Устройство",
                         "integration": "Интеграция",
@@ -2098,6 +2077,63 @@
                     "update": "Обновить",
                     "update_device_error": "Не удалось обновить устройство"
                 },
+                "energy": {
+                    "caption": "Энергия",
+                    "description": "Мониторинг генерации и потребления электроэнергии",
+                    "device_consumption": {
+                        "add_stat": "Выберите объект для отслеживания потребления электроэнергии",
+                        "dialog": {
+                            "selected_stat_intro": "Выберите объект, который отслеживает энергопотребление устройства."
+                        },
+                        "learn_more": "Более подробную информацию Вы можете получить в документации.",
+                        "selected_stat": "Отслеживание потребление энергии для",
+                        "sub": "Анализ общего потребления электроэнергии в разрезе отдельных устройств.",
+                        "title": "Устройства"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "Использовать объект с текущей ценой",
+                                "cost_entity_input": "Объект с текущей ценой",
+                                "cost_number": "Использовать фиксированную цену",
+                                "cost_number_input": "Цена за кВтч",
+                                "cost_number_suffix": "{currency}/кВтч",
+                                "cost_para": "Выберите, как Home Assistant должен отслеживать затраты на потребляемую электроэнергию.",
+                                "cost_stat": "Использовать объект, отслеживающий общие расходы",
+                                "cost_stat_input": "Объект с суммой расходов",
+                                "energy_stat": "Потребляемая электроэнергия (кВтч)",
+                                "header": "Потребление электроэнергии",
+                                "no_cost": "Не отслеживать расходы",
+                                "paragraph": "Электроэнергия, которая поступает из общей электрической сети в Ваш дом."
+                            },
+                            "to": {
+                                "cost_entity": "Использовать объект с текущей ставкой",
+                                "cost_entity_input": "Объект с текущей ставкой",
+                                "cost_number": "Использовать фиксированную ставку",
+                                "cost_number_input": "Ставка за кВтч",
+                                "cost_number_suffix": "{currency}/кВтч",
+                                "cost_para": "Получаете ли Вы деньги, когда возвращаете энергию в общую электрическую сеть?",
+                                "cost_stat": "Использовать объект, отслеживающий общую полученную сумму денег",
+                                "cost_stat_input": "Объект с суммой компенсации",
+                                "energy_stat": "Возвращаемая электроэнергия (кВтч)",
+                                "header": "Генерация электроэнергии",
+                                "no_cost": "Я не получаю деньги",
+                                "paragraph": "Произведённая Вашими солнечными панелями электроэнергия, которая поступает в общую электрическую сеть."
+                            }
+                        },
+                        "learn_more": "Более подробную информацию Вы можете получить в документации.",
+                        "sub": "Настройка тарифов на электроэнергию, которую Вы потребляете из сети или возвращаете в сеть (если Вы генерируете и возвращаете энергию в сеть).",
+                        "title": "Электрическая сеть"
+                    },
+                    "solar": {
+                        "learn_more": "Более подробную информацию Вы можете получить в документации.",
+                        "stat_predicted_production": "Прогноз производства электроэнергии из солнечной энергии",
+                        "stat_production": "Электроэнергия, произведённая Вашими солнечными панелями",
+                        "stat_return_to_grid": "Электроэнергия от солнечных панелей, возвращенная в сеть",
+                        "sub": "Мониторинг состояния и производительности Ваших солнечных панелей.",
+                        "title": "Солнечные панели"
+                    }
+                },
                 "entities": {
                     "caption": "Объекты",
                     "description": "Управление доступными объектами",
@@ -2122,7 +2158,7 @@
                         },
                         "header": "Объекты",
                         "headers": {
-                            "area": "Помещение",
+                            "area": "Пространство",
                             "entity_id": "ID объекта",
                             "integration": "Интеграция",
                             "name": "Название",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Очистить",
-                    "filtering_by": "Отфильтровано по принадлежности к",
-                    "show": "Показать"
-                },
-                "hassio": {
-                    "button": "Настройки"
-                },
                 "header": "Настройка Home Assistant",
                 "helpers": {
                     "caption": "Вспомогательное",
@@ -2205,23 +2233,18 @@
                     "server": "сервер",
                     "setup_time": "Время запуска",
                     "source": "Исходный код:",
-                    "system_health_error": "Компонент System Health не загружен. Добавьте 'system_health:' в файл configuration.yaml.",
                     "system_health": {
                         "manage": "Управление",
                         "more_info": "дополнительная информация"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "странице интеграций",
-                    "missing_zha": "Отсутствует панель конфигурации ZHA? Настройки ZHA теперь находятся на {integrations_page} в карточке ZHA.",
-                    "missing_zwave": "Отсутствует панель конфигурации Z-Wave? Настройки Z-Wave теперь находятся на {integrations_page} в карточке Z-Wave."
+                    },
+                    "system_health_error": "Компонент System Health не загружен. Добавьте 'system_health:' в файл configuration.yaml."
                 },
                 "integrations": {
                     "add_integration": "Добавить интеграцию",
                     "attention": "Требуется внимание",
                     "caption": "Интеграции",
                     "config_entry": {
-                        "area": "Помещение: {area}",
+                        "area": "Пространство: {area}",
                         "check_the_logs": "Проверить журналы",
                         "configure": "Настроить",
                         "delete": "Удалить",
@@ -2229,8 +2252,6 @@
                         "depends_on_cloud": "Зависит от облачных сервисов",
                         "device_unavailable": "Устройство недоступно",
                         "devices": "{count} {count, plural,\n  one {устройство}\n  few {устройства}\n  many {устройств}\n  other {устройств}\n}",
-                        "disable_error": "Не удалось активировать или деактивировать интеграцию",
-                        "disable_restart_confirm": "Перезапустите Home Assistant, чтобы завершить деактивацию этой интеграции.",
                         "disable": {
                             "disable_confirm": "Вы уверены, что хотите деактивировать эту запись конфигурации? Её дочерние устройства и объекты будут также деактивированы.",
                             "disabled": "Деактивировано",
@@ -2241,6 +2262,8 @@
                             },
                             "disabled_cause": "Деактивировано {cause}"
                         },
+                        "disable_error": "Не удалось активировать или деактивировать интеграцию",
+                        "disable_restart_confirm": "Перезапустите Home Assistant, чтобы завершить деактивацию этой интеграции.",
                         "disabled_polling": "Автоматический опрос для получения обновленных данных отключен",
                         "documentation": "Документация",
                         "enable_restart_confirm": "Перезапустите Home Assistant, чтобы завершить подключение этой интеграции.",
@@ -2248,11 +2271,9 @@
                         "entity_unavailable": "Объект недоступен",
                         "firmware": "Прошивка: {version}",
                         "hub": "Подключено через",
-                        "logs": "журналы",
                         "manuf": "{manufacturer}",
                         "no_area": "Не указано",
                         "not_loaded": "Не загружено",
-                        "options": "Настройки",
                         "provided_by_custom_integration": "Предоставляется кастомной интеграцией",
                         "reload": "Перезагрузить",
                         "reload_confirm": "Перезагрузка интеграции выполнена",
@@ -2278,13 +2299,17 @@
                         "created_config": "Создана запись конфигурации {name}",
                         "dismiss": "Закрыть",
                         "error": "Ошибка",
-                        "error_saving_area": "Ошибка сохранения помещения: {error}",
+                        "error_saving_area": "Ошибка при сохранении: {error}",
                         "external_step": {
                             "description": "Для завершения этого шага требуется посетить внешний веб-сайт.",
                             "open_site": "Открыть веб-сайт"
                         },
                         "finish": "Готово",
-                        "loading_first_time": "Идет установка интеграции, пожалуйста, подождите",
+                        "loading": {
+                            "fallback_title": "интеграция",
+                            "loading_flow": "Подождите, пока завершится настройка {integration}",
+                            "loading_step": "Загрузка следующего шага настройки {integration}"
+                        },
                         "next": "Далее",
                         "not_all_required_fields": "Не все обязательные поля заполнены.",
                         "not_loaded": "Не удалось загрузить интеграцию, попробуйте перезапустить Home Assistant.",
@@ -2301,7 +2326,6 @@
                     "details": "Детали интеграции",
                     "disable": {
                         "disabled_integrations": "Деактивировано: {number}",
-                        "hide_disabled": "Скрыть деактивированные интеграции",
                         "show": "Показать",
                         "show_disabled": "Деактивированные интеграции"
                     },
@@ -2312,7 +2336,6 @@
                         "confirm_delete_ignore_title": "Прекратить игнорировать {name}?",
                         "confirm_ignore": "Вы сможете снова включить обнаружение этой интеграции. Для этого откройте меню в правом верхнем углу и нажмите «Игнорируемые интеграции».",
                         "confirm_ignore_title": "Игнорировать обнаружение интеграции {name}?",
-                        "hide_ignored": "Скрыть игнорируемые интеграции",
                         "ignore": "Игнорировать",
                         "ignored": "Игнорируется",
                         "show_ignored": "Игнорируемые интеграции",
@@ -2432,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Настройки",
                     "description_listen": "Подписаться на топик",
                     "description_publish": "Опубликовать данные",
                     "listening_to": "Подписано на",
@@ -2446,7 +2468,6 @@
                     "topic": "Топик"
                 },
                 "ozw": {
-                    "button": "Настройки",
                     "common": {
                         "controller": "Контроллер",
                         "instance": "Экземпляр",
@@ -2471,6 +2492,11 @@
                         "nodes": "Узлы",
                         "select_instance": "Выбор экземпляра"
                     },
+                    "network": {
+                        "header": "Управление сетью",
+                        "introduction": "Управление сетевыми функциями.",
+                        "node_count": "{count} узлов"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Все узлы опрошены",
@@ -2491,10 +2517,9 @@
                         "starting": "Запускается",
                         "unknown": "Неизвестно"
                     },
-                    "network": {
-                        "header": "Управление сетью",
-                        "introduction": "Управление сетевыми функциями.",
-                        "node_count": "{count} узлов"
+                    "node": {
+                        "button": "Подробности об узле",
+                        "not_found": "Узел не найден"
                     },
                     "node_config": {
                         "header": "Конфигурация узла",
@@ -2524,10 +2549,6 @@
                         "versions": "Получение информации о версиях прошивки и классов команд",
                         "wakeup": "Настройка поддержки очередей пробуждения и сообщений"
                     },
-                    "node": {
-                        "button": "Подробности об узле",
-                        "not_found": "Узел не найден"
-                    },
                     "nodes_table": {
                         "failed": "Сбой",
                         "id": "ID",
@@ -2711,7 +2732,7 @@
                             "input_number": "Вспомогательные элементы ввода чисел",
                             "input_select": "Вспомогательные выпадающие списки",
                             "input_text": "Вспомогательные элементы ввода текста",
-                            "introduction": "Некоторые компоненты Home Assistant можно перезагрузить без необходимости перезапуска всей системы. Перезагрузка выгружает текущую конфигурацию YAML и загружает новую.",
+                            "introduction": "Некоторые компоненты Home Assistant можно перезагрузить без необходимости перезапуска всей системы. При нажатии на одну из приведенных ниже опций выгружается текущая конфигурация YAML этой опции и загружается новая.",
                             "min_max": "Объекты интеграции \"Min/Max\"",
                             "mqtt": "Объекты интеграции \"MQTT\", настроенные вручную",
                             "person": "Люди",
@@ -2832,7 +2853,6 @@
                         "search_again": "Повторный поиск",
                         "spinner": "Поиск Zigbee устройств..."
                     },
-                    "button": "Настройки",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Атрибуты выбранного кластера",
                         "get_zigbee_attribute": "Получить атрибут Zigbee",
@@ -2862,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "Ярлыки",
-                        "update_button": "Обновить конфигурацию",
-                        "zha_options": {
-                            "default_light_transition": "Время плавного перехода света по умолчанию (в секундах)",
-                            "enable_identify_on_join": "Эффект для идентификации присоединения устройства к сети",
-                            "title": "Глобальные настройки"
-                        }
+                        "update_button": "Обновить конфигурацию"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "Настройка завершена",
@@ -2949,123 +2964,7 @@
                     "introduction": "Зоны позволяют указывать определенные области на земле. Когда отслеживаемая персона находится в назначенной зоне, её состоянием будет название зоны. Зоны также могут использоваться в качестве триггера или условия в автоматизациях.",
                     "no_zones_created_yet": "У Вас еще нет добавленных зон."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Отменить подключение",
-                        "controller_in_inclusion_mode": "Ваш контроллер Z-Wave находится в режиме подключения.",
-                        "follow_device_instructions": "Следуйте инструкциям к подключаемому устройству, чтобы инициировать сопряжение.",
-                        "inclusion_failed": "Не удалось добавить узел. Проверьте журналы для получения дополнительной информации.",
-                        "inclusion_finished": "Узел добавлен.",
-                        "interview_failed": "Опрос устройства не удался. Дополнительная информация может быть получена в журналах.",
-                        "interview_started": "Устройство опрашивается, это может занять некоторое время.",
-                        "introduction": "Этот мастер поможет Вам добавить узел в Вашу сеть Z-Wave.",
-                        "secure_inclusion_warning": "Для защищенных устройств требуется дополнительная пропускная способность. Слишком много таких устройств может замедлить работу Вашей сети Z-Wave. Мы рекомендуем использовать безопасное подключение только для устройств, которым требуется дополнительная защита, например, для замков или открывателей гаражных ворот.",
-                        "start_inclusion": "Начать подключение",
-                        "start_secure_inclusion": "Начать безопасное подключение",
-                        "title": "Добавить узел Z-Wave",
-                        "use_secure_inclusion": "Использовать безопасное подключение",
-                        "view_device": "Просмотр устройства"
-                    },
-                    "button": "Настройки",
-                    "common": {
-                        "add_node": "Добавить узел",
-                        "close": "Закрыть",
-                        "heal_network": "Перенастройка сети",
-                        "home_id": "ID дома",
-                        "network": "Сеть",
-                        "node_id": "ID узла",
-                        "reconfigure_server": "Перенастроить сервер",
-                        "remove_node": "Удалить узел"
-                    },
-                    "dashboard": {
-                        "driver_version": "Версия драйвера",
-                        "dump_dead_nodes_text": "Некоторые из Ваших узлов не ответили и считаются мертвыми. Они не будут полностью экспортированы.",
-                        "dump_dead_nodes_title": "Некоторые из Ваших узлов мертвы",
-                        "dump_debug": "Загрузите дамп Вашей сети, чтобы помочь диагностировать проблемы",
-                        "dump_not_ready_confirm": "Скачать",
-                        "dump_not_ready_text": "Если продолжить экспорт, пока не все узлы готовы, Вы можете упустить нужные данные. Дайте вашей сети некоторое время, чтобы опросить все узлы. Хотите продолжить экспорт дампа?",
-                        "dump_not_ready_title": "Ещё не все узлы готовы",
-                        "header": "Управление сетью Z-Wave",
-                        "home_id": "ID дома",
-                        "introduction": "Управляйте сетью и отдельными узлами Z-Wave",
-                        "nodes_ready": "Узлы готовы",
-                        "server_version": "Версия сервера"
-                    },
-                    "device_info": {
-                        "device_config": "Настроить устройство",
-                        "node_ready": "Узел готов",
-                        "node_status": "Статус узла",
-                        "zwave_info": "Информация о Z-Wave"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "Перенастройка сети была отменена.",
-                        "healing_complete": "Перенастройка сети завершена.",
-                        "healing_failed": "Не удалось завершить перенастройку сети. Дополнительная информация может быть доступна в журналах.",
-                        "in_progress": "Идет перенастройка сети. Это займет некоторое время.",
-                        "introduction": "Перенастройка сети заставит все устройства пересчитать свои маршруты к контроллеру. Эта процедура рекомендуется, если Вы переместили в другое место устройства или контроллер.",
-                        "run_in_background": "Вы можете закрыть это диалоговое окно, перенастройка сети продолжится в фоновом режиме.",
-                        "start_heal": "Начать перенастройку",
-                        "stop_heal": "Остановить перенастройку",
-                        "title": "Перенастройка сети Z-Wave",
-                        "traffic_warning": "Во время перенастройки генерируется большой объем трафика в сети Z-Wave. В связи с этим, устройства могут отвечать с задержками (или вообще не отвечать)."
-                    },
-                    "logs": {
-                        "log_level": "Уровень",
-                        "log_level_changed": "Уровень журнала изменен на: {level}",
-                        "subscribed_to_logs": "Подписано на сообщения журнала Z-Wave JS...",
-                        "title": "Журналы Z-Wave JS"
-                    },
-                    "navigation": {
-                        "logs": "Журналы",
-                        "network": "Сеть"
-                    },
-                    "network_status": {
-                        "connected": "Подключен",
-                        "connecting": "Подключение",
-                        "unknown": "Неизвестно"
-                    },
-                    "node_config": {
-                        "attribution": "Параметры конфигурации устройства и описания предоставлены {device_database}",
-                        "battery_device_notice": "Чтобы обновить конфигурацию устройства с питанием от батареи, оно должно находиться в активном состоянии. Обратитесь к руководству Вашего устройства для получения инструкций о том, как вывести его из спящего режима.",
-                        "error_device_not_found": "Устройство не найдено.",
-                        "header": "Настройки устройства Z-Wave",
-                        "introduction": "Настройка параметров конфигурации выбранного узла для выбранного устройства.",
-                        "parameter_is_read_only": "Этот параметр доступен только для чтения.",
-                        "set_param_accepted": "Параметр обновлен",
-                        "set_param_error": "Произошла ошибка",
-                        "set_param_queued": "Изменение параметра поставлено в очередь и будет обновлено, когда устройство выйдет из спящего режима",
-                        "zwave_js_device_database": "базой данных устройств Z-Wave JS"
-                    },
-                    "node_status": {
-                        "alive": "Живой",
-                        "asleep": "Спит",
-                        "awake": "Проснулся",
-                        "dead": "Мертвый",
-                        "unknown": "Неизвестно"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "Перед повторным опросом устройства с батарейным питанием необходимо вывести из спящего режима. О том, как это сделать, Вы можете узнать из инструкций к Вашему устройству.",
-                        "in_progress": "Устройство опрашивается, это может занять некоторое время.",
-                        "interview_complete": "Опрос устройства завершен.",
-                        "interview_failed": "Опрос устройства не удался. Дополнительная информация может быть получена в журналах.",
-                        "introduction": "Повторный опрос устройства в Вашей сети Z-Wave. Используйте эту функцию, если это устройство не работает или работает неправильно.",
-                        "run_in_background": "Вы можете закрыть это диалоговое окно, опрос продолжится в фоновом режиме.",
-                        "start_reinterview": "Начать повторный опрос",
-                        "title": "Повторный опрос устройства Z-Wave"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Отменить отключение",
-                        "controller_in_exclusion_mode": "Ваш контроллер Z-Wave находится в режиме отключения.",
-                        "exclusion_failed": "Не удалось удалить узел. Проверьте журналы для получения дополнительной информации.",
-                        "exclusion_finished": "Узел {id} был удален из Вашей сети Z-Wave.",
-                        "follow_device_instructions": "Следуйте инструкциям к подключаемому устройству, чтобы инициировать отключение.",
-                        "introduction": "Удалить узел из Вашей сети Z-Wave, а также связанное устройство и объекты из Home Assistant.",
-                        "start_exclusion": "Начать отключение",
-                        "title": "Удалить узел Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Настройки",
                     "common": {
                         "index": "Индекс",
                         "instance": "Экземпляр",
@@ -3154,6 +3053,144 @@
                     "values": {
                         "header": "Значения узлов"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Отменить подключение",
+                        "controller_in_inclusion_mode": "Ваш контроллер Z-Wave находится в режиме подключения.",
+                        "follow_device_instructions": "Следуйте инструкциям к подключаемому устройству, чтобы инициировать сопряжение.",
+                        "inclusion_failed": "Не удалось добавить узел. Проверьте журналы для получения дополнительной информации.",
+                        "inclusion_finished": "Узел добавлен.",
+                        "interview_failed": "Опрос устройства не удался. Дополнительная информация может быть получена в журналах.",
+                        "interview_started": "Устройство опрашивается, это может занять некоторое время.",
+                        "introduction": "Этот мастер поможет Вам добавить узел в Вашу сеть Z-Wave.",
+                        "secure_inclusion_warning": "Для защищенных устройств требуется дополнительная пропускная способность. Слишком много таких устройств может замедлить работу Вашей сети Z-Wave. Мы рекомендуем использовать безопасное подключение только для устройств, которым требуется дополнительная защита, например, для замков или открывателей гаражных ворот.",
+                        "start_inclusion": "Начать подключение",
+                        "start_secure_inclusion": "Начать безопасное подключение",
+                        "title": "Добавить узел Z-Wave",
+                        "use_secure_inclusion": "Использовать безопасное подключение",
+                        "view_device": "Просмотр устройства"
+                    },
+                    "common": {
+                        "add_node": "Добавить узел",
+                        "close": "Закрыть",
+                        "heal_network": "Перенастройка сети",
+                        "home_id": "ID дома",
+                        "network": "Сеть",
+                        "node_id": "ID узла",
+                        "reconfigure_server": "Перенастроить сервер",
+                        "remove_node": "Удалить узел",
+                        "source": "Источник"
+                    },
+                    "dashboard": {
+                        "driver_version": "Версия драйвера",
+                        "dump_dead_nodes_text": "Некоторые из узлов сети не ответили и считаются мертвыми. Они не будут полностью экспортированы.",
+                        "dump_dead_nodes_title": "Некоторые из узлов сети мертвы",
+                        "dump_debug": "Загрузите дамп Вашей сети, чтобы помочь диагностировать проблемы",
+                        "dump_not_ready_confirm": "Скачать",
+                        "dump_not_ready_text": "Если продолжить экспорт, пока не все узлы готовы, Вы можете упустить нужные данные. Дайте вашей сети некоторое время, чтобы опросить все узлы. Хотите продолжить экспорт дампа?",
+                        "dump_not_ready_title": "Ещё не все узлы готовы",
+                        "header": "Управление сетью Z-Wave",
+                        "home_id": "ID дома",
+                        "introduction": "Управляйте сетью и отдельными узлами Z-Wave",
+                        "nodes_ready": "Узлы готовы",
+                        "server_version": "Версия сервера"
+                    },
+                    "device_info": {
+                        "device_config": "Настроить устройство",
+                        "heal_node": "Перенастроить узел",
+                        "node_ready": "Узел готов",
+                        "node_status": "Статус узла",
+                        "reinterview_device": "Повторный опрос устройства",
+                        "remove_failed": "Удалить неисправное устройство",
+                        "zwave_info": "Информация о Z-Wave"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "Перенастройка сети была отменена.",
+                        "healing_complete": "Перенастройка сети завершена.",
+                        "healing_failed": "Не удалось завершить перенастройку сети. Дополнительная информация может быть доступна в журналах.",
+                        "in_progress": "Идет перенастройка сети. Это займет некоторое время.",
+                        "introduction": "Перенастройка сети заставит все устройства пересчитать свои маршруты к контроллеру. Эта процедура рекомендуется, если Вы переместили в другое место устройства или контроллер.",
+                        "run_in_background": "Вы можете закрыть это диалоговое окно, перенастройка сети продолжится в фоновом режиме.",
+                        "start_heal": "Начать перенастройку",
+                        "stop_heal": "Остановить перенастройку",
+                        "title": "Перенастройка сети Z-Wave",
+                        "traffic_warning": "Во время перенастройки генерируется большой объем трафика в сети Z-Wave. В связи с этим, устройства могут отвечать с задержками (или вообще не отвечать)."
+                    },
+                    "heal_node": {
+                        "healing_complete": "Перенастройка устройства {device} завершена успешно.",
+                        "healing_failed": "Устройство {device} не может быть перенастроено.",
+                        "healing_failed_check_logs": "Дополнительная информация может быть доступна в журналах.",
+                        "in_progress": "Выполняется перенастройка устройства {device}.",
+                        "introduction": "Устройство {device} начнёт повторное вычисление маршрутов к контроллеру. Это может помочь решить проблемы со связью, если Вы переместили в другое место устройство или контроллер.",
+                        "network_heal_in_progress": "Выполняется перенастройка сети Z-Wave. Дождитесь её завершения, прежде чем начать перенастройку отдельного устройства.",
+                        "start_heal": "Перенастроить устройство",
+                        "title": "Перенастройка устройства Z-Wave",
+                        "traffic_warning": "Во время перенастройки генерируется большой объем трафика в сети Z-Wave. В связи с этим, устройства могут отвечать с задержками (или вообще не отвечать)."
+                    },
+                    "logs": {
+                        "log_level": "Уровень",
+                        "log_level_changed": "Уровень журнала изменен на: {level}",
+                        "subscribed_to_logs": "Подписано на сообщения журнала Z-Wave JS...",
+                        "title": "Журналы Z-Wave JS"
+                    },
+                    "navigation": {
+                        "logs": "Журналы",
+                        "network": "Сеть"
+                    },
+                    "network_status": {
+                        "connected": "Подключен",
+                        "connecting": "Подключение",
+                        "unknown": "Неизвестно"
+                    },
+                    "node_config": {
+                        "attribution": "Параметры конфигурации устройства и описания предоставлены {device_database}",
+                        "battery_device_notice": "Чтобы обновить конфигурацию устройства с питанием от батареи, оно должно находиться в активном состоянии. Обратитесь к руководству Вашего устройства для получения инструкций о том, как вывести его из спящего режима.",
+                        "error_device_not_found": "Устройство не найдено.",
+                        "header": "Настройки устройства Z-Wave",
+                        "introduction": "Настройка параметров конфигурации выбранного узла для выбранного устройства.",
+                        "parameter": "Параметр",
+                        "parameter_is_read_only": "Этот параметр доступен только для чтения.",
+                        "set_param_accepted": "Параметр обновлен",
+                        "set_param_error": "Произошла ошибка",
+                        "set_param_queued": "Изменение параметра поставлено в очередь и будет обновлено, когда устройство выйдет из спящего режима",
+                        "zwave_js_device_database": "базой данных устройств Z-Wave JS"
+                    },
+                    "node_status": {
+                        "alive": "Живой",
+                        "asleep": "Спит",
+                        "awake": "Проснулся",
+                        "dead": "Мертвый",
+                        "unknown": "Неизвестно"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "Перед повторным опросом устройства с батарейным питанием необходимо вывести из спящего режима. О том, как это сделать, Вы можете узнать из инструкций к Вашему устройству.",
+                        "in_progress": "Устройство опрашивается, это может занять некоторое время.",
+                        "interview_complete": "Опрос устройства завершен.",
+                        "interview_failed": "Опрос устройства не удался. Дополнительная информация может быть получена в журналах.",
+                        "introduction": "Повторный опрос устройства в сети Z-Wave. Используйте эту функцию, если это устройство не работает или работает неправильно.",
+                        "run_in_background": "Вы можете закрыть это диалоговое окно, опрос продолжится в фоновом режиме.",
+                        "start_reinterview": "Начать повторный опрос",
+                        "title": "Повторный опрос устройства Z-Wave"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Выполняется удаление устройства.",
+                        "introduction": "Удаление неисправного устройства из сети Z-Wave. Используйте эту функцию, если Вы не можете исключить устройство из сети штатными средствами.",
+                        "removal_failed": "Не удалось удалить устройство из сети Z-Wave.",
+                        "removal_finished": "Узел {id} был удален из сети Z-Wave.",
+                        "remove_device": "Удалить устройство",
+                        "title": "Удаление неисправного устройства Z-Wave"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Отменить отключение",
+                        "controller_in_exclusion_mode": "Ваш контроллер Z-Wave находится в режиме отключения.",
+                        "exclusion_failed": "Не удалось удалить узел. Проверьте журналы для получения дополнительной информации.",
+                        "exclusion_finished": "Узел {id} был удален из сети Z-Wave.",
+                        "follow_device_instructions": "Следуйте инструкциям к подключаемому устройству, чтобы инициировать отключение.",
+                        "introduction": "Удалить узел из сети Z-Wave, а также связанное устройство и объекты из Home Assistant.",
+                        "start_exclusion": "Начать отключение",
+                        "title": "Удалить узел Z-Wave"
+                    }
                 }
             },
             "custom": {
@@ -3236,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Вернуться",
-                "supervisor": {
-                    "ask": "Обратитесь за помощью",
-                    "observer": "Проверить Observer",
-                    "reboot": "Попробуйте перезагрузить хост",
-                    "system_health": "Проверить статус системы",
-                    "title": "Не удалось загрузить панель Supervisor!",
-                    "wait": "Убедитесь, что у Supervisor было достаточно времени для запуска."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Прошедшая неделя",
-                    "this_week": "Эта неделя",
-                    "today": "Сегодня",
-                    "yesterday": "Вчера"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Прошедшая неделя",
-                    "this_week": "Эта неделя",
-                    "today": "Сегодня",
-                    "yesterday": "Вчера"
+            "energy": {
+                "charts": {
+                    "by_device": "Потребление по устройствам",
+                    "solar": "Солнечная",
+                    "stat_house_energy_meter": "Общее потребление электроэнергии"
+                },
+                "setup": {
+                    "back": "Назад",
+                    "done": "Показать панель управления энергопотреблением",
+                    "next": "Далее"
                 }
             },
             "lovelace": {
@@ -3374,7 +3396,6 @@
                         "entities": {
                             "description": "Самая распространённая карточка. Она группирует объекты в виде списка.",
                             "edit_special_row": "Нажмите кнопку редактирования для просмотра свойств этой строки",
-                            "entity_row_editor": "Редактор строки объекта",
                             "entity_row": {
                                 "attribute": "Атрибут",
                                 "button": "Кнопка",
@@ -3386,6 +3407,7 @@
                                 "section": "Раздел",
                                 "weblink": "Ссылка на веб-страницу"
                             },
+                            "entity_row_editor": "Редактор строки объекта",
                             "name": "Объекты",
                             "secondary_info_values": {
                                 "brightness": "Яркость",
@@ -3412,6 +3434,7 @@
                         "gauge": {
                             "description": "Базовая карточка, которая позволяет отобразить данные сенсора в виде шкалы.",
                             "name": "Шкала",
+                            "needle_gauge": "Отображать текущее значение стрелкой",
                             "severity": {
                                 "define": "Задать оттенок для значений",
                                 "green": "Зелёный",
@@ -3424,6 +3447,7 @@
                             "attribute": "Атрибут",
                             "camera_image": "Объект Камеры",
                             "camera_view": "Вид Камеры",
+                            "days_to_show": "Количество дней",
                             "double_tap_action": "При двойном нажатии",
                             "entities": "Объекты",
                             "entity": "Объект",
@@ -3537,6 +3561,10 @@
                             "integration_not_loaded": "Для работы этой карточки необходимо настроить интеграцию `shopping_list`.",
                             "name": "Список покупок"
                         },
+                        "statistics-graph": {
+                            "description": "Позволяет отображать график статистики для каждого из указанных объектов.",
+                            "name": "График статистики"
+                        },
                         "thermostat": {
                             "description": "Позволяет контролировать виртуальный термостат, изменять температуру и режим работы.",
                             "name": "Термостат"
@@ -3606,6 +3634,12 @@
                         "tab_badges": "Значки",
                         "tab_settings": "Настройки",
                         "tab_visibility": "Видимость",
+                        "type": "Тип вкладки",
+                        "types": {
+                            "masonry": "С автоматической раскладкой (по умолчанию)",
+                            "panel": "Панель (одна карточка на весь экран)",
+                            "sidebar": "С боковой панелью"
+                        },
                         "visibility": {
                             "select_users": "Выберите, какие пользователи должны видеть эту вкладку"
                         }
@@ -3643,7 +3677,7 @@
                         "header": "На какую вкладку нужно переместить карточку?"
                     },
                     "raw_editor": {
-                        "confirm_remove_config_text": "Если Вы очистите конфигурацию этой панели Lovelace, карточки с Вашими устройствами и помещениями будут создаваться автоматически.",
+                        "confirm_remove_config_text": "Если Вы очистите конфигурацию этой панели Lovelace, карточки с Вашими устройствами и пространствами будут создаваться автоматически.",
                         "confirm_remove_config_title": "Вы уверены, что хотите очистить конфигурацию пользовательского интерфейса Lovelace?",
                         "confirm_unsaved_changes": "У вас есть несохраненные изменения. Вы уверены, что хотите выйти?",
                         "confirm_unsaved_comments": "Возможно, Ваша конфигурация содержит комментарии. Они не будут сохранены. Вы хотите продолжить?",
@@ -3660,7 +3694,6 @@
                         "unsaved_changes": "Несохраненные изменения"
                     },
                     "save_config": {
-                        "cancel": "Оставить как есть",
                         "close": "Закрыть",
                         "empty_config": "Начать с пустой панели",
                         "header": "Получение контроля над пользовательским интерфейсом",
@@ -3689,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Первая карточка будет растянута на всю ширину. Другие карточки и значки не будут отображаться на этой вкладке",
-                            "title": "Режим панели",
                             "warning_multiple_cards": "На этой вкладке несколько карточек. В режиме панели может отображаться только одна карточка."
                         }
                     }
@@ -3893,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Далее",
-                    "intro": "Поделитесь аналитикой из Вашего Home Assistant. Эти данные будут доступны для всех по адресу {link}."
+                    "finish": "Далее"
                 },
                 "core-config": {
                     "button_detect": "Заполнить",
@@ -3916,12 +3946,10 @@
                 "restore": {
                     "addons": "Дополнения",
                     "confirm_password": "Подтверждение пароля",
-                    "description": "Восстановить предыдущее состояние из снимка файловой системы (snapshot)",
+                    "description": "Восстановить предыдущее состояние из снимка файловой системы (backup)",
                     "folders": "Папки",
-                    "full_snapshot": "Полный снимок",
                     "hide_log": "Скрыть журнал",
                     "in_progress": "Восстановление системы",
-                    "partial_snapshot": "Частичный снимок",
                     "password": "Пароль",
                     "password_protection": "Защита паролем",
                     "select_type": "Выберите что нужно восстановить:",
@@ -4003,6 +4031,12 @@
                     "prompt_copy_token": "Скопируйте Ваш токен доступа. Он больше не будет показан.",
                     "prompt_name": "Название токена"
                 },
+                "mfa": {
+                    "confirm_disable": "Вы уверены, что хотите отключить {name}?",
+                    "disable": "Отключить",
+                    "enable": "Включить",
+                    "header": "Модули многофакторной аутентификации"
+                },
                 "mfa_setup": {
                     "close": "Закрыть",
                     "step_done": "Настройка выполнена для {step}",
@@ -4010,12 +4044,6 @@
                     "title_aborted": "Отменено",
                     "title_success": "Выполнено успешно!"
                 },
-                "mfa": {
-                    "confirm_disable": "Вы уверены, что хотите отключить {name}?",
-                    "disable": "Отключить",
-                    "enable": "Включить",
-                    "header": "Модули многофакторной аутентификации"
-                },
                 "number_format": {
                     "description": "Отображение чисел в пользовательском интерфейсе",
                     "dropdown_label": "Формат чисел",
diff --git a/translations/frontend/sk.json b/translations/frontend/sk.json
index a88705568d..5bee51cbb2 100644
--- a/translations/frontend/sk.json
+++ b/translations/frontend/sk.json
@@ -26,6 +26,14 @@
         "shopping_list": "Nákupný zoznam",
         "states": "Prehľad"
     },
+    "state": {
+        "default": {
+            "off": "Vypnutý",
+            "on": "Zapnutý",
+            "unavailable": "Nedostupný",
+            "unknown": "Neznámy"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -89,14 +97,6 @@
             "not_home": "Preč"
         }
     },
-    "state": {
-        "default": {
-            "off": "Vypnutý",
-            "on": "Zapnutý",
-            "unavailable": "Nedostupný",
-            "unknown": "Neznámy"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -235,6 +235,23 @@
                 "not_installed": "Doplnok nie je nainštalovaný"
             }
         },
+        "backup": {
+            "addons": "Doplnky",
+            "confirm_password": "Potvrdiť heslo zálohy",
+            "could_not_create": "Nepodarilo sa vytvoriť zálohu",
+            "create": "Vytvoriť",
+            "create_blocked_not_running": "Nieje možné vytvoriť zálohu pretože systém je v stave {state}",
+            "created": "Vytvorené",
+            "delete_backup_confirm": "odstrániť",
+            "enter_password": "Prosím napíšte heslo.",
+            "failed_to_delete": "Nepodarilo sa odstrániť",
+            "folders": "Priečinky",
+            "name": "Meno",
+            "password": "Heslo",
+            "password_protection": "Ochrana Heslom",
+            "passwords_not_matching": "Heslá sa nezhodujú",
+            "type": "Typ"
+        },
         "common": {
             "cancel": "Zrušiť",
             "close": "Zavrieť",
@@ -332,9 +349,6 @@
                 "text": "Skutočne chcete reštartovať doplnok so zmenami?"
             },
             "update": {
-                "create_snapshot": "Vytváranie zálohy {name} pred aktualizáciou",
-                "snapshot": "Záloha",
-                "snapshotting": "Vytváranie zálohy {name}",
                 "updating": "Aktualizácia {name} na verziu {version}"
             }
         },
@@ -346,44 +360,9 @@
         },
         "panel": {
             "dashboard": "Dashboard",
-            "snapshots": "Zálohy",
             "store": "Obchod s doplnkami",
             "system": "Systém"
         },
-        "snapshot": {
-            "addons": "Doplnky",
-            "available_snapshots": "Dostupné zálohy",
-            "confirm_password": "Potvrdiť heslo zálohy",
-            "could_not_create": "Nepodarilo sa vytvoriť zálohu",
-            "create": "Vytvoriť",
-            "create_blocked_not_running": "Nieje možné vytvoriť zálohu pretože systém je v stave {state}",
-            "create_snapshot": "Vytvoriť zálohu",
-            "created": "Vytvorené",
-            "delete_snapshot_confirm": "odstrániť",
-            "delete_snapshot_title": "Vymazať zálohu",
-            "description": "Snapshoty ti umožňujú ľahko zálohovať a obnoviť všetky dáta Home Assistant",
-            "enter_password": "Prosím napíšte heslo.",
-            "failed_to_delete": "Nepodarilo sa odstrániť",
-            "folder": {
-                "addons/local": "Lokálne doplnky",
-                "homeassistant": "konfigurácia Home Asistenta",
-                "media": "Médiá",
-                "share": "Zdieľať",
-                "ssl": "SSL"
-            },
-            "folders": "Priečinky",
-            "full_snapshot": "Úplná záloha",
-            "name": "Meno",
-            "no_snapshots": "Nemáte žiadne zálohy",
-            "partial_snapshot": "Čiastočná záloha",
-            "password": "Heslo",
-            "password_protected": "chránené heslo",
-            "password_protection": "Ochrana Heslom",
-            "passwords_not_matching": "Heslá sa nezhodujú",
-            "security": "Zabezpečenie",
-            "type": "Typ",
-            "upload_snapshot": "Nahrať zálohu"
-        },
         "store": {
             "missing_addons": "Chýbajú doplnky? Povoľte rozšírený režim na stránke profilu.",
             "no_results_found": "V {repository} sa nenašli žiadne výsledky.",
@@ -696,6 +675,12 @@
             },
             "date-range-picker": {
                 "end_date": "Dátum konca",
+                "ranges": {
+                    "last_week": "Minulý týždeň",
+                    "this_week": "Tento týždeň",
+                    "today": "Dnes",
+                    "yesterday": "Včera"
+                },
                 "select": "Výber",
                 "start_date": "Dátum začiatku"
             },
@@ -777,10 +762,10 @@
                 "documentation": "dokumentácia",
                 "learn_adding_local_media": "Ďalšie informácie o pridávaní médií nájdete v dokumentácii {documentation}.",
                 "local_media_files": "Umiestnite videosúbory, zvukové a obrazové súbory do mediálneho adresára, aby ste ich mohli prehľadávať a prehrávať v prehliadači alebo v podporovaných prehrávačoch médií.",
+                "media-player-browser": "Prehliadač prehrávača médií",
                 "media_browsing_error": "Chyba prehľadávania médií",
                 "media_not_supported": "Prehrávač médií prehliadača nepodporuje tento typ médií",
                 "media_player": "Prehrávač médií",
-                "media-player-browser": "Prehliadač prehrávača médií",
                 "no_items": "Žiadne položky",
                 "no_local_media_found": "Nenašli sa žiadne lokálne médiá",
                 "no_media_folder": "Zdá sa, že ste ešte nevytvorili adresár médií.",
@@ -835,6 +820,13 @@
             "service-picker": {
                 "service": "Služba"
             },
+            "statistic-picker": {
+                "learn_more": "Získajte viac informácií o štatistikách",
+                "missing_entity": "Prečo nie je môj subjekt uvedený v zozname?",
+                "no_match": "Nenašli sa žiadne zodpovedajúce štatistiky",
+                "no_statistics": "Nemáte žiadne štatistiky",
+                "statistic": "Štatistiky"
+            },
             "target-picker": {
                 "add_area_id": "Vybrať oblasť",
                 "add_device_id": "Vybrať zariadenie",
@@ -1017,7 +1009,6 @@
                         "integrations": "Integrácie",
                         "logs": "Denníky",
                         "lovelace": "Lovelace Prehľady",
-                        "navigate_to": "Prejsť na {panel}",
                         "person": "Ľudia",
                         "scene": "Scény",
                         "script": "Skripty",
@@ -1186,7 +1177,6 @@
                             "introduction": "Akcie predstavujú činnosti, ktoré Home Assistant vykoná po spustení automatizácie.",
                             "learn_more": "Získajte viac informácií o akciách",
                             "name": "Akcia",
-                            "type_select": "Typ akcie",
                             "type": {
                                 "choose": {
                                     "add_option": "Pridať možnosť",
@@ -1241,6 +1231,7 @@
                                     "wait_template": "Šablóna čakania"
                                 }
                             },
+                            "type_select": "Typ akcie",
                             "unsupported_action": "Žiadna podpora používateľského rozhrania pre akciu: {action}"
                         },
                         "alias": "Názov",
@@ -1259,7 +1250,6 @@
                             "introduction": "Podmienky sú voliteľné a zabránia spusteniu automatizácie, pokiaľ nie sú splnené všetky podmienky.",
                             "learn_more": "Získajte viac informácií o podmienkach",
                             "name": "Podmienka",
-                            "type_select": "Typ podmienky",
                             "type": {
                                 "and": {
                                     "label": "a"
@@ -1321,6 +1311,7 @@
                                     "zone": "Zóna"
                                 }
                             },
+                            "type_select": "Typ podmienky",
                             "unsupported_condition": "Žiadna podpora používateľského rozhrania pre podmienku: {condition}"
                         },
                         "default_name": "Nová automatizácia",
@@ -1357,7 +1348,6 @@
                             "introduction": "Spúšťače spúšťajú spracovanie pravidla automatizácie. Pre rovnaké pravidlo je možné určiť viac spúšťačov. Po spustení spúšťača aplikácia Home Assistant overí prípadné podmienky a zavolá akciu. \n\n [Viac informácií o spúšťačov.](https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "Získajte viac informácií o spúšťačoch",
                             "name": "Spúšťač",
-                            "type_select": "Typ spúšťača",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1418,17 +1408,17 @@
                                     "label": "Šablóna",
                                     "value_template": "Šablóna hodnoty"
                                 },
+                                "time": {
+                                    "at": "V čase",
+                                    "label": "Čas",
+                                    "type_value": "Pevný čas"
+                                },
                                 "time_pattern": {
                                     "hours": "Hodín",
                                     "label": "Časový vzor",
                                     "minutes": "Minút",
                                     "seconds": "Sekúnd"
                                 },
-                                "time": {
-                                    "at": "V čase",
-                                    "label": "Čas",
-                                    "type_value": "Pevný čas"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1442,6 +1432,7 @@
                                     "zone": "Zóna"
                                 }
                             },
+                            "type_select": "Typ spúšťača",
                             "unsupported_platform": "Žiadna podpora používateľského rozhrania pre platformu: {platform}"
                         },
                         "unsaved_confirm": "Máte neuložené zmeny. Naozaj chcete odísť?"
@@ -1545,6 +1536,7 @@
                             "instance_will_be_available": "Vaša inštancia bude k dispozícii na adrese",
                             "link_learn_how_it_works": "Zistite, ako to funguje",
                             "not_connected": "Nepripojené",
+                            "reconnecting": "Opätovné pripojenie",
                             "remote_enabled": {
                                 "caption": "Automaticky pripojiť"
                             },
@@ -1574,9 +1566,9 @@
                             "loading": "Načítava sa ...",
                             "manage": "Spravovať",
                             "no_hooks_yet": "Zdá sa, že ešte nemáte žiadne webhooky. Začnite konfiguráciou",
+                            "no_hooks_yet2": "alebo vytvorením ",
                             "no_hooks_yet_link_automation": "automatizácia webhookov",
                             "no_hooks_yet_link_integration": "integrácia založená na webhook",
-                            "no_hooks_yet2": "alebo vytvorením ",
                             "title": "Webhooky"
                         }
                     },
@@ -1684,22 +1676,13 @@
                     "description": "Jednotkový systém, umiestnenie, časové pásmo a ďalšie všeobecné parametre",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "header": "Analízy",
-                                "preference": {
-                                    "base": {
-                                        "title": "Základné analýzy"
-                                    },
-                                    "diagnostics": {
-                                        "title": "Diagnostiky"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "Mena",
                                 "edit_requires_storage": "Editor je zablokovaný, pretože konfigurácia je uložená v configuration.yaml",
                                 "elevation": "Nadmorská výška",
                                 "elevation_meters": "metrov",
                                 "external_url": "Externá adresa URL",
+                                "find_currency_value": "Nájdite svoju hodnotu",
                                 "imperial_example": "Fahrenheita, libry",
                                 "internal_url": "Interná adresa URL",
                                 "latitude": "Zemepisná šírka",
@@ -1807,6 +1790,31 @@
                     "scripts": "Skripty",
                     "update": "Aktualizovať"
                 },
+                "energy": {
+                    "device_consumption": {
+                        "dialog": {
+                            "selected_stat_intro": "Vyberte entitu, ktorá predstavuje spotrebu energie zariadenia."
+                        },
+                        "learn_more": "Viac informácií o tom, ako začať.",
+                        "selected_stat": "Sledovanie energie pre",
+                        "sub": "Sledovanie spotreby energie jednotlivých zariadení umožňuje aplikácii Home Assistant analyzovať vašu spotrebu energie podľa zariadenia.",
+                        "title": "Jednotlivé zariadenia"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_number": "Použite statickú cenu"
+                            }
+                        },
+                        "learn_more": "Viac informácií o tom, ako začať."
+                    },
+                    "solar": {
+                        "learn_more": "Viac informácií o tom, ako začať.",
+                        "stat_production": "Vaša výroba solárnej energie",
+                        "sub": "Nechajte Home Assistant monitorovať vaše solárne panely a poskytne vám prehľad o ich výkone.",
+                        "title": "Solárne panely"
+                    }
+                },
                 "entities": {
                     "caption": "Register entít",
                     "description": "Spravujte všetky známe entity.",
@@ -1853,11 +1861,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Vyčistiť",
-                    "filtering_by": "Filtrovanie podľa",
-                    "show": "Zobraziť"
-                },
                 "header": "Konfigurovať Home Assistant",
                 "helpers": {
                     "caption": "Pomocníci",
@@ -1902,15 +1905,11 @@
                     "server": "server",
                     "setup_time": "Nastaviť čas",
                     "source": "Zdroj:",
-                    "system_health_error": "Súčasť System Health nie je načítaná. Pridajte 'system_health:' do súboru configuration.yaml",
                     "system_health": {
                         "manage": "Spravovať",
                         "more_info": "viac informácií"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "stránka integrácií",
-                    "missing_zha": "Chýba vám konfiguračný panel ZHA? Bol presunutý do položky ZHA na {integrations_page}."
+                    },
+                    "system_health_error": "Súčasť System Health nie je načítaná. Pridajte 'system_health:' do súboru configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Pridať integráciu",
@@ -1921,7 +1920,6 @@
                         "delete": "Odstrániť",
                         "delete_confirm": "Naozaj chcete odstrániť túto integráciu?",
                         "device_unavailable": "Zariadenie nie je k dispozícii",
-                        "disable_restart_confirm": "Reštartujte asistenta domácnosti a dokončite deaktiváciu tejto integrácie",
                         "disable": {
                             "disable_confirm": "Naozaj chcete vypnúť túto položku konfigurácie? Jeho zariadenia a entity budú vypnuté.",
                             "disabled": "Vypnuté",
@@ -1932,6 +1930,7 @@
                             },
                             "disabled_cause": "Vypnuté {cause}"
                         },
+                        "disable_restart_confirm": "Reštartujte asistenta domácnosti a dokončite deaktiváciu tejto integrácie",
                         "documentation": "Dokumentácia",
                         "enable_restart_confirm": "Reštartujte Home Assistant a dokončite povolenie tejto integrácie",
                         "entity_unavailable": "Entita nie je k dispozícii",
@@ -1939,7 +1938,6 @@
                         "hub": "Pripojené cez",
                         "manuf": "od {manufacturer}",
                         "no_area": "Žiadna oblasť",
-                        "options": "Možnosti",
                         "reload": "Znova načítať",
                         "reload_confirm": "Integrácia bola opätovne načítaná",
                         "rename": "Premenovať",
@@ -1959,7 +1957,6 @@
                             "open_site": "Otvoriť webovú stránku"
                         },
                         "finish": "Dokončiť",
-                        "loading_first_time": "Počkajte, kým sa nainštaluje integrácia",
                         "next": "Ďalej",
                         "not_all_required_fields": "Nie sú vyplnené všetky povinné polia.",
                         "pick_flow_step": {
@@ -1975,7 +1972,6 @@
                     "details": "Podrobnosti o integrácii",
                     "disable": {
                         "disabled_integrations": "{number} deaktivované",
-                        "hide_disabled": "Skryť vypnuté integrácie",
                         "show": "Ukázať",
                         "show_disabled": "Zobraziť vypnuté integrácie"
                     },
@@ -1986,7 +1982,6 @@
                         "confirm_delete_ignore_title": "Prestať ignorovať {name} ?",
                         "confirm_ignore": "Naozaj nechcete nastaviť túto integráciu? Túto akciu môžete vrátiť späť kliknutím na položku 'Zobraziť ignorované integrácie' v ponuke v pravom hornom rohu.",
                         "confirm_ignore_title": "Ignorovať objavenie (discovery) {name}?",
-                        "hide_ignored": "Skryť ignorované integrácie",
                         "ignore": "Ignorovať",
                         "ignored": "Ignorované",
                         "show_ignored": "Zobraziť ignorované integrácie",
@@ -2093,7 +2088,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfigurovať",
                     "description_listen": "Počúvať tému",
                     "description_publish": "Publikovať paket",
                     "listening_to": "Počúvam",
@@ -2107,12 +2101,16 @@
                     "topic": "téma"
                 },
                 "ozw": {
-                    "button": "Konfigurovať",
                     "common": {
                         "controller": "Radič",
                         "instance": "Inštancia",
                         "network": "Sieť"
                     },
+                    "network": {
+                        "header": "Správa siete",
+                        "introduction": "Spravovať funkcie v celej sieti.",
+                        "node_count": "{count} uzlov"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Všetky uzly boli dotazované",
@@ -2130,11 +2128,6 @@
                         "starting": "Štartuje",
                         "unknown": "Neznámy"
                     },
-                    "network": {
-                        "header": "Správa siete",
-                        "introduction": "Spravovať funkcie v celej sieti.",
-                        "node_count": "{count} uzlov"
-                    },
                     "node": {
                         "button": "Podrobnosti uzla",
                         "not_found": "Uzol sa nenašiel"
@@ -2415,7 +2408,6 @@
                         "search_again": "Hľadať znova",
                         "spinner": "Vyhľadávanie ZHA Zigbee zariadení ..."
                     },
-                    "button": "Konfigurovať",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atribúty vybraného klastra",
                         "get_zigbee_attribute": "Získať atribút Zigbee",
@@ -2516,76 +2508,7 @@
                     "introduction": "Zóny vám umožňujú vybrať špecifické oblasti na mape. Ak sa osoba nachádza v nejakej zóne, v stavoch sa zobrazí názov konkrétnej zóny. Zóny môžu byť tiež použité ako spúšťač alebo podmienka v rámci automatizácií.",
                     "no_zones_created_yet": "Zdá sa, že ste ešte nevytvorili žiadne zóny."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Zrušiť zahrnutie",
-                        "controller_in_inclusion_mode": "Váš ovládač Z-Wave je teraz v režime zaradenia.",
-                        "follow_device_instructions": "Podľa pokynov dodaných so zariadením spustíte párovanie v zariadení.",
-                        "inclusion_failed": "Uzol sa nepodarilo pridať. Ďalšie informácie nájdete v denníkoch.",
-                        "inclusion_finished": "Uzol bol pridaný. Môže trvať niekoľko minút, kým sa všetky entity zobrazia, keď dokončíme nastavenie uzla na pozadí.",
-                        "introduction": "Tento sprievodca vás prevedie pridaním uzla do vašej siete Z-Wave.",
-                        "secure_inclusion_warning": "Zabezpečené zariadenia vyžadujú ďalšiu šírku pásma; príliš veľa zabezpečených zariadení môže spomaliť vašu sieť Z-Wave. Bezpečné začlenenie odporúčame použiť iba pre zariadenia, ktoré to vyžadujú, ako sú zámky alebo otvárače garážových brán.",
-                        "start_inclusion": "Spustiť začleňovanie",
-                        "start_secure_inclusion": "Spustiť bezpečné začlenenie",
-                        "title": "Pridajte uzol Z-Wave",
-                        "use_secure_inclusion": "Použite bezpečné zahrnutie",
-                        "view_device": "Zobraziť zariadenie"
-                    },
-                    "button": "Konfigurovať",
-                    "common": {
-                        "add_node": "Pridať uzol",
-                        "close": "Zavrieť",
-                        "home_id": "ID domu",
-                        "network": "Sieť",
-                        "node_id": "ID uzla",
-                        "remove_node": "Odstrániť uzol"
-                    },
-                    "dashboard": {
-                        "driver_version": "Verzia ovládača",
-                        "dump_dead_nodes_text": "Niektoré z vašich uzlov neodpovedali a predpokladá sa, že sú mŕtve. Tieto sa nebudú úplne exportovať.",
-                        "dump_dead_nodes_title": "Niektoré z vašich uzlov sú mŕtve",
-                        "dump_debug": "Stiahnutie výpisu siete na diagnostiku problémov",
-                        "dump_not_ready_confirm": "Stiahnuť",
-                        "dump_not_ready_text": "Ak vytvoríte export, hoci nie všetky uzly sú pripravené, mohli by ste prísť o potrebné údaje. Poskytnite svojej sieti čas na dopytovanie všetkých uzlov. Chcete pokračovať s výpisom?",
-                        "dump_not_ready_title": "Nie všetky uzly sú pripravené",
-                        "header": "Spravujte svoju sieť Z-Wave",
-                        "home_id": "ID domu",
-                        "introduction": "Spravujte svoju sieť Z-Wave a uzly Z-Wave",
-                        "nodes_ready": "Uzly pripravené",
-                        "server_version": "Verzia servera"
-                    },
-                    "device_info": {
-                        "node_ready": "Uzol pripravený",
-                        "node_status": "Stav uzla",
-                        "zwave_info": "Z-Wave Info"
-                    },
-                    "navigation": {
-                        "network": "Sieť"
-                    },
-                    "network_status": {
-                        "connected": "Pripojené",
-                        "connecting": "Pripája sa",
-                        "unknown": "Neznámy"
-                    },
-                    "node_status": {
-                        "alive": "Nažive",
-                        "asleep": "Spánok",
-                        "awake": "Prebudiť",
-                        "dead": "Nereaguje",
-                        "unknown": "Neznámy"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Zrušiť vylúčenie",
-                        "controller_in_exclusion_mode": "Váš Z-Wave kontrolér je teraz v režime vylúčenia.",
-                        "exclusion_failed": "Uzol sa nepodarilo odstrániť. Ďalšie informácie nájdete v denníkoch.",
-                        "exclusion_finished": "Uzol {id} bol odstránený z vašej siete Z-Wave.",
-                        "introduction": "Odstráňte uzol zo Z-Wave siete, priradené zariadenie a entity z Home Assistanta.",
-                        "start_exclusion": "Spustiť vylúčenie",
-                        "title": "Odstráňte uzol Z-Wave"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfigurovať",
                     "common": {
                         "index": "Index",
                         "instance": "Inštancie",
@@ -2647,6 +2570,79 @@
                     "values": {
                         "header": "Hodnoty zariadenia"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Zrušiť zahrnutie",
+                        "controller_in_inclusion_mode": "Váš ovládač Z-Wave je teraz v režime zaradenia.",
+                        "follow_device_instructions": "Podľa pokynov dodaných so zariadením spustíte párovanie v zariadení.",
+                        "inclusion_failed": "Uzol sa nepodarilo pridať. Ďalšie informácie nájdete v denníkoch.",
+                        "inclusion_finished": "Uzol bol pridaný. Môže trvať niekoľko minút, kým sa všetky entity zobrazia, keď dokončíme nastavenie uzla na pozadí.",
+                        "introduction": "Tento sprievodca vás prevedie pridaním uzla do vašej siete Z-Wave.",
+                        "secure_inclusion_warning": "Zabezpečené zariadenia vyžadujú ďalšiu šírku pásma; príliš veľa zabezpečených zariadení môže spomaliť vašu sieť Z-Wave. Bezpečné začlenenie odporúčame použiť iba pre zariadenia, ktoré to vyžadujú, ako sú zámky alebo otvárače garážových brán.",
+                        "start_inclusion": "Spustiť začleňovanie",
+                        "start_secure_inclusion": "Spustiť bezpečné začlenenie",
+                        "title": "Pridajte uzol Z-Wave",
+                        "use_secure_inclusion": "Použite bezpečné zahrnutie",
+                        "view_device": "Zobraziť zariadenie"
+                    },
+                    "common": {
+                        "add_node": "Pridať uzol",
+                        "close": "Zavrieť",
+                        "home_id": "ID domu",
+                        "network": "Sieť",
+                        "node_id": "ID uzla",
+                        "remove_node": "Odstrániť uzol"
+                    },
+                    "dashboard": {
+                        "driver_version": "Verzia ovládača",
+                        "dump_dead_nodes_text": "Niektoré z vašich uzlov neodpovedali a predpokladá sa, že sú mŕtve. Tieto sa nebudú úplne exportovať.",
+                        "dump_dead_nodes_title": "Niektoré z vašich uzlov sú mŕtve",
+                        "dump_debug": "Stiahnutie výpisu siete na diagnostiku problémov",
+                        "dump_not_ready_confirm": "Stiahnuť",
+                        "dump_not_ready_text": "Ak vytvoríte export, hoci nie všetky uzly sú pripravené, mohli by ste prísť o potrebné údaje. Poskytnite svojej sieti čas na dopytovanie všetkých uzlov. Chcete pokračovať s výpisom?",
+                        "dump_not_ready_title": "Nie všetky uzly sú pripravené",
+                        "header": "Spravujte svoju sieť Z-Wave",
+                        "home_id": "ID domu",
+                        "introduction": "Spravujte svoju sieť Z-Wave a uzly Z-Wave",
+                        "nodes_ready": "Uzly pripravené",
+                        "server_version": "Verzia servera"
+                    },
+                    "device_info": {
+                        "node_ready": "Uzol pripravený",
+                        "node_status": "Stav uzla",
+                        "remove_failed": "Odstrániť nefunkčné zariadenie",
+                        "zwave_info": "Z-Wave Info"
+                    },
+                    "navigation": {
+                        "network": "Sieť"
+                    },
+                    "network_status": {
+                        "connected": "Pripojené",
+                        "connecting": "Pripája sa",
+                        "unknown": "Neznámy"
+                    },
+                    "node_status": {
+                        "alive": "Nažive",
+                        "asleep": "Spánok",
+                        "awake": "Prebudiť",
+                        "dead": "Nereaguje",
+                        "unknown": "Neznámy"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Prebieha odstraňovanie zariadenia.",
+                        "remove_device": "Odstrániť zariadenie",
+                        "title": "Odstrániť nefunkčné zariadenie Z-Wave"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Zrušiť vylúčenie",
+                        "controller_in_exclusion_mode": "Váš Z-Wave kontrolér je teraz v režime vylúčenia.",
+                        "exclusion_failed": "Uzol sa nepodarilo odstrániť. Ďalšie informácie nájdete v denníkoch.",
+                        "exclusion_finished": "Uzol {id} bol odstránený z vašej siete Z-Wave.",
+                        "introduction": "Odstráňte uzol zo Z-Wave siete, priradené zariadenie a entity z Home Assistanta.",
+                        "start_exclusion": "Spustiť vylúčenie",
+                        "title": "Odstráňte uzol Z-Wave"
+                    }
                 }
             },
             "developer-tools": {
@@ -2716,31 +2712,14 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Vrátiť sa späť",
-                "supervisor": {
-                    "ask": "Požiadať o pomoc",
-                    "observer": "Skontrolujte pozorovateľa",
-                    "reboot": "Skúsiť reštartovať hostiteľa",
-                    "system_health": "Overiť stav systému",
-                    "title": "Nepodarilo sa načítať panel supervízora!",
-                    "wait": "Ak ste práve začali, uistite sa, že ste dali supervizorovi dostatok času na spustenie."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Minulý týždeň",
-                    "this_week": "Tento týždeň",
-                    "today": "Dnes",
-                    "yesterday": "Včera"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Minulý týždeň",
-                    "this_week": "Tento týždeň",
-                    "today": "Dnes",
-                    "yesterday": "Včera"
+            "energy": {
+                "charts": {
+                    "solar": "Solárne",
+                    "stat_house_energy_meter": "Celková spotreba energie"
+                },
+                "setup": {
+                    "back": "Späť",
+                    "next": "Ďalej"
                 }
             },
             "lovelace": {
@@ -2847,7 +2826,6 @@
                         "entities": {
                             "description": "Karta Entity je najbežnejším typom karty. Zoskupuje položky do zoznamov.",
                             "edit_special_row": "Kliknutím na tlačidlo upraviť zobrazíte podrobnosti tohto riadku",
-                            "entity_row_editor": "Editor riadkov entít",
                             "entity_row": {
                                 "attribute": "Atribút",
                                 "button": "Tlačidlo",
@@ -2858,6 +2836,7 @@
                                 "section": "Sekcia",
                                 "weblink": "Internetový odkaz"
                             },
+                            "entity_row_editor": "Editor riadkov entít",
                             "name": "Entity",
                             "secondary_info_values": {
                                 "brightness": "Jas",
@@ -2882,6 +2861,7 @@
                         },
                         "gauge": {
                             "description": "Karta Gauge je základná karta, ktorá umožňuje vizuálne vidieť údaje senzora.",
+                            "needle_gauge": "Zobraziť ako ručičkový ukazovateľ?",
                             "severity": {
                                 "green": "zelená",
                                 "red": "červená",
@@ -2998,6 +2978,9 @@
                             "integration_not_loaded": "Táto karta vyžaduje nastavenie integrácie \"shopping_list\".",
                             "name": "Zoznam nákupov"
                         },
+                        "statistics-graph": {
+                            "name": "Štatistický graf"
+                        },
                         "thermostat": {
                             "description": "Karta Termostat poskytuje kontrolu nad vašou klimatizačnou jednotkou. Umožní vám zmeniť teplotu a režim entity.",
                             "name": "Termostat"
@@ -3061,6 +3044,11 @@
                         "tab_badges": "Odznaky",
                         "tab_settings": "Nastavenia",
                         "tab_visibility": "Viditeľnosť",
+                        "type": "Typ zobrazenia",
+                        "types": {
+                            "panel": "Panel (1 karta)",
+                            "sidebar": "Bočný panel"
+                        },
                         "visibility": {
                             "select_users": "Vyberte, ktorí používatelia môžu vidieť toto zobrazenie v navigácii"
                         }
@@ -3114,7 +3102,6 @@
                         "unsaved_changes": "Neuložené zmeny"
                     },
                     "save_config": {
-                        "cancel": "Zrušiť",
                         "close": "Zavrieť",
                         "empty_config": "Začnite s prázdnou tabuľou",
                         "header": "Prevziať kontrolu rozhrania Lovelace",
@@ -3143,8 +3130,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Týmto sa prvá karta vykreslí v plnej šírke. Ostatné karty v tomto zobrazení, ako aj odznaky sa nebudú zobrazovať.",
-                            "title": "Režim panelu?",
                             "warning_multiple_cards": "Toto zobrazenie obsahuje viac ako jednu kartu, ale na panelovom zobrazení môže byť iba jedna karta."
                         }
                     }
@@ -3357,18 +3342,15 @@
                 "intro": "Ste pripravení prebudiť váš domov, získať vaše súkromie  a pripojiť sa k celosvetovej komunite bastličov?",
                 "restore": {
                     "addons": "Doplnky",
-                    "confirm_password": "Potvrďte heslo zálohy",
+                    "confirm_password": "Potvrdiť heslo zálohy",
                     "description": "Prípadne môžete obnoviť z predchádzajúcej snímky.",
-                    "folders": "Adresáre",
-                    "full_snapshot": "Úplná záloha",
+                    "folders": "Priečinky",
                     "hide_log": "Skryť celý denník",
                     "in_progress": "Prebieha obnovenie",
-                    "partial_snapshot": "Čiastočná záloha",
-                    "password": "Heslo zálohy",
-                    "password_protection": "Ochrana heslom",
-                    "select_type": "Vyberte, čo chcete obnoviť",
+                    "password": "Heslo",
+                    "password_protection": "Ochrana Heslom",
                     "show_log": "Zobraziť celý denník",
-                    "type": "Typ zálohy"
+                    "type": "Typ"
                 },
                 "user": {
                     "create_account": "Vytvoriť účet",
@@ -3441,6 +3423,12 @@
                     "prompt_copy_token": "Skopírujte svoj nový prístupový token. Znova sa nezobrazí.",
                     "prompt_name": "Pomenujte token"
                 },
+                "mfa": {
+                    "confirm_disable": "Naozaj chcete zakázať {name}?",
+                    "disable": "Zakázať",
+                    "enable": "Povoliť",
+                    "header": "Multifaktorové autentifikačné moduly"
+                },
                 "mfa_setup": {
                     "close": "Zavrieť",
                     "step_done": "Nastavenie dokončené krok {step}",
@@ -3448,12 +3436,6 @@
                     "title_aborted": "Prerušené",
                     "title_success": "Úspech!"
                 },
-                "mfa": {
-                    "confirm_disable": "Naozaj chcete zakázať {name}?",
-                    "disable": "Zakázať",
-                    "enable": "Povoliť",
-                    "header": "Multifaktorové autentifikačné moduly"
-                },
                 "number_format": {
                     "description": "Vyberte spôsob formátovania čísiel.",
                     "dropdown_label": "Formát čísla",
diff --git a/translations/frontend/sl.json b/translations/frontend/sl.json
index b78bcbcbb5..b97fed322f 100644
--- a/translations/frontend/sl.json
+++ b/translations/frontend/sl.json
@@ -26,6 +26,14 @@
         "shopping_list": "Nakupovalni seznam",
         "states": "Pregled"
     },
+    "state": {
+        "default": {
+            "off": "Izključen",
+            "on": "Vključen",
+            "unavailable": "Ni na voljo",
+            "unknown": "Neznano"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,15 +102,51 @@
             "not_home": "Odsoten"
         }
     },
-    "state": {
-        "default": {
-            "off": "Izključen",
-            "on": "Vključen",
-            "unavailable": "Ni na voljo",
-            "unknown": "Neznano"
-        }
-    },
     "supervisor": {
+        "addon": {
+            "configuration": {
+                "audio": {
+                    "default": "Privzeto",
+                    "header": "Zvok",
+                    "input": "Vhod",
+                    "output": "Izhod"
+                },
+                "network": {
+                    "container": "vsebnik",
+                    "disabled": "Onemogočeno",
+                    "header": "Omrežje",
+                    "host": "Gostitelj"
+                },
+                "no_configuration": "Ta dodatek ne izpostavlja konfiguracije, s katero bi se lahko ukvarjali...",
+                "options": {
+                    "edit_in_ui": "Urejanje v uporabniškem vmesniku",
+                    "edit_in_yaml": "Urejanje v storitvi YAML",
+                    "header": "Možnosti",
+                    "invalid_yaml": "Neveljaven YAML",
+                    "show_unused_optional": "Prikaži neuporabljene izbirne možnosti konfiguracije"
+                }
+            },
+            "dashboard": {
+                "changelog": "Dnevnik sprememb",
+                "cpu_usage": "poraba procesorja za delovanje dodatkov",
+                "ram_usage": "porabljen  RAM  za delovanje dodatkov"
+            },
+            "failed_to_reset": "Ni uspelo ponastaviti konfiguracije dodatka, {error}",
+            "failed_to_save": "Ni uspelo shraniti konfiguracije dodatka, {error}",
+            "state": {
+                "installed": "Dodatek je nameščen",
+                "not_available": "Dodatek ni na voljo v vašem sistemu",
+                "not_installed": "Dodatek ni nameščen"
+            }
+        },
+        "backup": {
+            "created": "Ustvarjeno"
+        },
+        "dashboard": {
+            "addon_stopped": "Dodatek je ustavljen",
+            "addons": "Nameščeni dodatki",
+            "no_addons": "Nimate nameščenih še nobenih dodatkov. Pojdite v trgovino z dodatki in začnite!"
+        },
         "dialog": {
             "hardware": {
                 "attributes": "Lastnosti",
@@ -112,8 +156,10 @@
                 "title": "Strojna oprema"
             }
         },
-        "snapshot": {
-            "created": "Ustvarjeno"
+        "panel": {
+            "dashboard": "Nadzorna plošča",
+            "store": "Trgovina z dodatki",
+            "system": "Sistem"
         },
         "system": {
             "supervisor": {
@@ -345,6 +391,12 @@
             },
             "date-range-picker": {
                 "end_date": "Končni datum",
+                "ranges": {
+                    "last_week": "Prejšnji teden",
+                    "this_week": "Ta teden",
+                    "today": "Danes",
+                    "yesterday": "Včeraj"
+                },
                 "select": "Izberite",
                 "start_date": "Začetni datum"
             },
@@ -431,10 +483,10 @@
                 "documentation": "dokumentacija",
                 "learn_adding_local_media": "Več o dodajanju medijskih vsebin  preberite v {documentation}.",
                 "local_media_files": "V mapo medijskih vsebin dodajte video, zvočne in slikovne datoteke, ki jih lahko pregledujete ali predvajate v brskalniku oz podprtih predvajalnikih.",
+                "media-player-browser": "Brskalnik za medijski predvajalnik",
                 "media_browsing_error": "Napaka pri brskanju po vsebinah",
                 "media_not_supported": "Predvajalnik ne podpira te vrste vsebin",
                 "media_player": "Medijski predvajalnik",
-                "media-player-browser": "Brskalnik za medijski predvajalnik",
                 "no_items": "Ni predmetov",
                 "no_local_media_found": "Ni bilo najdenega lokalnih medijskih vsebin",
                 "no_media_folder": "Videti je, da še niste ustvarili mape medijskih vsebin",
@@ -489,6 +541,13 @@
             "service-picker": {
                 "service": "Storitev"
             },
+            "statistic-picker": {
+                "learn_more": "Preberite več o statistiki",
+                "missing_entity": "Zakaj moja entiteta ni navedena?",
+                "no_match": "Ni bilo najdenih ujemajočih se statističnih podatkov",
+                "no_statistics": "Nimaš statistike.",
+                "statistic": "Statistika"
+            },
             "target-picker": {
                 "add_area_id": "Izberite območje",
                 "add_device_id": "Izberite napravo",
@@ -684,7 +743,6 @@
                         "integrations": "Integracije",
                         "logs": "Dnevniki",
                         "lovelace": "Nadzorne plošče Lovelace",
-                        "navigate_to": "Pojdi na {panel}",
                         "person": "Osebe",
                         "scene": "Scene",
                         "script": "Skripti",
@@ -872,7 +930,6 @@
                             "introduction": "Dejanja so tisto, kar bo Home Assistant izvedel, ko se sproži avtomatizacija.",
                             "learn_more": "Preberite več o dejanjih",
                             "name": "Akcija",
-                            "type_select": "Vrsta ukrepa",
                             "type": {
                                 "choose": {
                                     "add_option": "Dodaj možnost",
@@ -906,7 +963,6 @@
                                 "repeat": {
                                     "label": "Ponovite",
                                     "sequence": "Akcije",
-                                    "type_select": "Vrsta ponovite",
                                     "type": {
                                         "count": {
                                             "label": "Števec"
@@ -919,7 +975,8 @@
                                             "conditions": "Medtem pogoji",
                                             "label": "Medtem"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Vrsta ponovite"
                                 },
                                 "scene": {
                                     "label": "Aktivirajte sceno"
@@ -939,6 +996,7 @@
                                     "wait_template": "Čakalna predloga"
                                 }
                             },
+                            "type_select": "Vrsta ukrepa",
                             "unsupported_action": "Ni podpore za UI za dejanje: {action}"
                         },
                         "alias": "Ime",
@@ -957,7 +1015,6 @@
                             "introduction": "Pogoji so izbirni in bodo preprečili nadaljnjo izvedbo, razen če so izpolnjeni vsi pogoji.",
                             "learn_more": "Preberite več o pogojih",
                             "name": "Stanje",
-                            "type_select": "Vrsta pogoja",
                             "type": {
                                 "and": {
                                     "label": "In"
@@ -1022,6 +1079,7 @@
                                     "zone": "Območje"
                                 }
                             },
+                            "type_select": "Vrsta pogoja",
                             "unsupported_condition": "Brez podpore za UI za pogoj: {condition}"
                         },
                         "copy_to_clipboard": "Kopiraj v odložišče",
@@ -1061,7 +1119,6 @@
                             "introduction": "Sprožilci so tisto, kar začne obdelavo pravila avtomatizacije. Za isto pravilo je mogoče določiti več sprožilcev. Ko se sprožilec sproži, bo Home Assistant preveril morebitne pogoje in izvedel dejanje.",
                             "learn_more": "Preberite več o sprožilcih",
                             "name": "Sprožilec",
-                            "type_select": "Tip sprožilca",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1126,18 +1183,18 @@
                                     "label": "Predloga",
                                     "value_template": "Vrednostna predloga"
                                 },
-                                "time_pattern": {
-                                    "hours": "Ur",
-                                    "label": "Časovni vzorec",
-                                    "minutes": "Minut",
-                                    "seconds": "Sekund"
-                                },
                                 "time": {
                                     "at": "Ob",
                                     "label": "Čas",
                                     "type_input": "Vrednost pomočnika za datum/čas",
                                     "type_value": "Fiksni čas"
                                 },
+                                "time_pattern": {
+                                    "hours": "Ur",
+                                    "label": "Časovni vzorec",
+                                    "minutes": "Minut",
+                                    "seconds": "Sekund"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1151,6 +1208,7 @@
                                     "zone": "Območje"
                                 }
                             },
+                            "type_select": "Tip sprožilca",
                             "unsupported_platform": "Brez podpore za UI za platformo: {platform}"
                         },
                         "unsaved_confirm": "Imate neshranjene spremembe. Ste prepričani, da želite zapustiti stran?"
@@ -1296,9 +1354,9 @@
                             "loading": "Nalaganje",
                             "manage": "Upravljanje",
                             "no_hooks_yet": "Izgleda, da še nimate webhooks-ov. Začnite s konfiguracijo ",
+                            "no_hooks_yet2": " ali z ustvarjanjem ",
                             "no_hooks_yet_link_automation": "webhook avtomatizacije",
                             "no_hooks_yet_link_integration": "integracijo, ki temelji na Webhook-u",
-                            "no_hooks_yet2": " ali z ustvarjanjem ",
                             "title": "Webhooks"
                         }
                     },
@@ -1414,10 +1472,12 @@
                     "section": {
                         "core": {
                             "core_config": {
+                                "currency": "valuta",
                                 "edit_requires_storage": "Urejevalnik je onemogočen, ker so nastavitve shranjene v configuration.yaml.",
                                 "elevation": "Nadmorska višina",
                                 "elevation_meters": "metrov",
                                 "external_url": "Zunanji URL",
+                                "find_currency_value": "Poiščite svojo vrednost",
                                 "imperial_example": "Fahrenheit, funtov",
                                 "internal_url": "Notranji URL",
                                 "latitude": "Zemljepisna širina",
@@ -1545,6 +1605,46 @@
                     "update": "Posodobite",
                     "update_device_error": "Posodabljanje naprave ni uspelo"
                 },
+                "energy": {
+                    "device_consumption": {
+                        "dialog": {
+                            "selected_stat_intro": "Izberite entiteto, ki predstavlja porabo energije naprave."
+                        },
+                        "learn_more": "Več informacij o tem, kako začeti.",
+                        "sub": "Sledenje porabi energije posameznih naprav omogoča Home Assistantu, da razčleni vašo porabo energije glede na napravo.",
+                        "title": "Posamezne naprave"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_number": "Uporaba statične cene",
+                                "cost_number_input": "Cena na kWh",
+                                "cost_number_suffix": "{valuta}/kWh"
+                            },
+                            "to": {
+                                "cost_entity": "Uporabite entiteto s trenutno stopnjo",
+                                "cost_entity_input": "Entiteta s trenutno stopnjo",
+                                "cost_number": "uporabi statično vrednost",
+                                "cost_number_input": "Cena na kWh",
+                                "cost_number_suffix": "{valuta}/kWh",
+                                "cost_para": "Ali dobite denar nazaj, ko vrnete energijo v omrežje?",
+                                "cost_stat": "Uporabite entiteto, ki sledi skupnemu znesku prejetega denarja.",
+                                "cost_stat_input": "Entiteta skupnega nadomestila",
+                                "energy_stat": "Energija, vrnjena v omrežje (kWh)",
+                                "header": "Konfiguracija proizvodnje energije v omrežje",
+                                "no_cost": "Ne dobim nazaj denarja",
+                                "paragraph": "Proizvodnja v omrežje je energija, ki se izvaših  sončnih kolektorjev pretaka v električno omrežje."
+                            }
+                        },
+                        "learn_more": "Več informacij o tem, kako začeti."
+                    },
+                    "solar": {
+                        "learn_more": "Več informacij o tem, kako začeti.",
+                        "stat_production": "Vaša proizvodnja sončne energije",
+                        "sub": "Dovolite da Home Assistant spremlja vaše sončne kolektorje in vam omogoči vpogled v njihovo delovanje.",
+                        "title": "Sončni kolektorji"
+                    }
+                },
                 "entities": {
                     "caption": "Entitete",
                     "description": "Upravljanje znanih entitet",
@@ -1595,10 +1695,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Počisti",
-                    "filtering_by": "Filtriranje po"
-                },
                 "header": "Konfiguriraj Home Assistant",
                 "helpers": {
                     "caption": "Pomočniki",
@@ -1647,16 +1743,11 @@
                     "path_configuration": "Pot do configuration.yaml: {path}",
                     "server": "strežnik",
                     "source": "Vir:",
-                    "system_health_error": "Komponenta \"system health\" ni naložena. Dodajte \"system_health:\" v svoj configuration.yaml",
                     "system_health": {
                         "manage": "Upravljaj",
                         "more_info": "več informacij"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "Stran za integracije",
-                    "missing_zha": "Ali manjka konfiguracijska plošča ZHA? Premaknjen je bil v vnos ZHA na {integrations_page} .",
-                    "missing_zwave": "Ali manjka konfiguracijska plošča Z-Wave? Premaknili so ga v vnos Z-Wave na {integrations_page} ."
+                    },
+                    "system_health_error": "Komponenta \"system health\" ni naložena. Dodajte \"system_health:\" v svoj configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Dodaj integracijo",
@@ -1675,7 +1766,6 @@
                         "hub": "Povezan prek",
                         "manuf": "naredil: {manufacturer}",
                         "no_area": "Brez območja",
-                        "options": "Možnosti",
                         "reload": "Znova naloži",
                         "reload_confirm": "Integracija je bila znova naložena",
                         "reload_restart_confirm": "Znova zaženi Home Assistant, da dokončate ponovno nalaganje te integracije",
@@ -1696,7 +1786,6 @@
                             "open_site": "Odprite spletno stran"
                         },
                         "finish": "Dokončaj",
-                        "loading_first_time": "Prosimo, počakajte, da se integracija namesti",
                         "not_all_required_fields": "Vsa zahtevana polja niso izpolnjena.",
                         "submit": "Pošlji"
                     },
@@ -1711,7 +1800,6 @@
                         "confirm_delete_ignore_title": "Ali želite prenehati ignorirati {name}?",
                         "confirm_ignore": "Ali ste prepričani, da ne želite nastaviti te integracije? To lahko razveljavite s klikom na 'Prikaži prezrte integracije' v prelivnem meniju v zgornjem desnem kotu.",
                         "confirm_ignore_title": "Prezri odkritje {name}?",
-                        "hide_ignored": "Skrij prezrte integracije",
                         "ignore": "Ignoriraj",
                         "ignored": "Ignorirano",
                         "show_ignored": "Pokaži prezrte integracije",
@@ -1822,7 +1910,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfiguriraj",
                     "description_listen": "Poslušajte temi",
                     "description_publish": "Objavi paket",
                     "listening_to": "Poslušanje",
@@ -1836,7 +1923,6 @@
                     "topic": "tema"
                 },
                 "ozw": {
-                    "button": "Nastavi",
                     "common": {
                         "controller": "Krmilnik",
                         "instance": "Instanca",
@@ -1861,6 +1947,11 @@
                         "nodes": "Vozlišča",
                         "select_instance": "Izberi instanco"
                     },
+                    "network": {
+                        "header": "Upravljanje omrežja",
+                        "introduction": "Upravljajte omrežne funkcije.",
+                        "node_count": "{count} vozlišč"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Poizvedena so bila vsa vozlišča",
@@ -1881,10 +1972,9 @@
                         "starting": "Zaganja se",
                         "unknown": "Neznano"
                     },
-                    "network": {
-                        "header": "Upravljanje omrežja",
-                        "introduction": "Upravljajte omrežne funkcije.",
-                        "node_count": "{count} vozlišč"
+                    "node": {
+                        "button": "Podrobnosti o vozlišču",
+                        "not_found": "Vozlišča ni mogoče najti"
                     },
                     "node_config": {
                         "header": "Konfiguracija vozlišča",
@@ -1914,10 +2004,6 @@
                         "versions": "Pridobivanje informacij o različicah vdelane programske opreme in o ukaznih razredov",
                         "wakeup": "Nastavljanje podpore za vrste in sporočila za prebujanje"
                     },
-                    "node": {
-                        "button": "Podrobnosti o vozlišču",
-                        "not_found": "Vozlišča ni mogoče najti"
-                    },
                     "nodes_table": {
                         "failed": "Neuspešno",
                         "id": "ID",
@@ -2219,7 +2305,6 @@
                         "search_again": "Ponovno iskanje",
                         "spinner": "Iskanje ZHA Zigbee naprav..."
                     },
-                    "button": "Konfiguriraj",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Atributi izbrane gruče",
                         "get_zigbee_attribute": "Pridobite Zigbee Atribute",
@@ -2324,53 +2409,7 @@
                     "introduction": "Območja omogočajo določitev določenih regij. Ko je oseba znotraj tega območja, bo stanje prevzelo njegovo ime. Območja se lahko uporabljajo tudi kot sprožilec ali pogoj v avtomatizacijah.",
                     "no_zones_created_yet": "Izgleda, da še niste ustvarili nobenih con."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "view_device": "Ogled naprave"
-                    },
-                    "button": "Nastavi",
-                    "common": {
-                        "add_node": "Dodaj vozlišče",
-                        "close": "Zapri",
-                        "home_id": "ID doma",
-                        "network": "Omrežje",
-                        "node_id": "ID vozlišča",
-                        "remove_node": "Odstrani vozlišče"
-                    },
-                    "dashboard": {
-                        "driver_version": "Različica gonilnika",
-                        "dump_dead_nodes_text": "Nekatera vaša vozlišča se niso odzvala in so domnevno mrtva. Ta ne bodo v celoti izvožena.",
-                        "home_id": "ID doma"
-                    },
-                    "device_info": {
-                        "node_ready": "Vozlišče pripravljeno",
-                        "node_status": "Stanje vozlišča",
-                        "zwave_info": "Z-Wave Informacije"
-                    },
-                    "navigation": {
-                        "logs": "Dnevniki",
-                        "network": "Omrežje"
-                    },
-                    "network_status": {
-                        "connected": "Povezan",
-                        "connecting": "Povezovanje",
-                        "unknown": "Neznano"
-                    },
-                    "node_status": {
-                        "alive": "Živ",
-                        "asleep": "Spi",
-                        "awake": "Buden",
-                        "dead": "Mrtev",
-                        "unknown": "Neznano"
-                    },
-                    "remove_node": {
-                        "exclusion_failed": "Vozlišča ni bilo mogoče odstraniti. Za več informacij preverite dnevnike.",
-                        "exclusion_finished": "Vozlišče {id} je bilo odstranjeno iz vašega Z-Wave omrežja.",
-                        "title": "Odstrani Z-Wave vozlišče"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfiguriraj",
                     "common": {
                         "index": "Indeks",
                         "instance": "Instanca",
@@ -2453,6 +2492,71 @@
                     "values": {
                         "header": "Vrednosti vozlišča"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "view_device": "Ogled naprave"
+                    },
+                    "common": {
+                        "add_node": "Dodaj vozlišče",
+                        "close": "Zapri",
+                        "home_id": "ID doma",
+                        "network": "Omrežje",
+                        "node_id": "ID vozlišča",
+                        "remove_node": "Odstrani vozlišče"
+                    },
+                    "dashboard": {
+                        "driver_version": "Različica gonilnika",
+                        "dump_dead_nodes_text": "Nekatera vaša vozlišča se niso odzvala in so domnevno mrtva. Ta ne bodo v celoti izvožena.",
+                        "home_id": "ID doma"
+                    },
+                    "device_info": {
+                        "heal_node": "Pozdravi Vozlišče",
+                        "node_ready": "Vozlišče pripravljeno",
+                        "node_status": "Stanje vozlišča",
+                        "remove_failed": "Odstranite nedelujočo napravo",
+                        "zwave_info": "Z-Wave Informacije"
+                    },
+                    "heal_node": {
+                        "healing_complete": "{naprava} je bila ozdravljena.",
+                        "healing_failed": "{naprave} ni bilo mogoče ozdraviti.",
+                        "healing_failed_check_logs": "Dodatne informacije so morebiti na voljo v dnevnikih.",
+                        "in_progress": "Poteka zdravljenje naprave {naprava}.",
+                        "introduction": "Sporočite napravi {device}, naj posodobi svoje poti nazaj v krmilnik. To lahko pomaga pri težavah s komunikacijo, če ste pred kratkim premaknili napravo ali krmilnik.",
+                        "network_heal_in_progress": "Zdravljenje omrežja Z-Wave že poteka. Pred zdravljenjem posamezne naprave počakajte, da se zaključi.",
+                        "start_heal": "Ozdravi napravo",
+                        "title": "Zdravljenje naprave Z-Wave",
+                        "traffic_warning": "Postopek zdravljenja ustvarja veliko prometa v omrežju Z-Wave. Zaradi tega se lahko naprave med zdravljenjem odzivajo počasi (ali se sploh ne odzivajo)."
+                    },
+                    "navigation": {
+                        "logs": "Dnevniki",
+                        "network": "Omrežje"
+                    },
+                    "network_status": {
+                        "connected": "Povezan",
+                        "connecting": "Povezovanje",
+                        "unknown": "Neznano"
+                    },
+                    "node_status": {
+                        "alive": "Živ",
+                        "asleep": "Spi",
+                        "awake": "Buden",
+                        "dead": "Mrtev",
+                        "unknown": "Neznano"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "Odstranjevanje naprave je v teku.",
+                        "introduction": "Odstranite nedelujočo napravo iz omrežja Z-Wave. To uporabite, če naprave ne morete normalno izključiti, ker je pokvarjena.",
+                        "removal_failed": "Naprave ni bilo mogoče odstraniti iz vašega omrežja Z-Wave.",
+                        "removal_finished": "Vozlišče {id} je bilo odstranjeno iz vašega Z-Wave omrežja.",
+                        "remove_device": "Odstranite napravo",
+                        "title": "Odstranite nedelujočo napravo Z-Wave"
+                    },
+                    "remove_node": {
+                        "exclusion_failed": "Vozlišča ni bilo mogoče odstraniti. Za več informacij preverite dnevnike.",
+                        "exclusion_finished": "Vozlišče {id} je bilo odstranjeno iz vašega Z-Wave omrežja.",
+                        "title": "Odstrani Z-Wave vozlišče"
+                    }
                 }
             },
             "custom": {
@@ -2528,20 +2632,9 @@
                     }
                 }
             },
-            "history": {
-                "ranges": {
-                    "last_week": "Prejšnji teden",
-                    "this_week": "Ta teden",
-                    "today": "Danes",
-                    "yesterday": "Včeraj"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Prejšnji teden",
-                    "this_week": "Ta teden",
-                    "today": "Danes",
-                    "yesterday": "Včeraj"
+            "energy": {
+                "charts": {
+                    "by_device": "Poraba naprave"
                 }
             },
             "lovelace": {
@@ -2650,7 +2743,6 @@
                         "entities": {
                             "description": "Kartica entitet je najpogostejša vrsta kartice. Predmete združuje v sezname.",
                             "edit_special_row": "Podrobnosti te vrstice si oglejte s klikom na gumb za urejanje",
-                            "entity_row_editor": "Urejevalnik vrstic entitete",
                             "entity_row": {
                                 "attribute": "Atribut",
                                 "button": "Gumb",
@@ -2662,6 +2754,7 @@
                                 "section": "Sekcija",
                                 "weblink": "Spletna povezava"
                             },
+                            "entity_row_editor": "Urejevalnik vrstic entitete",
                             "name": "Subjekti",
                             "secondary_info_values": {
                                 "brightness": "Svetlost",
@@ -2688,6 +2781,7 @@
                         "gauge": {
                             "description": "Gauge kartica je osnovna kartica, ki omogoča vizualno videnje podatkov senzorjev.",
                             "name": "Merilnik",
+                            "needle_gauge": "Prikaz kot iglični merilnik?",
                             "severity": {
                                 "define": "Določi resnost?",
                                 "green": "Zelena",
@@ -2700,6 +2794,7 @@
                             "attribute": "Atribut",
                             "camera_image": "Subjekt kamere",
                             "camera_view": "Pogled kamere",
+                            "days_to_show": "Dnevi za prikaz",
                             "double_tap_action": "Dejanje dvojnega dotika",
                             "entities": "Subjekti",
                             "entity": "Subjekt",
@@ -2812,6 +2907,10 @@
                             "integration_not_loaded": "Ta kartica zahteva nastavitev integracije `shopping_list`.",
                             "name": "Nakupovalni seznam"
                         },
+                        "statistics-graph": {
+                            "description": "Kartica Graf Statistike omogoča prikaz grafa statistike za vsako od navedenih entitet.",
+                            "name": "Graf statistike"
+                        },
                         "thermostat": {
                             "description": "Kartica Termostat omogoča nadzor nad vašo klimatsko enoto. Omogoča spreminjanje temperature in načina dela.",
                             "name": "Termostat"
@@ -2881,6 +2980,12 @@
                         "tab_badges": "Značke",
                         "tab_settings": "Nastavitve",
                         "tab_visibility": "Vidljivost",
+                        "type": "Vrsta pogleda",
+                        "types": {
+                            "masonry": "Masonry (privzeto)",
+                            "panel": "Panel (1 kartica)",
+                            "sidebar": "Stranska vrstica"
+                        },
                         "visibility": {
                             "select_users": "Izberite, kateri uporabniki bi morali videti ta pogled v navigaciji"
                         }
@@ -2931,7 +3036,6 @@
                         "unsaved_changes": "Neshranjene spremembe"
                     },
                     "save_config": {
-                        "cancel": "Pozabi",
                         "close": "Zapri",
                         "empty_config": "Začnite s prazno nadzorno ploščo",
                         "header": "Prevzemite nadzor nad lovelace vmesnikom",
@@ -2960,8 +3064,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "To prikaže prvo kartico v polni širini. Ostale kartice v tem pogledu in značke ne bodo prikazane.",
-                            "title": "Način panel?",
                             "warning_multiple_cards": "Ta pogled vsebuje več kartic, na plošči je lahko prikazana največ ena kartica."
                         }
                     }
@@ -3250,6 +3352,12 @@
                     "prompt_copy_token": "Kopirate žeton za dostop. Ta ne bo prikazan znova.",
                     "prompt_name": "Dajte žetonu ime"
                 },
+                "mfa": {
+                    "confirm_disable": "Ali ste prepričani, da želite onemogočiti {name} ?",
+                    "disable": "Onemogoči",
+                    "enable": "Omogoči",
+                    "header": "Večfaktorski moduli za preverjanje pristnosti"
+                },
                 "mfa_setup": {
                     "close": "Zapri",
                     "step_done": "Nastavitev je bila opravljena za {step}",
@@ -3257,12 +3365,6 @@
                     "title_aborted": "Prekinjeno",
                     "title_success": "Uspeh!"
                 },
-                "mfa": {
-                    "confirm_disable": "Ali ste prepričani, da želite onemogočiti {name} ?",
-                    "disable": "Onemogoči",
-                    "enable": "Omogoči",
-                    "header": "Večfaktorski moduli za preverjanje pristnosti"
-                },
                 "push_notifications": {
                     "add_device_prompt": {
                         "input_label": "Ime naprave",
diff --git a/translations/frontend/sv.json b/translations/frontend/sv.json
index ac225ba1c4..fd87fd7ab5 100644
--- a/translations/frontend/sv.json
+++ b/translations/frontend/sv.json
@@ -17,6 +17,7 @@
         "calendar": "Kalender",
         "config": "Konfiguration",
         "developer_tools": "Utvecklarverktyg",
+        "energy": "Energi",
         "history": "Historik",
         "logbook": "Loggbok",
         "mailbox": "Brevlåda",
@@ -26,6 +27,14 @@
         "shopping_list": "Inköpslista",
         "states": "Översikt"
     },
+    "state": {
+        "default": {
+            "off": "Av",
+            "on": "På",
+            "unavailable": "Otillgänglig",
+            "unknown": "Okänd"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "Borta"
         }
     },
-    "state": {
-        "default": {
-            "off": "Av",
-            "on": "På",
-            "unavailable": "Otillgänglig",
-            "unknown": "Okänd"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -203,6 +204,19 @@
                 "not_installed": "Add-on är inte installerad"
             }
         },
+        "backup": {
+            "addons": "Tillägg",
+            "could_not_create": "Kunde inte skapa avbild",
+            "create": "Skapa",
+            "create_blocked_not_running": "Det är inte möjligt att skapa en avbild just nu när systemet är i {state} läge.",
+            "enter_password": "Vänligen ange ett lösenord.",
+            "folders": "Mappar",
+            "name": "Namn",
+            "password": "Lösenord",
+            "password_protection": "Lösenordsskydd",
+            "select_type": "Välj vad som ska återställas",
+            "type": "Typ"
+        },
         "common": {
             "cancel": "Avbryt",
             "close": "Stäng",
@@ -285,9 +299,6 @@
                 "text": "Vill du starta om tillägget med dina ändringar?"
             },
             "update": {
-                "create_snapshot": "Skapa en avbild av {name} innan uppdatering",
-                "snapshot": "Avbild",
-                "snapshotting": "Skapar avbild av {name}",
                 "updating": "Uppdaterar {name} till version {version}"
             }
         },
@@ -300,34 +311,6 @@
         "panel": {
             "system": "System"
         },
-        "snapshot": {
-            "addons": "Tillägg",
-            "available_snapshots": "Tillgängliga Avbilder",
-            "could_not_create": "Kunde inte skapa avbild",
-            "create": "Skapa",
-            "create_blocked_not_running": "Det är inte möjligt att skapa en avbild just nu när systemet är i {state} läge.",
-            "create_snapshot": "Skapa avbild",
-            "description": "Avbilder gör det enkelt för dig att ta backup och återställa all data i din Home Assistant instans.",
-            "enter_password": "Vänligen ange ett lösenord.",
-            "folder": {
-                "addons/local": "Lokala tillägg",
-                "homeassistant": "Home Assistant inställningar",
-                "media": "Media",
-                "ssl": "SSL"
-            },
-            "folders": "Mappar",
-            "full_snapshot": "Full avbild",
-            "name": "Namn",
-            "no_snapshots": "Du har inga avbilder ännu.",
-            "partial_snapshot": "Del av avbild",
-            "password": "Lösenord",
-            "password_protected": "lösenordskyddad",
-            "password_protection": "Lösenordsskydd",
-            "security": "Säkerhet",
-            "select_type": "Välj vad som ska återställas",
-            "type": "Typ",
-            "upload_snapshot": "Ladda upp avbild"
-        },
         "system": {
             "core": {
                 "cpu_usage": "Grundläggande CPU-användning",
@@ -630,6 +613,12 @@
             },
             "date-range-picker": {
                 "end_date": "Slutdatum",
+                "ranges": {
+                    "last_week": "Föregående vecka",
+                    "this_week": "Denna vecka",
+                    "today": "Idag",
+                    "yesterday": "Igår"
+                },
                 "select": "Välj",
                 "start_date": "Startdatum"
             },
@@ -668,8 +657,8 @@
                     "changed_to_state": "ändrades till {state}",
                     "cleared_device_class": "rensat (ingen {device_class} upptäckt)",
                     "detected_device_class": "upptäckt {device_class}",
-                    "is_closing": "stänger",
-                    "is_opening": "öppnar",
+                    "is_closing": "stängs",
+                    "is_opening": "öppnas",
                     "rose": "gick upp",
                     "set": "gick ned",
                     "turned_off": "slogs av",
@@ -677,17 +666,17 @@
                     "was_at_home": "var hemma",
                     "was_at_state": "var vid {state}",
                     "was_away": "var borta",
-                    "was_closed": "var stängd",
-                    "was_connected": "var ansluten",
-                    "was_disconnected": "var frånkopplad",
-                    "was_locked": "var låst",
+                    "was_closed": "stängdes",
+                    "was_connected": "anslöts",
+                    "was_disconnected": "kopplades ifrån",
+                    "was_locked": "låstes",
                     "was_low": "var låg",
                     "was_normal": "var normal",
-                    "was_opened": "var öppen",
-                    "was_plugged_in": "var inkopplad",
+                    "was_opened": "öppnades",
+                    "was_plugged_in": "kopplades in",
                     "was_safe": "var säker",
-                    "was_unlocked": "var olåst",
-                    "was_unplugged": "var urkopplad",
+                    "was_unlocked": "låstes upp",
+                    "was_unplugged": "kopplades ur",
                     "was_unsafe": "var osäker"
                 }
             },
@@ -719,10 +708,10 @@
                 "documentation": "dokumentation",
                 "learn_adding_local_media": "Läs mer om hur du lägger till media i {documentation} .",
                 "local_media_files": "Placera dina video-, ljud- och bildfiler i mediekatalogen för att kunna bläddra och spela upp dem i webbläsaren eller på mediaspelare som stöds.",
+                "media-player-browser": "Bläddrare för mediaspelare",
                 "media_browsing_error": "Fel vid mediebläddring",
                 "media_not_supported": "Mediaspelaren i webbläsaren stödjer inte denna typ av media",
                 "media_player": "Mediaspelare",
-                "media-player-browser": "Bläddrare för mediaspelare",
                 "no_items": "Inga objekt",
                 "no_local_media_found": "Ingen lokal media hittades",
                 "no_media_folder": "Det verkar som att du ännu inte har skapat en mediekatalog.",
@@ -782,6 +771,10 @@
             "service-picker": {
                 "service": "Tjänst"
             },
+            "statistic-picker": {
+                "learn_more": "Lär dig mer om statistik",
+                "missing_entity": "Varför är min entity listad?"
+            },
             "target-picker": {
                 "add_area_id": "Välj område",
                 "add_device_id": "Välj enhet",
@@ -986,7 +979,6 @@
                         "integrations": "Integrationer",
                         "logs": "Loggar",
                         "lovelace": "Lovelace kontrollpaneler",
-                        "navigate_to": "Navigera till {panel}",
                         "person": "Personer",
                         "scene": "Scener",
                         "script": "Skript",
@@ -1179,7 +1171,6 @@
                             "introduction": "Åtgärderna är vad Home Assistant gör när automatiseringen triggas.",
                             "learn_more": "Lär dig mer om händelser",
                             "name": "Åtgärd",
-                            "type_select": "Åtgärdstyp",
                             "type": {
                                 "choose": {
                                     "add_option": "Lägg till alternativ",
@@ -1215,7 +1206,6 @@
                                 "repeat": {
                                     "label": "Upprepa",
                                     "sequence": "Åtgärder",
-                                    "type_select": "Typ av upprepning",
                                     "type": {
                                         "count": {
                                             "label": "Antal"
@@ -1228,7 +1218,8 @@
                                             "conditions": "Så-länge-villkor",
                                             "label": "Så länge"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Typ av upprepning"
                                 },
                                 "scene": {
                                     "label": "Aktivera scenario"
@@ -1248,6 +1239,7 @@
                                     "wait_template": "paus mall"
                                 }
                             },
+                            "type_select": "Åtgärdstyp",
                             "unsupported_action": "Inget gränssnittsstöd för åtgärd: {action}"
                         },
                         "alias": "Namn",
@@ -1266,7 +1258,6 @@
                             "introduction": "Villkoren är valfria och kommer att förhindra ytterligare utförande såvida inte alla villkor är uppfyllda.",
                             "learn_more": "Lär dig mer om villkor",
                             "name": "Villkor",
-                            "type_select": "Villkorstyp",
                             "type": {
                                 "and": {
                                     "label": "Och"
@@ -1331,6 +1322,7 @@
                                     "zone": "Zon"
                                 }
                             },
+                            "type_select": "Villkorstyp",
                             "unsupported_condition": "Inget gränssnittsstöd för villkor: {condition}"
                         },
                         "copy_to_clipboard": "Kopiera till Urklipp",
@@ -1370,7 +1362,6 @@
                             "introduction": "Triggers är det som startar en automation. Det är möjligt att ange flera triggers för samma regel. När en trigger inträffar kommer Home Assistant att validera eventuella villkor och sedan köra åtgärden.",
                             "learn_more": "Lär dig mer om utlösare",
                             "name": "Trigger",
-                            "type_select": "Aktiveringstyp",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1436,18 +1427,18 @@
                                     "label": "Mall",
                                     "value_template": "Värdemall"
                                 },
-                                "time_pattern": {
-                                    "hours": "Timmar",
-                                    "label": "Tidsmönster",
-                                    "minutes": "Minuter",
-                                    "seconds": "Sekunder"
-                                },
                                 "time": {
                                     "at": "Tid",
                                     "label": "Tid",
                                     "type_input": "Värde för en datum-/tidhjälpare",
                                     "type_value": "Satt tid"
                                 },
+                                "time_pattern": {
+                                    "hours": "Timmar",
+                                    "label": "Tidsmönster",
+                                    "minutes": "Minuter",
+                                    "seconds": "Sekunder"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1461,6 +1452,7 @@
                                     "zone": "Zon"
                                 }
                             },
+                            "type_select": "Aktiveringstyp",
                             "unsupported_platform": "Inget gränssnittsstöd för plattformen: {platform}"
                         },
                         "unsaved_confirm": "Du har osparade ändringar. Är du säker på att du vill lämna?"
@@ -1584,6 +1576,7 @@
                             "instance_is_available": "Din instans är tillgänglig på",
                             "instance_will_be_available": "Din instans kommer att finnas tillgänglig på",
                             "link_learn_how_it_works": "Lär dig hur det fungerar",
+                            "reconnecting": "Återansluter",
                             "title": "Fjärrkontroll"
                         },
                         "sign_out": "Logga ut",
@@ -1610,9 +1603,9 @@
                             "loading": "Laddar...",
                             "manage": "Hantera",
                             "no_hooks_yet": "Det verkar som du inte har några webhooks ännu. Kom igång genom att konfigurera en ",
+                            "no_hooks_yet2": " eller genom att skapa en ",
                             "no_hooks_yet_link_automation": "webhook automation",
                             "no_hooks_yet_link_integration": "webhook-baserad integration",
-                            "no_hooks_yet2": " eller genom att skapa en ",
                             "title": ""
                         }
                     },
@@ -1727,9 +1720,6 @@
                     "description": "Ändra din grundkonfiguration för Home Assistant.",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "learn_more": "Hur vi behandlar din data"
-                            },
                             "core_config": {
                                 "edit_requires_storage": "Redigeraren är inaktiverad eftersom konfigurationen lagras i configuration.yaml.",
                                 "elevation": "Höjd över havet",
@@ -1861,6 +1851,34 @@
                     "unnamed_device": "Namnlös enhet",
                     "update": "Uppdatera"
                 },
+                "energy": {
+                    "caption": "Energi",
+                    "device_consumption": {
+                        "dialog": {
+                            "selected_stat_intro": "Välj den enhet som representerar enhetens energianvändning."
+                        },
+                        "learn_more": "Mer information om hur du kommer igång.",
+                        "title": "Enskilda enheter"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "to": {
+                                "cost_para": "Får du tillbaka pengar när du lämnar tillbaka energi till elnätet?",
+                                "no_cost": "Jag får inte tillbaka pengar",
+                                "paragraph": "Nätproduktion är energin som strömmar från dina solpaneler till nätet."
+                            }
+                        },
+                        "learn_more": "Mer information om hur du kommer igång.",
+                        "title": "Elnät"
+                    },
+                    "solar": {
+                        "learn_more": "Mer information om hur du kommer igång.",
+                        "stat_production": "Din solenergiproduktion",
+                        "stat_return_to_grid": "Solenergi återförd till elnätet",
+                        "sub": "Låt Home Assistant övervaka dina solpaneler och ge dig inblick i deras prestanda.",
+                        "title": "Solpaneler"
+                    }
+                },
                 "entities": {
                     "caption": "Entiteter",
                     "description": "Översikt över alla kända entiteter",
@@ -1911,14 +1929,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Rensa",
-                    "filtering_by": "Filtrera efter",
-                    "show": "Visa"
-                },
-                "hassio": {
-                    "button": "Konfigurera"
-                },
                 "header": "Konfigurera Home Assistant",
                 "helpers": {
                     "caption": "Hjälpare",
@@ -1967,16 +1977,11 @@
                     "path_configuration": "Sökväg till configuration.yaml: {path}",
                     "server": "server",
                     "source": "Källkod:",
-                    "system_health_error": "Systemhälsokomponenten har inte lästs in. Lägg till 'system_health:' i configuration.yaml",
                     "system_health": {
                         "manage": "Hantera",
                         "more_info": "mer information"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "integrationssidan",
-                    "missing_zha": "Saknar du konfigurationspanelen för ZHA? Den är flyttad till {integrations_page}.",
-                    "missing_zwave": "Saknar du konfigurationspanelen för Z-Wave? Den är flyttad till {integrations_page}."
+                    },
+                    "system_health_error": "Systemhälsokomponenten har inte lästs in. Lägg till 'system_health:' i configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "Lägg till integration",
@@ -1988,7 +1993,6 @@
                         "delete_confirm": "Är du säker på att du vill radera denna integration?",
                         "device_unavailable": "Enhet otillgänglig",
                         "devices": "{count} {count, plural,\n  one {enhet}\n  other {enheter}\n}",
-                        "disable_restart_confirm": "Starta om Home Assistant för att slutföra inaktiveringen av denna integration",
                         "disable": {
                             "disabled": "Inaktiverad",
                             "disabled_by": {
@@ -1998,6 +2002,7 @@
                             },
                             "disabled_cause": "Inaktiverad på grund av {cause}"
                         },
+                        "disable_restart_confirm": "Starta om Home Assistant för att slutföra inaktiveringen av denna integration",
                         "documentation": "Dokumentation",
                         "enable_restart_confirm": "Starta om Home Assistant för att slutföra aktiveringen av denna integration",
                         "entities": "{count} {count, plural,\n  one {entitet}\n  other {entiteter}\n}",
@@ -2006,7 +2011,6 @@
                         "hub": "Ansluten via",
                         "manuf": "av {manufacturer}",
                         "no_area": "Inget område (\"area\")",
-                        "options": "Alternativ",
                         "reload": "Ladda om",
                         "reload_confirm": "Integrationen laddades om",
                         "reload_restart_confirm": "Starta om Home Assistant för att slutföra omladdningen av denna integration",
@@ -2029,7 +2033,6 @@
                             "open_site": "Öppna webbplats"
                         },
                         "finish": "Slutför",
-                        "loading_first_time": "Vänligen vänta medan integrationen installeras",
                         "not_all_required_fields": "Alla obligatoriska fält har inte fyllts i.",
                         "pick_flow_step": {
                             "new_flow": "Nej, skapa en annan instans av {integration}",
@@ -2044,7 +2047,6 @@
                     "details": "Integrationsdetaljer",
                     "disable": {
                         "disabled_integrations": "{number} inaktiverad(e)",
-                        "hide_disabled": "Dölj inaktiverade integrationer",
                         "show_disabled": "Visa inaktiverade integrationer"
                     },
                     "discovered": "Upptäckt",
@@ -2054,7 +2056,6 @@
                         "confirm_delete_ignore_title": "Sluta ignorera {name}?",
                         "confirm_ignore": "Är du säker på att du inte vill konfigurera denna integration? Du kan ångra detta genom att klicka på 'Visa ignorerade integrationer' i menyn längst upp till höger.",
                         "confirm_ignore_title": "Ignorera upptäckten av {name}?",
-                        "hide_ignored": "Dölj ignorerade integrationer",
                         "ignore": "Ignorera",
                         "ignored": "Ignorerad",
                         "show_ignored": "Visa ignorerade integrationer",
@@ -2172,7 +2173,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Konfigurera",
                     "description_listen": "Lyssna på ett ämne",
                     "description_publish": "Publicera ett paket",
                     "listening_to": "Lyssnar på",
@@ -2186,7 +2186,6 @@
                     "topic": "ämne"
                 },
                 "ozw": {
-                    "button": "Konfigurera",
                     "common": {
                         "controller": "Kontroller",
                         "instance": "Instans",
@@ -2211,6 +2210,11 @@
                         "nodes": "Noder",
                         "select_instance": "Välj instans"
                     },
+                    "network": {
+                        "header": "Nätverkshantering",
+                        "introduction": "Hantera nätverksövergripande funktioner.",
+                        "node_count": "{count} noder"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Alla noder har frågats",
@@ -2231,10 +2235,9 @@
                         "starting": "Startar",
                         "unknown": "Okänd"
                     },
-                    "network": {
-                        "header": "Nätverkshantering",
-                        "introduction": "Hantera nätverksövergripande funktioner.",
-                        "node_count": "{count} noder"
+                    "node": {
+                        "button": "Noddetaljer",
+                        "not_found": "Noden hittades inte"
                     },
                     "node_config": {
                         "header": "Nodkonfiguration",
@@ -2264,10 +2267,6 @@
                         "versions": "Inhämtar information om firmware och kommandoklassversioner",
                         "wakeup": "Ställa in stöd för väckarköer och meddelanden"
                     },
-                    "node": {
-                        "button": "Noddetaljer",
-                        "not_found": "Noden hittades inte"
-                    },
                     "nodes_table": {
                         "failed": "Misslyckades",
                         "id": "ID",
@@ -2568,7 +2567,6 @@
                         "search_again": "Sök Igen",
                         "spinner": "Söker efter ZHA Zigbee-enheter ..."
                     },
-                    "button": "Konfigurera",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Attribut för det valda klustret",
                         "get_zigbee_attribute": "Hämta Zigbee-attribut",
@@ -2675,77 +2673,7 @@
                     "introduction": "Med zoner kan du ange vissa regioner på jorden. När en person befinner sig i en zon tar tillståndet namnet från zonen. Zoner kan också användas som utlösare eller villkor i automatiseringsinställningar.",
                     "no_zones_created_yet": "Det verkar som om du inte har skapat några zoner ännu."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Avbryt inkludering",
-                        "controller_in_inclusion_mode": "Din Z-Wave-styrenhet är nu i inkluderingsläge.",
-                        "follow_device_instructions": "Följ anvisningarna som följde med din enhet för att aktivera parning på enheten.",
-                        "inclusion_failed": "Noden kunde inte läggas till. Kontrollera loggarna för mer information.",
-                        "inclusion_finished": "Noden har lagts till. Det kan ta några minuter för alla entiteter att dyka upp när vi avslutar inställningen av noden i bakgrunden.",
-                        "introduction": "Denna guide guidar dig genom att lägga till en nod i ditt Z-Wave-nätverk.",
-                        "secure_inclusion_warning": "Säkra enheter kräver ytterligare bandbredd, för många säkra enheter kan göra ditt Z-Wave-nätverk långsammare. Vi rekommenderar att endast använda säker inkludering för enheter som kräver det, som lås eller dörröppnare för garage.",
-                        "start_inclusion": "Påbörja inkludering",
-                        "start_secure_inclusion": "Påbörja säker inkludering",
-                        "title": "Lägg till Z-Wave nod",
-                        "use_secure_inclusion": "Använd säker inkludering",
-                        "view_device": "Visa enhet"
-                    },
-                    "button": "Konfigurera",
-                    "common": {
-                        "add_node": "Lägg till nod",
-                        "close": "Stäng",
-                        "home_id": "Hem ID",
-                        "network": "Nätverk",
-                        "node_id": "Nod ID",
-                        "remove_node": "Ta bort nod"
-                    },
-                    "dashboard": {
-                        "driver_version": "Drivrutinsversion",
-                        "dump_dead_nodes_text": "Några av dina noder svarade inte och antas vara döda. Dessa kommer inte att exporteras fullt ut.",
-                        "dump_dead_nodes_title": "Några av dina noder är döda",
-                        "dump_debug": "Ladda ner en rapport från ditt nätverk för att diagnostisera problem",
-                        "dump_not_ready_confirm": "Ladda ner",
-                        "dump_not_ready_text": "Om du skapar en export när inte alla noder är klara, kan du missa data som behövs. Ge ditt nätverk lite tid att fråga alla noder. Vill du fortsätta med exporten?",
-                        "dump_not_ready_title": "Alla noder är inte redo än",
-                        "header": "Hantera ditt Z-Wave-nätverk",
-                        "home_id": "Hem ID",
-                        "introduction": "Hantera ditt Z-Wave-nätverk och dina noder.",
-                        "nodes_ready": "Noder redo",
-                        "server_version": "Serverversion"
-                    },
-                    "device_info": {
-                        "node_ready": "Nod redo",
-                        "node_status": "Nodstatus",
-                        "zwave_info": "Z-Wave info"
-                    },
-                    "navigation": {
-                        "network": "Nätverk"
-                    },
-                    "network_status": {
-                        "connected": "Ansluten",
-                        "connecting": "Ansluter",
-                        "unknown": "Okänd"
-                    },
-                    "node_status": {
-                        "alive": "Levande",
-                        "asleep": "Sovande",
-                        "awake": "Vaken",
-                        "dead": "Död",
-                        "unknown": "Okänd"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Avbryt exkludering",
-                        "controller_in_exclusion_mode": "Din Z-Wave-styrenhet är nu i exkluderingsläge.",
-                        "exclusion_failed": "Det gick inte att ta bort noden. Vänligen kontrollera loggarna för mer information.",
-                        "exclusion_finished": "Noden {id} har tagits bort från ditt Z-Wave-nätverk.",
-                        "follow_device_instructions": "Följ anvisningarna som följde med din enhet för att aktivera exkluderingen.",
-                        "introduction": "Ta bort nod från ditt Z-Wave-nätverk samt ta bort tillhörande enhet och entiteter från Home Assistant.",
-                        "start_exclusion": "Starta exkludering",
-                        "title": "Ta bort en Z-Wave nod"
-                    }
-                },
                 "zwave": {
-                    "button": "Konfigurera",
                     "common": {
                         "index": "Index",
                         "instance": "Instans",
@@ -2834,6 +2762,74 @@
                     "values": {
                         "header": "Nodvärden"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Avbryt inkludering",
+                        "controller_in_inclusion_mode": "Din Z-Wave-styrenhet är nu i inkluderingsläge.",
+                        "follow_device_instructions": "Följ anvisningarna som följde med din enhet för att aktivera parning på enheten.",
+                        "inclusion_failed": "Noden kunde inte läggas till. Kontrollera loggarna för mer information.",
+                        "inclusion_finished": "Noden har lagts till. Det kan ta några minuter för alla entiteter att dyka upp när vi avslutar inställningen av noden i bakgrunden.",
+                        "introduction": "Denna guide guidar dig genom att lägga till en nod i ditt Z-Wave-nätverk.",
+                        "secure_inclusion_warning": "Säkra enheter kräver ytterligare bandbredd, för många säkra enheter kan göra ditt Z-Wave-nätverk långsammare. Vi rekommenderar att endast använda säker inkludering för enheter som kräver det, som lås eller dörröppnare för garage.",
+                        "start_inclusion": "Påbörja inkludering",
+                        "start_secure_inclusion": "Påbörja säker inkludering",
+                        "title": "Lägg till Z-Wave nod",
+                        "use_secure_inclusion": "Använd säker inkludering",
+                        "view_device": "Visa enhet"
+                    },
+                    "common": {
+                        "add_node": "Lägg till nod",
+                        "close": "Stäng",
+                        "home_id": "Hem ID",
+                        "network": "Nätverk",
+                        "node_id": "Nod ID",
+                        "remove_node": "Ta bort nod"
+                    },
+                    "dashboard": {
+                        "driver_version": "Drivrutinsversion",
+                        "dump_dead_nodes_text": "Några av dina noder svarade inte och antas vara döda. Dessa kommer inte att exporteras fullt ut.",
+                        "dump_dead_nodes_title": "Några av dina noder är döda",
+                        "dump_debug": "Ladda ner en rapport från ditt nätverk för att diagnostisera problem",
+                        "dump_not_ready_confirm": "Ladda ner",
+                        "dump_not_ready_text": "Om du skapar en export när inte alla noder är klara, kan du missa data som behövs. Ge ditt nätverk lite tid att fråga alla noder. Vill du fortsätta med exporten?",
+                        "dump_not_ready_title": "Alla noder är inte redo än",
+                        "header": "Hantera ditt Z-Wave-nätverk",
+                        "home_id": "Hem ID",
+                        "introduction": "Hantera ditt Z-Wave-nätverk och dina noder.",
+                        "nodes_ready": "Noder redo",
+                        "server_version": "Serverversion"
+                    },
+                    "device_info": {
+                        "node_ready": "Nod redo",
+                        "node_status": "Nodstatus",
+                        "zwave_info": "Z-Wave info"
+                    },
+                    "navigation": {
+                        "network": "Nätverk"
+                    },
+                    "network_status": {
+                        "connected": "Ansluten",
+                        "connecting": "Ansluter",
+                        "unknown": "Okänd"
+                    },
+                    "node_status": {
+                        "alive": "Levande",
+                        "asleep": "Sovande",
+                        "awake": "Vaken",
+                        "dead": "Död",
+                        "unknown": "Okänd"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Avbryt exkludering",
+                        "controller_in_exclusion_mode": "Din Z-Wave-styrenhet är nu i exkluderingsläge.",
+                        "exclusion_failed": "Det gick inte att ta bort noden. Vänligen kontrollera loggarna för mer information.",
+                        "exclusion_finished": "Noden {id} har tagits bort från ditt Z-Wave-nätverk.",
+                        "follow_device_instructions": "Följ anvisningarna som följde med din enhet för att aktivera exkluderingen.",
+                        "introduction": "Ta bort nod från ditt Z-Wave-nätverk samt ta bort tillhörande enhet och entiteter från Home Assistant.",
+                        "start_exclusion": "Starta exkludering",
+                        "title": "Ta bort en Z-Wave nod"
+                    }
                 }
             },
             "custom": {
@@ -2914,26 +2910,14 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Gå tillbaka",
-                "supervisor": {
-                    "ask": "Be om hjälp"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Föregående vecka",
-                    "this_week": "Denna vecka",
-                    "today": "Idag",
-                    "yesterday": "Igår"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Föregående vecka",
-                    "this_week": "Denna vecka",
-                    "today": "Idag",
-                    "yesterday": "Igår"
+            "energy": {
+                "charts": {
+                    "by_device": "Förbrukning per enhet",
+                    "stat_house_energy_meter": "Total energiförbrukning"
+                },
+                "setup": {
+                    "back": "Tillbaka",
+                    "next": "Nästa"
                 }
             },
             "lovelace": {
@@ -3047,7 +3031,6 @@
                         "entities": {
                             "description": "Entitetskortet är den vanligaste korttypen. Det grupperar objekt i listor.",
                             "edit_special_row": "Visa detaljerna för denna rad genom att klicka på redigeringsknappen",
-                            "entity_row_editor": "Enhetsradredigerare",
                             "entity_row": {
                                 "attribute": "Attribut",
                                 "button": "Knapp",
@@ -3059,6 +3042,7 @@
                                 "section": "Sektion",
                                 "weblink": "Webbadress"
                             },
+                            "entity_row_editor": "Enhetsradredigerare",
                             "name": "Enheter",
                             "secondary_info_values": {
                                 "brightness": "Ljusstyrka",
@@ -3279,6 +3263,11 @@
                         "tab_badges": "Märken",
                         "tab_settings": "Inställningar",
                         "tab_visibility": "Synlighet",
+                        "type": "Vytyp",
+                        "types": {
+                            "panel": "Panel (1 kort)",
+                            "sidebar": "Sidofält"
+                        },
                         "visibility": {
                             "select_users": "Välj vilka användare som ska se den här vyn i navigeringen"
                         }
@@ -3333,7 +3322,6 @@
                         "unsaved_changes": "Osparade ändringar"
                     },
                     "save_config": {
-                        "cancel": "Avbryt",
                         "close": "Stäng",
                         "empty_config": "Börja med en tom instrumentpanel",
                         "header": "Ta kontroll över Lovelace UI",
@@ -3362,8 +3350,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Detta gör att det första kortet utnyttjar hela bredden i denna vyn.",
-                            "title": "Panelläge?",
                             "warning_multiple_cards": "Den här vyn innehåller mer än ett kort, men en panelvy kan bara visa 1 kort."
                         }
                     }
@@ -3581,10 +3567,16 @@
                 },
                 "intro": "Är du redo att väcka ditt hem, återta din integritet och gå med i en världsomspännande gemenskap av hemmafixare?",
                 "restore": {
-                    "description": "Alternativt kan du återställa från en tidigare snapshot.",
+                    "addons": "Tillägg",
+                    "description": "Alternativt kan du återställa från en tidigare backup.",
+                    "folders": "Mappar",
                     "hide_log": "Dölj fullständig logg",
                     "in_progress": "Återställning pågår",
-                    "show_log": "Visa fullständig logg"
+                    "password": "Lösenord",
+                    "password_protection": "Lösenordsskydd",
+                    "select_type": "Välj vad som ska återställas",
+                    "show_log": "Visa fullständig logg",
+                    "type": "Typ"
                 },
                 "user": {
                     "create_account": "Skapa konto",
@@ -3661,6 +3653,12 @@
                     "prompt_copy_token": "Kopiera din åtkomsttoken. Den kommer inte att visas igen.",
                     "prompt_name": "Ge token ett namn"
                 },
+                "mfa": {
+                    "confirm_disable": "Är du säker på att du vill avaktivera {name}?",
+                    "disable": "Inaktivera",
+                    "enable": "Aktivera",
+                    "header": "Tvåfaktorsautentiseringsmoduler"
+                },
                 "mfa_setup": {
                     "close": "Stäng",
                     "step_done": "Inställningen klar för {step}",
@@ -3668,12 +3666,6 @@
                     "title_aborted": "Avbruten",
                     "title_success": "Framgång!"
                 },
-                "mfa": {
-                    "confirm_disable": "Är du säker på att du vill avaktivera {name}?",
-                    "disable": "Inaktivera",
-                    "enable": "Aktivera",
-                    "header": "Tvåfaktorsautentiseringsmoduler"
-                },
                 "number_format": {
                     "description": "Välj hur siffror utformas.",
                     "dropdown_label": "Sifferformat",
diff --git a/translations/frontend/ta.json b/translations/frontend/ta.json
index f5669b0fef..b10d23a9e2 100644
--- a/translations/frontend/ta.json
+++ b/translations/frontend/ta.json
@@ -8,6 +8,12 @@
         "shopping_list": "பொருட்கள் பட்டியல்",
         "states": "கண்ணோட்டம்"
     },
+    "state": {
+        "default": {
+            "unavailable": "கிடைக்கவில்லை",
+            "unknown": "தெரியவில்லை"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -41,12 +47,6 @@
             "home": "முகப்பு"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "கிடைக்கவில்லை",
-            "unknown": "தெரியவில்லை"
-        }
-    },
     "ui": {
         "login-form": {
             "log_in": "உள் நுழை",
diff --git a/translations/frontend/te.json b/translations/frontend/te.json
index 941389dd5e..559607c2bf 100644
--- a/translations/frontend/te.json
+++ b/translations/frontend/te.json
@@ -10,6 +10,12 @@
         "shopping_list": "షాపింగ్ జాబితా",
         "states": "టూకీగా"
     },
+    "state": {
+        "default": {
+            "unavailable": "అందుబాటులో లేదు",
+            "unknown": "తెలియదు"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -43,12 +49,6 @@
             "home": "ఇంట"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "అందుబాటులో లేదు",
-            "unknown": "తెలియదు"
-        }
-    },
     "ui": {
         "auth_store": {
             "ask": "మీరు ఈ లాగిన్ సేవ్ చేయాలనుకుంటున్నారా?",
@@ -143,7 +143,6 @@
                         "actions": {
                             "add": "అంశాన్ని జోడించు",
                             "header": "చర్యలు",
-                            "type_select": "యాక్షన్ రకం",
                             "type": {
                                 "condition": {
                                     "label": "కండిషన్"
@@ -159,6 +158,7 @@
                                     "timeout": "సమయం ముగిసింది (ఐచ్ఛికం)"
                                 }
                             },
+                            "type_select": "యాక్షన్ రకం",
                             "unsupported_action": "మద్దతు లేని చర్య: {action}"
                         },
                         "conditions": {
@@ -166,7 +166,6 @@
                             "delete": "తీసివేయి",
                             "delete_confirm": "ఇది మీరు delete చేయాలని అనుకుంటున్నారా?",
                             "duplicate": "నకిలీ",
-                            "type_select": "కండిషన్ రకం",
                             "type": {
                                 "numeric_state": {
                                     "above": "పైన",
@@ -188,7 +187,8 @@
                                         "mon": "సోమవారం"
                                     }
                                 }
-                            }
+                            },
+                            "type_select": "కండిషన్ రకం"
                         },
                         "default_name": "కొత్త ఆటోమేషన్",
                         "introduction": "ఆటోమేషన్ల ద్వారా మీ ఇంటికి ప్రాణం పోయండి",
@@ -198,7 +198,6 @@
                             "delete": "తొలగించు",
                             "delete_confirm": "ఖచ్చితంగా తొలగించాలనుకుంటున్నారా?",
                             "duplicate": "నకిలీ",
-                            "type_select": "ట్రిగ్గర్ రకం",
                             "type": {
                                 "event": {
                                     "event_data": "ఈవెంట్ డేటా",
@@ -239,7 +238,8 @@
                                 "zone": {
                                     "enter": "\nప్రవేశించు"
                                 }
-                            }
+                            },
+                            "type_select": "ట్రిగ్గర్ రకం"
                         }
                     },
                     "picker": {
diff --git a/translations/frontend/th.json b/translations/frontend/th.json
index 6863cfdcab..e480c9160f 100644
--- a/translations/frontend/th.json
+++ b/translations/frontend/th.json
@@ -8,6 +8,7 @@
         "calendar": "ปฏิทิน",
         "config": "การตั้งค่า",
         "developer_tools": "เครื่องมือสำหรับนักพัฒนา",
+        "energy": "พลังงาน",
         "history": "ประวัติการทำงาน",
         "logbook": "สมุดบันทึก",
         "mailbox": "กล่องจดหมาย",
@@ -16,6 +17,12 @@
         "shopping_list": "รายการซื้อของ",
         "states": "ภาพรวม"
     },
+    "state": {
+        "default": {
+            "unavailable": "ไม่พร้อมใช้งาน",
+            "unknown": "ไม่ทราบสถานะ"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -71,12 +78,6 @@
             "not_home": "ไม่อยู่บ้าน"
         }
     },
-    "state": {
-        "default": {
-            "unavailable": "ไม่พร้อมใช้งาน",
-            "unknown": "ไม่ทราบสถานะ"
-        }
-    },
     "ui": {
         "auth_store": {
             "ask": "คุณต้องการจำการเข้าระบบนี้หรือไม่?",
@@ -276,6 +277,9 @@
                 }
             },
             "zha_device_info": {
+                "buttons": {
+                    "reconfigure": "กำหนดค่าอุปกรณ์ใหม่"
+                },
                 "manuf": "โดย {manufacturer}",
                 "no_area": "ไม่มีห้อง",
                 "power_source": "แหล่งพลังงาน",
@@ -284,6 +288,18 @@
                     "remove": "ลบอุปกรณ์ออกจากเครือข่าย Zigbee"
                 },
                 "unknown": "ไม่ทราบสถานะ"
+            },
+            "zha_reconfigure_device": {
+                "bind_header": "ผูก",
+                "button_hide": "ซ่อนรายละเอียด",
+                "button_show": "แสดงรายละเอียด",
+                "cluster_header": "กลุ่ม",
+                "configuration_complete": "การกำหนดค่าอุปกรณ์ใหม่เสร็จสมบูรณ์",
+                "configuration_failed": "การกำหนดค่าอุปกรณ์ใหม่ล้มเหลว ข้อมูลเพิ่มเติมอาจมีอยู่ในบันทึกของระบบ",
+                "configuring_alt": "กำลังกำหนดค่า",
+                "reporting_header": "การรายงาน",
+                "run_in_background": "คุณสามารถปิดกล่องโต้ตอบนี้ได้ การกำหนดค่าใหม่จะยังทำงานต่อไปในพื้นหลัง",
+                "start_reconfiguration": "เริ่มการกำหนดค่าใหม่"
             }
         },
         "duration": {
@@ -321,9 +337,9 @@
                     "picker": {
                         "create_area": "สร้างห้องใหม่",
                         "header": "ค่าของห้อง",
-                        "integrations_page": "หน้าการทำงานร่วมกัน",
+                        "integrations_page": "หน้าตัวประสานงาน",
                         "introduction": "Areas are used to organize where devices are. This information will be used throughout Home Assistant to help you in organizing your interface, permissions and integrations with other systems.",
-                        "introduction2": "สำหรับการวางอุปกรณ์นี้ลงในห้องนี้ ใช้ลิงค์ด้านล่างเพื่อไปยังหน้า 'การทำงานร่วมกัน' และคลิ๊กทีุ่่ม 'ตั้งค่าให้ทำงานร่วมกัน' เพื่อที่จะให้แสดงการ์ดสำหรับอุปกรณ์นั้น",
+                        "introduction2": "สำหรับการวางอุปกรณ์ลงในพื้นที่ ใช้ลิงค์ด้านล่างเพื่อไปยังหน้าตัวประสานงาน และคลิ๊กเลือกที่การประสานงานที่มีการตั้งค่าแล้ว เพื่อที่จะให้แสดงการ์ดสำหรับอุปกรณ์",
                         "no_areas": "ดูเหมือนว่าคุณยังไม่มีห้องเลย!"
                     }
                 },
@@ -339,7 +355,6 @@
                             "header": "การกระทำ",
                             "introduction": "ใช้สำหรับการกระทำที่ Home Assistant จะทำต่อเมื่อระบบอัตโนมัติมีการเรียกใช้งาน",
                             "learn_more": "เรียนรู้เพิ่มเติมเกี่ยวกับ Action",
-                            "type_select": "ประเภทการทำงาน",
                             "type": {
                                 "condition": {
                                     "label": "สถานะ"
@@ -368,6 +383,7 @@
                                     "wait_template": "แบบ รอ"
                                 }
                             },
+                            "type_select": "ประเภทการทำงาน",
                             "unsupported_action": "ไม่รองรับการดำเนินการ: {action}"
                         },
                         "alias": "ชื่อ",
@@ -379,7 +395,6 @@
                             "header": "เงื่อนไข",
                             "introduction": "เงื่อนไขเป็นส่วนที่ปล่อยว่างได้ของกฎอัตโนมัติและสามารถใช้เพื่อป้องกันไม่ให้เกิดการกระทำเมื่อถูกเรียกใช้งาน เงื่อนไขดูคล้ายกับการกระตุ้น แต่แตกต่างกันมาก การกระตุ้นจะพิจารณาเหตุการณ์ที่เกิดขึ้นในระบบในขณะที่เงื่อนไขจะดูเฉพาะที่ระบบจะดูในตอนนี้เท่านั้น การกระตุ้นสามารถสังเกตได้จากสวิตช์ที่กำลังเปิดอยู่ โดยเงื่อนไขสามารถเห็นได้เฉพาะเมื่อสวิตช์เปิดหรือปิดอยู่เท่านั้น",
                             "learn_more": "เรียนรู้เพิ่มเติมเกี่ยวกับเงื่อนไข",
-                            "type_select": "ประเภทเงื่อนไข",
                             "type": {
                                 "and": {
                                     "label": "และ"
@@ -430,6 +445,7 @@
                                     "zone": "โซน"
                                 }
                             },
+                            "type_select": "ประเภทเงื่อนไข",
                             "unsupported_condition": "ไม่รองรับเงื่อนไข: {condition}"
                         },
                         "default_name": "ระบบอัตโนมัติใหม่",
@@ -449,7 +465,6 @@
                             "header": "ทริกเกอร์",
                             "introduction": "ทริกเกอร์คือสิ่งที่เริ่มต้นในการประมวลผลกฎอัตโนมัติ คุณสามารถระบุทริกเกอร์หลายรายการสำหรับกฎเดียวกันได้ เมื่อตัวทริกเกอร์เริ่มทำงานผู้ช่วยแรกจะตรวจสอบเงื่อนไขหากมีและเรียกการดำเนินการ.\n\n[เรียนรู้เพิ่มเติมเกี่ยวกับทริกเกอร์] (https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "เรียนรู้เพิ่มเติมเกี่ยวกับ Trigger",
-                            "type_select": "ประเภททริกเกอร์",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -505,16 +520,16 @@
                                     "label": "แบบ",
                                     "value_template": "ค่าแบบ"
                                 },
+                                "time": {
+                                    "at": "ที่",
+                                    "label": "เวลา"
+                                },
                                 "time_pattern": {
                                     "hours": "ชั่วโมง",
                                     "label": "รูปแบบเวลา",
                                     "minutes": "นาที",
                                     "seconds": "วินาที"
                                 },
-                                "time": {
-                                    "at": "ที่",
-                                    "label": "เวลา"
-                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -528,6 +543,7 @@
                                     "zone": "โซน"
                                 }
                             },
+                            "type_select": "ประเภททริกเกอร์",
                             "unsupported_platform": "แพลตฟอร์มที่ไม่สนับสนุน: {platform}"
                         },
                         "unsaved_confirm": "คุณมีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก คุณแน่ใจหรือไม่ว่าต้องการออก?"
@@ -535,7 +551,7 @@
                     "picker": {
                         "add_automation": "เพิ่มระบบอัตโนมัติ",
                         "header": "เครื่องมือแก้ไข ระบบอัตโนมัติ",
-                        "introduction": "เป็นตัวช่วยแก้ไขที่ทำให้คุณสามารถสร้างหรือแก้ไขการทำงานอัตโนมัติ\nโปรดอ่าน [คำแนะนำ] (https://home-assistant.io/docs/automation/editor/) เพื่อให้การกำหนดค่าของคุณเป็นไปได้อย่างถูกต้อง",
+                        "introduction": "The automation editor allows you to create and edit automations. Please follow the link below to read the instructions to make sure that you have configured Home Assistant correctly.",
                         "learn_more": "เรียนรู้เพิ่มเติมเกี่ยวกับ Automation",
                         "no_automations": "เราไม่พบระบบอัตโนมัติใด ๆ สามารถแก้ไขได้",
                         "pick_automation": "เลือกระบบอัตโนมัติเพื่อแก้ไข"
@@ -545,12 +561,14 @@
                     "account": {
                         "connected": "เชื่อมต่อแล้ว",
                         "google": {
+                            "not_configured_text": "ก่อนที่คุณจะใช้ Google Assistant ได้ คุณต้องเปิดใช้งานทักษะ Home Assistant Cloud สำหรับ Google Assistant ในแอป Google Home ก่อน",
+                            "not_configured_title": "ไม่ได้เปิดใช้งาน Google Assistant",
                             "title": "Google Assistant"
                         },
                         "nabu_casa_account": "บัญชี Nabu Casa",
                         "sign_out": "ลงชื่อออก"
                     },
-                    "description_features": "ควบคุมการทำงานจากนอกบ้าน ร่วมกับ Alexa และ Google Assistant",
+                    "description_features": "ควบคุมบ้านในยามที่คุณไม่อยู่บ้าน ควบคู่ไปกับ Alexa และ Google Assistant",
                     "description_login": "ลงชื่อเข้าใช้เป็น {email}",
                     "description_not_login": "ยังไม่ได้เข้าสู่ระบบ",
                     "forgot_password": {
@@ -626,6 +644,7 @@
                 },
                 "devices": {
                     "caption": "อุปกรณ์",
+                    "description": "จัดการอุปกรณ์ที่กำหนดค่าไว้แล้ว",
                     "scene": {
                         "create": "สร้างฉากด้วยอุปกรณ์",
                         "no_scenes": "ไม่มีฉาก",
@@ -642,10 +661,10 @@
                         "introduction2": "ใช้เอนทิตี้รีจิสตรีเพื่อแทนที่ชื่อเปลี่ยนรหัสประจำเอนทิตีหรือลบรายการออกจาก Home Assistant \nหมายเหตุ: การลบรายการเอนทิตีรีจิสตรีจะไม่ลบเอนทิตี โดยทำตามลิงก์ด้านล่างและลบออกจากหน้าการรวมระบบ"
                     }
                 },
-                "header": "การตั้งค่า Home Assistant",
+                "header": "ตั้งค่า Home Assistant",
                 "integrations": {
                     "attention": "ต้องระบุ",
-                    "caption": "การทำงานร่วมกัน",
+                    "caption": "ตัวประสานงาน",
                     "config_entry": {
                         "delete_confirm": "แน่ใจหรือว่าต้องการจะลบการบูรณาการนี้",
                         "device_unavailable": "อุปกรณ์นี้ไม่พร้อมใช้งาน",
@@ -660,13 +679,16 @@
                         "external_step": {
                             "description": "ขั้นตอนนี้กำหนดให้คุณเยี่ยมชมเว็บไซต์ภายนอกเพื่อทำให้การดำเนินการสมบูรณ์",
                             "open_site": "เปิดเว็บไซต์"
+                        },
+                        "loading": {
+                            "fallback_title": "ตัวประสานงาน"
                         }
                     },
                     "configure": "ปรับแต่ง",
-                    "configured": "ตั้งค่าไว้แล้ว",
+                    "configured": "ตั้งค่าแล้ว",
                     "description": "จัดการการเชื่อมต่อของอุปกรณ์กับการบริการ",
                     "discovered": "ค้นพบแล้ว",
-                    "new": "สร้างการทำงานร่วมกันอันใหม่",
+                    "new": "สร้างตัวประสานงานใหม่",
                     "none": "ยังไม่มีการกำหนดค่าใดๆ เลย",
                     "reconfigure": "กำหนดค่าใหม่"
                 },
@@ -753,6 +775,10 @@
                 "zha": {
                     "add_device_page": {
                         "spinner": "กำลังค้นหาอุปกรณ์ ZHA Zigbee ..."
+                    },
+                    "device_pairing_card": {
+                        "CONFIGURED": "การกำหนดค่าเสร็จสมบูรณ์",
+                        "CONFIGURED_status_text": "กำลังเริ่มการทำงาน"
                     }
                 },
                 "zwave": {
@@ -787,6 +813,17 @@
                         "start_network": "กําลังเริ่มเครือข่าย Z-Wave...",
                         "stop_network": "หยุดการใช้งานเครือข่าย Z-Wave..."
                     }
+                },
+                "zwave_js": {
+                    "common": {
+                        "source": "แหล่งที่มา"
+                    },
+                    "device_info": {
+                        "device_config": "กำหนดค่าอุปกรณ์"
+                    },
+                    "node_config": {
+                        "parameter": "พารามิเตอร์"
+                    }
                 }
             },
             "developer-tools": {
@@ -808,6 +845,12 @@
                     }
                 }
             },
+            "energy": {
+                "setup": {
+                    "back": "กลับ",
+                    "next": "ต่อไป"
+                }
+            },
             "lovelace": {
                 "cards": {
                     "empty_state": {
@@ -819,7 +862,7 @@
                         "call_service": "เรียกบริการ {name}",
                         "hold": "ถือ:",
                         "more_info": "แสดงข้อมูลเพิ่มเติม: {name}",
-                        "navigate_to": "นำทางไปยัง {location}",
+                        "navigate_to": "ไปยัง {location}",
                         "tap": "แตะ:",
                         "toggle": "สลับ {name}",
                         "url": "เปิดหน้าต่างเพื่อไปยัง {url_path}"
@@ -894,7 +937,6 @@
                         "unsaved_changes": "การเปลี่ยนแปลงที่ยังไม่ได้ถูกบันทึก"
                     },
                     "save_config": {
-                        "cancel": "ไม่เป็นไร",
                         "header": "ควบคุม Lovelace UI ในแบบของคุณ",
                         "para": "โดยเริ่มต้น Home Assistant จะควบคุมส่วนต่อประสานผู้ใช้งานเอง เมื่อมี Entity หรือส่วนควบคุมใหม่ๆ จะถูกแสดงขึ้นให้เอง แต่ถ้าคุณอยากจะควบคุมเอง เราจะไม่มีการอัพเดทตามข้างต้นให้กับคุณ",
                         "para_sure": "คุณแน่ใจหรือไม่ว่าต้องการควบคุมส่วนต่อประสานผู้ใช้งาน?",
@@ -1070,7 +1112,7 @@
                     "intro": "อุปกรณ์และบริการแสดงอยู่ใน Home Assistant เป็นการผสานรวม คุณสามารถตั้งค่าตอนนี้หรือทำภายหลังจากหน้าจอการตั้งค่า",
                     "more_integrations": "เพิ่มเติม"
                 },
-                "intro": "พร้อมที่จะปลุกบ้านของคุณแล้วหรือยัง เรียกความเป็นส่วนตัวของคุณและเข้าร่วมกับชุมชนของเราดูสิ!",
+                "intro": "คุณพร้อมที่จะปลุกบ้านของคุณให้มีชีวิตแล้วหรือยัง อย่าลืมว่าคุณไม่ได้อยู่โดดเดี่ยวเดียวดาย ลองมาเข้าร่วมกับชุมชนนักประดิษฐ์จากทั่วโลกของเรากันไหม?",
                 "user": {
                     "create_account": "สร้างบัญชี",
                     "data": {
@@ -1107,7 +1149,7 @@
                 "language": {
                     "dropdown_label": "ภาษา",
                     "header": "ภาษา",
-                    "link_promo": "ช่วยเราแปลภาษาเป็นประเทศของคุณ"
+                    "link_promo": "ช่วยเราแปลภาษา"
                 },
                 "logout": "ออกจากระบบ",
                 "long_lived_access_tokens": {
@@ -1124,6 +1166,12 @@
                     "prompt_copy_token": "จด Access Token ของคุณไว้ที่อื่นด้วย มันจะไม่แสดงให้เห็นอีกแล้วหลังจากนี้",
                     "prompt_name": "ชื่อ?"
                 },
+                "mfa": {
+                    "confirm_disable": "คุณแน่ใจหรือไม่ว่าต้องการปิดใช้งาน {name} ?",
+                    "disable": "ปิดการใช้งาน",
+                    "enable": "เปิดใช้งาน",
+                    "header": "โมดูลการพิสูจน์ตัวตนแบบหลายปัจจัย"
+                },
                 "mfa_setup": {
                     "close": "ปิด",
                     "step_done": "ติดตั้งเสร็จแล้วในขั้นตอนที่ {step}",
@@ -1131,12 +1179,6 @@
                     "title_aborted": "ยกเลิก",
                     "title_success": "สำเร็จ!"
                 },
-                "mfa": {
-                    "confirm_disable": "คุณแน่ใจหรือไม่ว่าต้องการปิดใช้งาน {name} ?",
-                    "disable": "ปิดการใช้งาน",
-                    "enable": "เปิดใช้งาน",
-                    "header": "โมดูลการพิสูจน์ตัวตนแบบหลายปัจจัย"
-                },
                 "push_notifications": {
                     "description": "ส่งการแจ้งเตือนไปยังอุปกรณ์นี้",
                     "error_load_platform": "กำหนดค่า notify.html5.",
diff --git a/translations/frontend/tr.json b/translations/frontend/tr.json
index f54dbe9f2f..93432a9adb 100644
--- a/translations/frontend/tr.json
+++ b/translations/frontend/tr.json
@@ -26,6 +26,14 @@
         "shopping_list": "Alışveriş listesi",
         "states": "Durumlar"
     },
+    "state": {
+        "default": {
+            "off": "Kapalı",
+            "on": "Açık",
+            "unavailable": "Mevcut değil",
+            "unknown": "Bilinmeyen"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +102,6 @@
             "not_home": "Dışarıda"
         }
     },
-    "state": {
-        "default": {
-            "off": "Kapalı",
-            "on": "Açık",
-            "unavailable": "Mevcut değil",
-            "unknown": "Bilinmeyen"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +267,18 @@
                 "not_installed": "Eklenti yüklü değil"
             }
         },
+        "backup": {
+            "addons": "Eklentiler",
+            "could_not_create": "Anlık görüntü oluşturulamadı",
+            "create": "Oluştur",
+            "create_blocked_not_running": "{state} durumunda olduğundan şu anda anlık görüntü oluşturmak mümkün değil.",
+            "enter_password": "Lütfen bir parola girin.",
+            "folders": "Klasörler",
+            "name": "Ad",
+            "password": "Parola",
+            "password_protection": "Parola koruması",
+            "type": "Tür"
+        },
         "common": {
             "cancel": "İptal",
             "close": "Kapat",
@@ -358,9 +370,6 @@
                 "text": "Eklentiyi değişikliklerinizle yeniden başlatmak istiyor musunuz?"
             },
             "update": {
-                "create_snapshot": "Güncellemeden önce {name} anlık görüntüsünü oluşturun",
-                "snapshot": "Anlık görüntü",
-                "snapshotting": "{name} anlık görüntüsü oluşturuluyor",
                 "updating": "{name} , {version} sürümüne güncelleniyor"
             }
         },
@@ -372,38 +381,9 @@
         },
         "panel": {
             "dashboard": "Gösterge Paneli",
-            "snapshots": "Anlık görüntüler",
             "store": "Eklenti Mağazası",
             "system": "Sistem"
         },
-        "snapshot": {
-            "addons": "Eklentiler",
-            "available_snapshots": "Kullanılabilir Anlık Görüntüler",
-            "could_not_create": "Anlık görüntü oluşturulamadı",
-            "create": "Oluştur",
-            "create_blocked_not_running": "{state} durumunda olduğundan şu anda anlık görüntü oluşturmak mümkün değil.",
-            "create_snapshot": "Anlık görüntü oluştur",
-            "description": "Anlık görüntüler, Home Assistant örneğinizin tüm verilerini kolayca yedeklemenizi ve geri yüklemenizi sağlar.",
-            "enter_password": "Lütfen bir parola girin.",
-            "folder": {
-                "addons/local": "Yerel eklentiler",
-                "homeassistant": "Home Assistant yapılandırması",
-                "media": "Medya",
-                "share": "Paylaş",
-                "ssl": "SSL"
-            },
-            "folders": "Klasörler",
-            "full_snapshot": "Tam anlık görüntü",
-            "name": "Ad",
-            "no_snapshots": "Henüz anlık görüntünüz yok.",
-            "partial_snapshot": "Kısmi anlık görüntü",
-            "password": "Parola",
-            "password_protected": "parola korumalı",
-            "password_protection": "Parola koruması",
-            "security": "Güvenlik",
-            "type": "Tür",
-            "upload_snapshot": "Anlık görüntü yükle"
-        },
         "store": {
             "missing_addons": "Eksik eklentiler mi var? Kullanıcı profili sayfanızda gelişmiş modu etkinleştirin",
             "no_results_found": "{repository} içinde sonuç bulunamadı.",
@@ -821,10 +801,10 @@
                 "documentation": "dokümantasyon",
                 "learn_adding_local_media": "{documentation}'ye ortam ekleme hakkında daha fazla bilgi edinin.",
                 "local_media_files": "Tarayıcıda veya desteklenen medya oynatıcılarda göz atıp oynatabilmek için video, ses ve görüntü dosyalarınızı medya dizinine yerleştirin.",
+                "media-player-browser": "Media Player Tarayıcısı",
                 "media_browsing_error": "Medya Tarama Hatası",
                 "media_not_supported": "Tarayıcı Media Player bu tür medyayı desteklemiyor",
                 "media_player": "Medya Oynatıcı",
-                "media-player-browser": "Media Player Tarayıcısı",
                 "no_items": "Öğe yok",
                 "no_local_media_found": "Yerel medya bulunamadı",
                 "no_media_folder": "Görünüşe göre henüz bir medya dizini oluşturmadın.",
@@ -1095,7 +1075,6 @@
                         "integrations": "Entegrasyonlar",
                         "logs": "Günlükler",
                         "lovelace": "Lovelace Kontrol Paneli",
-                        "navigate_to": "{panel} gidin",
                         "person": "Kişiler",
                         "scene": "Sahneler",
                         "script": "Senaryolar",
@@ -1293,7 +1272,6 @@
                             "introduction": "İşlemler, otomasyon tetiklendiğinde Home Assistant'ın yapacağı işlemlerdir.",
                             "learn_more": "İşlemler hakkında daha fazla bilgi edinin",
                             "name": "Aksiyon",
-                            "type_select": "Aksiyon türü",
                             "type": {
                                 "choose": {
                                     "add_option": "Seçenek ekle",
@@ -1334,7 +1312,6 @@
                                 "repeat": {
                                     "label": "Tekrar",
                                     "sequence": "Aksiyonlar",
-                                    "type_select": "Tekrar tipi",
                                     "type": {
                                         "count": {
                                             "label": "Sayısı"
@@ -1347,7 +1324,8 @@
                                             "conditions": "Koşullara kadar",
                                             "label": "Süre"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Tekrar tipi"
                                 },
                                 "scene": {
                                     "label": "Sahneyi etkinleştir"
@@ -1367,6 +1345,7 @@
                                     "wait_template": "Bekleme taslak"
                                 }
                             },
+                            "type_select": "Aksiyon türü",
                             "unsupported_action": "Eylem için görsel düzenleyici desteği yok: {action}"
                         },
                         "alias": "İsim",
@@ -1385,7 +1364,6 @@
                             "introduction": "Koşullar isteğe bağlıdır ve tüm koşullar yerine getirilmediği sürece otomasyonun çalışmasını engeller.",
                             "learn_more": "Koşullar hakkında daha fazla bilgi edinin",
                             "name": "Şart",
-                            "type_select": "Koşul türü",
                             "type": {
                                 "and": {
                                     "label": "Ve"
@@ -1452,6 +1430,7 @@
                                     "zone": "Bölge"
                                 }
                             },
+                            "type_select": "Koşul türü",
                             "unsupported_condition": "Koşul için görsel düzenleyici desteği yok: {condition}"
                         },
                         "copy_to_clipboard": "Panoya kopyala",
@@ -1492,7 +1471,6 @@
                             "introduction": "Tetikleyiciler, bir otomasyon kuralının işlenmesini başlatan şeydir. Aynı kural için birden çok tetikleyici belirtmek mümkündür. Bir tetikleyici başladıktan sonra, Home Assistant varsa koşulları doğrular ve eylemi çağırır.",
                             "learn_more": "Tetikleyiciler hakkında daha fazla bilgi edinin",
                             "name": "Tetik",
-                            "type_select": "Tetikleyici tipi",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1558,18 +1536,18 @@
                                     "label": "Taslak",
                                     "value_template": "Değer taslak"
                                 },
-                                "time_pattern": {
-                                    "hours": "Saat",
-                                    "label": "Zaman Deseni",
-                                    "minutes": "Dakika",
-                                    "seconds": "Saniye"
-                                },
                                 "time": {
                                     "at": "Saat",
                                     "label": "zaman",
                                     "type_input": "Tarih / saat yardımcısının değeri",
                                     "type_value": "Sabit zaman"
                                 },
+                                "time_pattern": {
+                                    "hours": "Saat",
+                                    "label": "Zaman Deseni",
+                                    "minutes": "Dakika",
+                                    "seconds": "Saniye"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook Kimliği"
@@ -1583,6 +1561,7 @@
                                     "zone": "Bölge"
                                 }
                             },
+                            "type_select": "Tetikleyici tipi",
                             "unsupported_platform": "Platform için görsel düzenleyici desteği yok: {platform}"
                         },
                         "unsaved_confirm": "Kaydedilmemiş değişiklikleriniz var. Çıkmak istediğinize emin misiniz?"
@@ -1738,9 +1717,9 @@
                             "loading": "Yükleniyor ...",
                             "manage": "Yönet",
                             "no_hooks_yet": "Görünüşe göre henüz webhooks'un yok. Bir tane yapılandırarak başlayın",
+                            "no_hooks_yet2": " veya bir oluşturarak ",
                             "no_hooks_yet_link_automation": "webhook otomasyonu",
                             "no_hooks_yet_link_integration": "webhook tabanlı entegrasyon",
-                            "no_hooks_yet2": " veya bir oluşturarak ",
                             "title": "Webhooks"
                         }
                     },
@@ -1855,35 +1834,6 @@
                     "description": "Birim sistemi, konum, saat dilimi ve diğer genel parametreler",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "Bunu etkinleştirmeden önce, ne gönderdiğinizi ve nasıl depolandığını anlamak için {link} analiz belgeleri sayfasını ziyaret ettiğinizden emin olun.",
-                                "header": "İstatistikler",
-                                "instance_id": "Örnek Kimliği: {huuid}",
-                                "introduction": "Örneğinizden analizleri paylaşın. {link} adresinde herkese açık olacak",
-                                "needs_base": "Bu seçeneğin kullanılabilir olması için temel analizleri etkinleştirmeniz gerekir",
-                                "preference": {
-                                    "base": {
-                                        "description": "Bu, örnek kimliği, sürüm ve yükleme türünü içerir",
-                                        "title": "Temel analiz"
-                                    },
-                                    "diagnostics": {
-                                        "description": "Kilitlenme raporlarını ve teşhis bilgilerini paylaşın",
-                                        "title": "Tanılama"
-                                    },
-                                    "statistics": {
-                                        "description": "Bu, belgelere tam listeyle bakmak için yüklemenizdeki öğelerin sayısını içerir",
-                                        "title": "Kullanım istatistikleri"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "Bu, entegrasyonlarınızın ve eklentilerinizin adlarını ve yeteneklerini içerir",
-                                        "title": "Kullanılan entegrasyonlar ve eklentiler"
-                                    },
-                                    "usage": {
-                                        "description": "Bu, entegrasyonlarınızın adlarını içerir",
-                                        "title": "Kullanılan entegrasyonlar"
-                                    }
-                                }
-                            },
                             "core_config": {
                                 "edit_requires_storage": "Konfigürasyon configuration.yaml'de depolandığı için düzenleyici devre dışı bırakıldı.",
                                 "elevation": "Yükseklik",
@@ -2066,11 +2016,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Temizle",
-                    "filtering_by": "Filtreleme ölçütü",
-                    "show": "Göster"
-                },
                 "header": "Home Assistant'ı yapılandır",
                 "helpers": {
                     "caption": "Yardımcılar",
@@ -2119,16 +2064,11 @@
                     "path_configuration": "configuration.yaml lokasyonu: {path}",
                     "server": "sunucu",
                     "source": "Kaynak:",
-                    "system_health_error": "Sistem Sağlığı bileşeni yüklü değil. configuration.yaml içine 'system_health:' ekleyin",
                     "system_health": {
                         "manage": "Yönet",
                         "more_info": "daha fazla bilgi"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "entegrasyonlar sayfası",
-                    "missing_zha": "ZHA yapılandırma paneli eksik mi? {integrations_page} üzerindeki ZHA girişine taşındı.",
-                    "missing_zwave": "Z-Wave yapılandırma paneli eksik mi? {integrations_page} üzerindeki Z-Wave girişine taşındı."
+                    },
+                    "system_health_error": "Sistem Sağlığı bileşeni yüklü değil. configuration.yaml içine 'system_health:' ekleyin"
                 },
                 "integrations": {
                     "add_integration": "Entegrasyon ekle",
@@ -2141,7 +2081,6 @@
                         "delete_confirm": "Bu entegrasyonu silmek istediğinizden emin misiniz?",
                         "device_unavailable": "Cihaz kullanılamıyor",
                         "devices": "{count} {count, plural,\n  one {cihaz}\n  other {cihazlar}\n}",
-                        "disable_restart_confirm": "Bu entegrasyonu devre dışı bırakmayı tamamlamak için Home Assistant'ı yeniden başlatın",
                         "disable": {
                             "disable_confirm": "Bu yapılandırma girişini devre dışı bırakmak istediğinizden emin misiniz? Cihazları ve varlıkları devre dışı bırakılacak.",
                             "disabled": "Devre dışı",
@@ -2152,17 +2091,16 @@
                             },
                             "disabled_cause": "{cause} tarafından devre dışı bırakıldı"
                         },
+                        "disable_restart_confirm": "Bu entegrasyonu devre dışı bırakmayı tamamlamak için Home Assistant'ı yeniden başlatın",
                         "documentation": "Dökümanlar",
                         "enable_restart_confirm": "Bu entegrasyonu etkinleştirmeyi tamamlamak için Home Assistant'ı yeniden başlatın",
                         "entities": "{count} {count, plural,\n  one {varlık}\n  other {varlıklar}\n}",
                         "entity_unavailable": "Varlık kullanılamıyor",
                         "firmware": "Aygıt yazılımı: {version}",
                         "hub": "Şununla bağlı:",
-                        "logs": "Günlükler",
                         "manuf": "üretici: {manufacturer}",
                         "no_area": "Alan Yok",
                         "not_loaded": "Yüklenmedi, {logs_link} öğesini denetleyin",
-                        "options": "Seçenekler",
                         "reload": "Tekrar yükle",
                         "reload_confirm": "Entegrasyon yeniden yüklendi",
                         "reload_restart_confirm": "Bu entegrasyonu yeniden yüklemeyi bitirmek için Home Assistant'ı yeniden başlatın",
@@ -2192,7 +2130,6 @@
                             "open_site": "Web sitesini aç"
                         },
                         "finish": "Bitir",
-                        "loading_first_time": "Lütfen entegrasyonun yüklenmesini bekleyin",
                         "not_all_required_fields": "Gerekli alanların tümü doldurulmamış.",
                         "not_loaded": "Bu entegrasyon yüklenemedi, Home Assistant'ı yeniden başlatmayı deneyin.",
                         "pick_flow_step": {
@@ -2208,7 +2145,6 @@
                     "details": "Entegrasyon detayları",
                     "disable": {
                         "disabled_integrations": "{number} devre dışı bırakıldı",
-                        "hide_disabled": "Devre dışı bırakılan entegrasyonları gizle",
                         "show": "Göster",
                         "show_disabled": "Devre dışı bırakılan entegrasyonları göster"
                     },
@@ -2219,7 +2155,6 @@
                         "confirm_delete_ignore_title": "{name} yoksaymayı bırak?",
                         "confirm_ignore": "Bu entegrasyonu ayarlamak istemediğinizden emin misiniz? Sağ üstteki taşma menüsünde 'Yok sayılan entegrasyonları göster'i tıklayarak bunu geri alabilirsiniz.",
                         "confirm_ignore_title": "{name} keşfini yoksay?",
-                        "hide_ignored": "Yok sayılan entegrasyonları gizle",
                         "ignore": "Yoksay",
                         "ignored": "Yok Sayılan",
                         "show_ignored": "Yok sayılan entegrasyonları göster",
@@ -2330,7 +2265,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Yapılandır",
                     "description_listen": "Bir konuyu dinle",
                     "description_publish": "Bir paket yayınla",
                     "listening_to": "Dinliyorum",
@@ -2344,7 +2278,6 @@
                     "topic": "konu"
                 },
                 "ozw": {
-                    "button": "Yapılandır",
                     "common": {
                         "controller": "Denetleyici",
                         "instance": "Örnek",
@@ -2369,6 +2302,11 @@
                         "nodes": "Düğümler",
                         "select_instance": "Örnek Seçin"
                     },
+                    "network": {
+                        "header": "Ağ yönetimi",
+                        "introduction": "Ağ genelindeki işlevleri yönetin.",
+                        "node_count": "{count} düğümleri"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Tüm düğümler sorgulandı",
@@ -2389,10 +2327,9 @@
                         "starting": "Başlatılıyor",
                         "unknown": "Bilinmeyen"
                     },
-                    "network": {
-                        "header": "Ağ yönetimi",
-                        "introduction": "Ağ genelindeki işlevleri yönetin.",
-                        "node_count": "{count} düğümleri"
+                    "node": {
+                        "button": "Düğüm Ayrıntıları",
+                        "not_found": "Düğüm bulunamadı"
                     },
                     "node_config": {
                         "header": "Düğüm Yapılandırması",
@@ -2422,10 +2359,6 @@
                         "versions": "Aygıt yazılımı ve komut sınıfı sürümleri hakkında bilgi edinme",
                         "wakeup": "Uyandırma kuyrukları ve iletileri için destek ayarlama"
                     },
-                    "node": {
-                        "button": "Düğüm Ayrıntıları",
-                        "not_found": "Düğüm bulunamadı"
-                    },
                     "nodes_table": {
                         "failed": "Başarısız oldu",
                         "id": "İD",
@@ -2726,7 +2659,6 @@
                         "search_again": "Yeniden Ara",
                         "spinner": "ZHA Zigbee cihazları aranıyor ..."
                     },
-                    "button": "Yapılandır",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Seçili kümenin öznitelikleri",
                         "get_zigbee_attribute": "Zigbee Özelliğini al",
@@ -2834,87 +2766,7 @@
                     "introduction": "Bölgeler, dünyadaki belirli bölgeleri belirtmenize izin verir. Bir kişi bir bölge içindeyse, durumunu bölgenin isminden alır. Bölgeler, otomasyon kurulumlarında tetikleyici veya koşul olarak da kullanılabilir.",
                     "no_zones_created_yet": "Görünüşe göre henüz herhangi bir bölge oluşturmadınız."
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "Dahil Etmeyi İptal Et",
-                        "controller_in_inclusion_mode": "Z-Wave kontrol cihazınız artık dahil etme modunda.",
-                        "follow_device_instructions": "Cihazda eşleştirmeyi tetiklemek için cihazınızla birlikte gelen talimatları izleyin.",
-                        "inclusion_failed": "Düğüm eklenemedi. Daha fazla bilgi için lütfen günlükleri kontrol edin.",
-                        "inclusion_finished": "Düğüm eklendi. Düğümün arka planda kurulumunu tamamladığımızda tüm varlıkların görünmesi birkaç dakika sürebilir.",
-                        "introduction": "Bu sihirbaz, Z-Wave ağınıza bir düğüm eklerken size yol gösterecektir.",
-                        "secure_inclusion_warning": "Güvenli cihazlar ek bant genişliği gerektirir; çok fazla güvenli cihaz Z-Wave ağınızı yavaşlatabilir. Yalnızca kilitler veya garaj kapısı açıcılar gibi bunu gerektiren cihazlar için güvenli dahil etme kullanmanızı öneririz.",
-                        "start_inclusion": "Dahil Etmeye Başlayın",
-                        "start_secure_inclusion": "Güvenli Dahil Etmeyi Başlatın",
-                        "title": "Bir Z-Wave Düğümü Ekleyin",
-                        "use_secure_inclusion": "Güvenli dahil etme kullanın",
-                        "view_device": "Cihazı Görüntüle"
-                    },
-                    "button": "Yapılandır",
-                    "common": {
-                        "add_node": "Düğüm Ekle",
-                        "close": "Kapat",
-                        "home_id": "Ev kimliği",
-                        "network": "Ağ",
-                        "node_id": "Düğüm Kimliği",
-                        "remove_node": "Düğümü Kaldır"
-                    },
-                    "dashboard": {
-                        "driver_version": "Sürücü Sürümü",
-                        "dump_dead_nodes_text": "Düğümlerinizden bazıları yanıt vermedi ve öldüğü varsayılıyor. Bunlar tamamen ihraç edilmeyecek.",
-                        "dump_dead_nodes_title": "Düğümlerinizden bazıları öldü",
-                        "dump_debug": "Sorunları tanılamaya yardımcı olmak için ağınızın dökümünün karşıdan yükle",
-                        "dump_not_ready_confirm": "İndir",
-                        "dump_not_ready_text": "Tüm düğümler hazır değilken bir dışa aktarma oluşturursanız, gerekli verileri kaçırabilirsiniz. Ağınıza tüm düğümleri sorgulaması için biraz zaman tanıyın. Çöplükle devam etmek istiyor musun?",
-                        "dump_not_ready_title": "Henüz tüm düğümler hazır değil",
-                        "header": "Z-Wave Ağınızı Yönetin",
-                        "home_id": "Ev kimliği",
-                        "introduction": "Z-Wave ağınızı ve Z-Wave düğümlerinizi yönetin",
-                        "nodes_ready": "Düğümler hazır",
-                        "server_version": "Sunucu Sürümü"
-                    },
-                    "device_info": {
-                        "device_config": "Cihazı Yapılandır",
-                        "node_ready": "Düğüm Hazır",
-                        "node_status": "Düğüm Durumu",
-                        "zwave_info": "Z-Wave Bilgisi"
-                    },
-                    "navigation": {
-                        "network": "Ağ"
-                    },
-                    "network_status": {
-                        "connected": "Bağlı",
-                        "connecting": "Bağlanıyor",
-                        "unknown": "Bilinmeyen"
-                    },
-                    "node_config": {
-                        "attribution": "Cihaz yapılandırma parametreleri ve açıklamaları {device_database}",
-                        "battery_device_notice": "Yapılandırmalarını güncellemek için pil cihazlarının uyanık olması gerekir. Cihazı nasıl uyandıracağınıza ilişkin talimatlar için lütfen cihazınızın kılavuzuna bakın.",
-                        "error_device_not_found": "Cihaz bulunamadı",
-                        "header": "Z-Wave Cihaz Yapılandırması",
-                        "introduction": "Seçilen cihaz için cihaza (düğüm) özel yapılandırma parametrelerini yönetin ve ayarlayın",
-                        "parameter_is_read_only": "Bu parametre salt okunurdur.",
-                        "zwave_js_device_database": "Z-Wave JS Cihaz Veritabanı"
-                    },
-                    "node_status": {
-                        "alive": "Canlı",
-                        "asleep": "Uykuda",
-                        "awake": "Uyanık",
-                        "dead": "Ölü",
-                        "unknown": "Bilinmeyen"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "Hariç Tutmayı İptal Et",
-                        "controller_in_exclusion_mode": "Z-Wave denetleyiciniz artık dışlama modunda.",
-                        "exclusion_failed": "Düğüm kaldırılamadı. Daha fazla bilgi için lütfen günlükleri kontrol edin.",
-                        "exclusion_finished": "{id} düğümü, Z-Wave ağınızdan kaldırıldı.",
-                        "follow_device_instructions": "Cihazda hariç tutmayı tetiklemek için cihazınızla birlikte gelen talimatları izleyin.",
-                        "introduction": "Z-Wave ağınızdan bir düğümü kaldırın ve ilişkili cihazı ve varlıkları Home Assistant'tan kaldırın.",
-                        "start_exclusion": "Hariç Tutmayı Başlat",
-                        "title": "Bir Z-Wave Düğümünü Kaldırma"
-                    }
-                },
                 "zwave": {
-                    "button": "Yapılandır",
                     "common": {
                         "index": "Indeks",
                         "instance": "Örnek",
@@ -3003,6 +2855,84 @@
                     "values": {
                         "header": "Düğüm Değerleri"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "Dahil Etmeyi İptal Et",
+                        "controller_in_inclusion_mode": "Z-Wave kontrol cihazınız artık dahil etme modunda.",
+                        "follow_device_instructions": "Cihazda eşleştirmeyi tetiklemek için cihazınızla birlikte gelen talimatları izleyin.",
+                        "inclusion_failed": "Düğüm eklenemedi. Daha fazla bilgi için lütfen günlükleri kontrol edin.",
+                        "inclusion_finished": "Düğüm eklendi. Düğümün arka planda kurulumunu tamamladığımızda tüm varlıkların görünmesi birkaç dakika sürebilir.",
+                        "introduction": "Bu sihirbaz, Z-Wave ağınıza bir düğüm eklerken size yol gösterecektir.",
+                        "secure_inclusion_warning": "Güvenli cihazlar ek bant genişliği gerektirir; çok fazla güvenli cihaz Z-Wave ağınızı yavaşlatabilir. Yalnızca kilitler veya garaj kapısı açıcılar gibi bunu gerektiren cihazlar için güvenli dahil etme kullanmanızı öneririz.",
+                        "start_inclusion": "Dahil Etmeye Başlayın",
+                        "start_secure_inclusion": "Güvenli Dahil Etmeyi Başlatın",
+                        "title": "Bir Z-Wave Düğümü Ekleyin",
+                        "use_secure_inclusion": "Güvenli dahil etme kullanın",
+                        "view_device": "Cihazı Görüntüle"
+                    },
+                    "common": {
+                        "add_node": "Düğüm Ekle",
+                        "close": "Kapat",
+                        "home_id": "Ev kimliği",
+                        "network": "Ağ",
+                        "node_id": "Düğüm Kimliği",
+                        "remove_node": "Düğümü Kaldır"
+                    },
+                    "dashboard": {
+                        "driver_version": "Sürücü Sürümü",
+                        "dump_dead_nodes_text": "Düğümlerinizden bazıları yanıt vermedi ve öldüğü varsayılıyor. Bunlar tamamen ihraç edilmeyecek.",
+                        "dump_dead_nodes_title": "Düğümlerinizden bazıları öldü",
+                        "dump_debug": "Sorunları tanılamaya yardımcı olmak için ağınızın dökümünün karşıdan yükle",
+                        "dump_not_ready_confirm": "İndir",
+                        "dump_not_ready_text": "Tüm düğümler hazır değilken bir dışa aktarma oluşturursanız, gerekli verileri kaçırabilirsiniz. Ağınıza tüm düğümleri sorgulaması için biraz zaman tanıyın. Çöplükle devam etmek istiyor musun?",
+                        "dump_not_ready_title": "Henüz tüm düğümler hazır değil",
+                        "header": "Z-Wave Ağınızı Yönetin",
+                        "home_id": "Ev kimliği",
+                        "introduction": "Z-Wave ağınızı ve Z-Wave düğümlerinizi yönetin",
+                        "nodes_ready": "Düğümler hazır",
+                        "server_version": "Sunucu Sürümü"
+                    },
+                    "device_info": {
+                        "device_config": "Cihazı Yapılandır",
+                        "node_ready": "Düğüm Hazır",
+                        "node_status": "Düğüm Durumu",
+                        "zwave_info": "Z-Wave Bilgisi"
+                    },
+                    "navigation": {
+                        "network": "Ağ"
+                    },
+                    "network_status": {
+                        "connected": "Bağlı",
+                        "connecting": "Bağlanıyor",
+                        "unknown": "Bilinmeyen"
+                    },
+                    "node_config": {
+                        "attribution": "Cihaz yapılandırma parametreleri ve açıklamaları {device_database}",
+                        "battery_device_notice": "Yapılandırmalarını güncellemek için pil cihazlarının uyanık olması gerekir. Cihazı nasıl uyandıracağınıza ilişkin talimatlar için lütfen cihazınızın kılavuzuna bakın.",
+                        "error_device_not_found": "Cihaz bulunamadı",
+                        "header": "Z-Wave Cihaz Yapılandırması",
+                        "introduction": "Seçilen cihaz için cihaza (düğüm) özel yapılandırma parametrelerini yönetin ve ayarlayın",
+                        "parameter_is_read_only": "Bu parametre salt okunurdur.",
+                        "zwave_js_device_database": "Z-Wave JS Cihaz Veritabanı"
+                    },
+                    "node_status": {
+                        "alive": "Canlı",
+                        "asleep": "Uykuda",
+                        "awake": "Uyanık",
+                        "dead": "Ölü",
+                        "unknown": "Bilinmeyen"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "Hariç Tutmayı İptal Et",
+                        "controller_in_exclusion_mode": "Z-Wave denetleyiciniz artık dışlama modunda.",
+                        "exclusion_failed": "Düğüm kaldırılamadı. Daha fazla bilgi için lütfen günlükleri kontrol edin.",
+                        "exclusion_finished": "{id} düğümü, Z-Wave ağınızdan kaldırıldı.",
+                        "follow_device_instructions": "Cihazda hariç tutmayı tetiklemek için cihazınızla birlikte gelen talimatları izleyin.",
+                        "introduction": "Z-Wave ağınızdan bir düğümü kaldırın ve ilişkili cihazı ve varlıkları Home Assistant'tan kaldırın.",
+                        "start_exclusion": "Hariç Tutmayı Başlat",
+                        "title": "Bir Z-Wave Düğümünü Kaldırma"
+                    }
                 }
             },
             "custom": {
@@ -3085,31 +3015,10 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "Geri Git",
-                "supervisor": {
-                    "ask": "Yardım isteyin",
-                    "observer": "Gözlemciyi Kontrol Edin",
-                    "reboot": "Ana bilgisayarı yeniden başlatmayı deneyin",
-                    "system_health": "Sistem Sağlığını Kontrol Edin",
-                    "title": "Süpervizör paneli yüklenemedi!",
-                    "wait": "Yeni başladıysanız, süpervizöre başlaması için yeterince zaman verdiğinizden emin olun."
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "Geçen hafta",
-                    "this_week": "Bu hafta",
-                    "today": "Bugün",
-                    "yesterday": "Dün"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Geçen hafta",
-                    "this_week": "Bu hafta",
-                    "today": "Bugün",
-                    "yesterday": "Dün"
+            "energy": {
+                "setup": {
+                    "back": "Geri",
+                    "next": "Sonraki"
                 }
             },
             "lovelace": {
@@ -3223,7 +3132,6 @@
                         "entities": {
                             "description": "Varlıklar kartı en yaygın kart türüdür. Öğeleri listeler halinde gruplandırır.",
                             "edit_special_row": "Düzenle düğmesini tıklayarak bu satırın ayrıntılarını görüntüleyin",
-                            "entity_row_editor": "Varlık Satır Düzenleyicisi",
                             "entity_row": {
                                 "attribute": "Öznitelik",
                                 "button": "Düğme",
@@ -3235,6 +3143,7 @@
                                 "section": "Bölüm",
                                 "weblink": "Web Bağlantısı"
                             },
+                            "entity_row_editor": "Varlık Satır Düzenleyicisi",
                             "name": "Varlıklar",
                             "secondary_info_values": {
                                 "brightness": "Parlaklık",
@@ -3509,7 +3418,6 @@
                         "unsaved_changes": "Kaydedilmemiş değişiklikler"
                     },
                     "save_config": {
-                        "cancel": "Boşver",
                         "close": "Kapat",
                         "empty_config": "Boş bir gösterge tablosuyla başla",
                         "header": "Lovelace kullanıcı arayüzünü kontrolünüz altına alın",
@@ -3538,8 +3446,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Bu, ilk kartı tam genişlikte işler. Bu görünümdeki diğer kartlar ve rozetler işlenmeyecektir.",
-                            "title": "Panel Modu?",
                             "warning_multiple_cards": "Bu görünüm birden fazla kart içeriyor, ancak panel görünümü yalnızca 1 kart gösterebilir."
                         }
                     }
@@ -3742,8 +3648,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Sonraki",
-                    "intro": "Örneğinizden analizleri paylaşın. {link} adresinde herkese açık olacak"
+                    "finish": "Sonraki"
                 },
                 "core-config": {
                     "button_detect": "Algıla",
@@ -3763,10 +3668,15 @@
                 "intro": "Evinizi uyandırmaya, gizliliğinizi geri almaya ve dünya çapında bir tamirci topluluğuna katılmaya hazır mısınız?",
                 "next": "Sonraki",
                 "restore": {
+                    "addons": "Eklentiler",
                     "description": "Alternatif olarak, önceki anlık görüntüden geri yükleyebilirsiniz.",
+                    "folders": "Klasörler",
                     "hide_log": "Tam günlüğü gizle",
                     "in_progress": "Geri yükleme devam ediyor",
-                    "show_log": "Tam günlüğü göster"
+                    "password": "Parola",
+                    "password_protection": "Parola koruması",
+                    "show_log": "Tam günlüğü göster",
+                    "type": "Tür"
                 },
                 "user": {
                     "create_account": "Hesap Oluştur",
@@ -3843,6 +3753,12 @@
                     "prompt_copy_token": "Erişim anahtarınızı kopyalayın. Bu anahtar bir daha görüntülenmeyecektir.",
                     "prompt_name": "Belirtece bir ad verin"
                 },
+                "mfa": {
+                    "confirm_disable": "{name} adlı öğeyi devre dışı bırakmak istediğinizden emin misiniz?",
+                    "disable": "Devre dışı bırak",
+                    "enable": "Etkinleştir",
+                    "header": "Çok Faktörlü Kimlik Doğrulama Modülleri"
+                },
                 "mfa_setup": {
                     "close": "Kapat",
                     "step_done": "Kurulumun {step} adımı tamamlandı",
@@ -3850,12 +3766,6 @@
                     "title_aborted": "İptal edildi",
                     "title_success": "Başarılı!"
                 },
-                "mfa": {
-                    "confirm_disable": "{name} adlı öğeyi devre dışı bırakmak istediğinizden emin misiniz?",
-                    "disable": "Devre dışı bırak",
-                    "enable": "Etkinleştir",
-                    "header": "Çok Faktörlü Kimlik Doğrulama Modülleri"
-                },
                 "number_format": {
                     "description": "Sayıların nasıl biçimlendirileceğini seçin.",
                     "dropdown_label": "Sayı biçimi",
diff --git a/translations/frontend/uk.json b/translations/frontend/uk.json
index 00c42427b3..dafc219aae 100644
--- a/translations/frontend/uk.json
+++ b/translations/frontend/uk.json
@@ -26,6 +26,14 @@
         "shopping_list": "Список покупок",
         "states": "Огляд"
     },
+    "state": {
+        "default": {
+            "off": "Вимкнено",
+            "on": "Увімкнено",
+            "unavailable": "Недоступний",
+            "unknown": "Невідомо"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -68,12 +76,12 @@
     },
     "state_badge": {
         "alarm_control_panel": {
-            "armed": "Охорона",
-            "armed_away": "Охорона",
-            "armed_custom_bypass": "Охорона",
-            "armed_home": "Охорона",
-            "armed_night": "Охорона",
-            "arming": "Поставлено",
+            "armed": "Охороняється",
+            "armed_away": "Охороняється",
+            "armed_custom_bypass": "Охороняється",
+            "armed_home": "Охороняється",
+            "armed_night": "Охороняється",
+            "arming": "Ставиться",
             "disarmed": "Знято",
             "disarming": "Знято",
             "pending": "Очікування",
@@ -94,12 +102,12 @@
             "not_home": "Відсутній"
         }
     },
-    "state": {
-        "default": {
-            "off": "Вимкнено",
-            "on": "Увімкнено",
-            "unavailable": "Недоступний",
-            "unknown": "Невідомо"
+    "supervisor": {
+        "backup": {
+            "delete_backup_confirm": "видалити",
+            "delete_selected": "Видалити обрані знімки",
+            "failed_to_delete": "Помилка при видаленні",
+            "passwords_not_matching": "Паролі не збігаються"
         }
     },
     "ui": {
@@ -110,13 +118,13 @@
         },
         "card": {
             "alarm_control_panel": {
-                "arm_away": "Охорона (не вдома)",
-                "arm_custom_bypass": "Користувацький обхід",
-                "arm_home": "Поставити на охорону",
-                "arm_night": "Нічна охорона",
-                "clear_code": "Очистити",
+                "arm_away": "ARM AWAY",
+                "arm_custom_bypass": "Охорона з винятками",
+                "arm_home": "ARM HOME",
+                "arm_night": "ARM NIGHT",
+                "clear_code": "CLEAR",
                 "code": "Код",
-                "disarm": "Зняти з охорони"
+                "disarm": "DISARM"
             },
             "automation": {
                 "last_triggered": "Останній запуск",
@@ -406,10 +414,10 @@
                 "documentation": "документації",
                 "learn_adding_local_media": "Детальніше про додавання мультимедіа читайте в {documentation}.",
                 "local_media_files": "Розмістіть відео, аудіо та графіку в медіа-каталозі, щоб мати змогу переглядати та відтворювати їх у браузері або на підтримуваних медіапрогравачах.",
+                "media-player-browser": "Переглядач мультимедіа",
                 "media_browsing_error": "Помилка перегляду мультимедіа",
                 "media_not_supported": "Цей тип мультимедіа не підтримується.",
                 "media_player": "Медіапрогравач",
-                "media-player-browser": "Переглядач мультимедіа",
                 "no_items": "Немає елементів",
                 "no_local_media_found": "У локальному сховищі не знайдено медіафайлів.",
                 "no_media_folder": "Схоже, що Ви ще не створили каталог мультимедіа.",
@@ -484,6 +492,7 @@
             "config_entry_system_options": {
                 "enable_new_entities_description": "{integration} буде автоматично додавати в Home Assistant виявлені об'єкти",
                 "enable_new_entities_label": "Додавати нові об'єкти.",
+                "restart_home_assistant": " Для застосування змін слід перезапустити Home Assistant",
                 "title": "Параметри системи для {integration}",
                 "update": "Оновити"
             },
@@ -658,7 +667,6 @@
                         "integrations": "Інтеграція",
                         "logs": "Журнал сервера",
                         "lovelace": "Інформаційні панелі Lovelace",
-                        "navigate_to": "Відкрити \"{panel}\"",
                         "person": "Особи",
                         "scene": "Сцени",
                         "script": "Скрипти",
@@ -834,7 +842,6 @@
                             "introduction": "Дії - це те, що зробить Home Assistant, коли спрацює правило автоматизації.\n\n[Докладніше про дії.] (https://home-assistant.io/docs/automation/action/)",
                             "learn_more": "Докладніше про дії",
                             "name": "Дія",
-                            "type_select": "Тип дії",
                             "type": {
                                 "choose": {
                                     "add_option": "Додати опцію",
@@ -867,7 +874,6 @@
                                 "repeat": {
                                     "label": "Повторити",
                                     "sequence": "Дії",
-                                    "type_select": "Режим повторення",
                                     "type": {
                                         "count": {
                                             "label": "Лічильник"
@@ -880,7 +886,8 @@
                                             "conditions": "Дії будуть виконуватися в циклі до тих пір, поки виконуються наступні умови",
                                             "label": "Поки"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Режим повторення"
                                 },
                                 "scene": {
                                     "label": "Активувати сцену"
@@ -900,6 +907,7 @@
                                     "wait_template": "Шаблон очікування"
                                 }
                             },
+                            "type_select": "Тип дії",
                             "unsupported_action": "Непідтримувана дія: {action}"
                         },
                         "alias": "Назва",
@@ -918,7 +926,6 @@
                             "introduction": "Умови є необов'язковою частиною правила автоматизації і можуть використовуватися для запобігання дії, що відбувається під час запуску. Умови виглядають дуже схоже на тригери, але вони різні. Тригер буде дивитися на події, що відбуваються в системі, в той час як умова тільки дивиться на те, як система виглядає зараз. Тригер може спостерігати, що перемикач включений. Умова може бачити тільки, якщо перемикач ввімкнено або вимкнено. \n\n [Докладніше про умови.] (https://home-assistant.io/docs/scripts/conditions/)",
                             "learn_more": "Докладніше про умови",
                             "name": "Умова",
-                            "type_select": "Тип умови",
                             "type": {
                                 "and": {
                                     "label": "Та"
@@ -977,12 +984,17 @@
                                         "wed": "Середа"
                                     }
                                 },
+                                "trigger": {
+                                    "label": "Тригер",
+                                    "no_triggers": "Тригери відсутні"
+                                },
                                 "zone": {
                                     "entity": "Місцезнаходження сутності",
                                     "label": "Зона",
                                     "zone": "Зона"
                                 }
                             },
+                            "type_select": "Тип умови",
                             "unsupported_condition": "Непідтримувана умова: {condition}"
                         },
                         "copy_to_clipboard": "Копіювати до буфера обміну",
@@ -1022,7 +1034,6 @@
                             "introduction": "Тригери - це те, що починає обробляти правило автоматизації. Можна вказати декілька тригерів для одного і того ж правила. Після запуску тригера, Home Assistant перевірить умови, і, якщо такі є, виконає дії. \n\n [Докладніше про тригери.] (https://home-assistant.io/docs/automation/trigger/)",
                             "learn_more": "Докладніше про тригери",
                             "name": "Тригер",
-                            "type_select": "Тип тригера",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1087,18 +1098,18 @@
                                     "label": "Шаблон",
                                     "value_template": "Значення шаблону"
                                 },
-                                "time_pattern": {
-                                    "hours": "Годин",
-                                    "label": "Шаблон часу",
-                                    "minutes": "Хвилин",
-                                    "seconds": "Секунд"
-                                },
                                 "time": {
                                     "at": "О",
                                     "label": "Час",
                                     "type_input": "Значення помічника дати й часу",
                                     "type_value": "Фіксований час"
                                 },
+                                "time_pattern": {
+                                    "hours": "Годин",
+                                    "label": "Шаблон часу",
+                                    "minutes": "Хвилин",
+                                    "seconds": "Секунд"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Ідентифікатор Webhook"
@@ -1112,6 +1123,7 @@
                                     "zone": "Зона"
                                 }
                             },
+                            "type_select": "Тип тригера",
                             "unsupported_platform": "Непідтримувана платформа: {platform}"
                         },
                         "unsaved_confirm": "У вас є незбережені зміни. Ви впевнені, що хочете вийти?"
@@ -1246,9 +1258,9 @@
                             "loading": "Завантаження ...",
                             "manage": "Керування",
                             "no_hooks_yet": "Схоже, у вас ще немає Webhooks. Почніть із налаштування ",
+                            "no_hooks_yet2": " або створивши ",
                             "no_hooks_yet_link_automation": "автоматизацію Webhook",
                             "no_hooks_yet_link_integration": "інтеграції на основі Webhook",
-                            "no_hooks_yet2": " або створивши ",
                             "title": "Webhook"
                         }
                     },
@@ -1492,7 +1504,8 @@
                     "scripts": "Скрипти",
                     "unknown_error": "Невідома помилка",
                     "unnamed_device": "Пристрій без імені",
-                    "update": "Оновити"
+                    "update": "Оновити",
+                    "update_device_error": "Помилка оновлення пристрою"
                 },
                 "entities": {
                     "caption": "Сутності",
@@ -1544,10 +1557,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Очистити",
-                    "filtering_by": "Фільтрування за"
-                },
                 "header": "Налаштуваня Home Assistant",
                 "helpers": {
                     "caption": "Помічники",
@@ -1596,16 +1605,11 @@
                     "path_configuration": "Шлях до configuration.yaml: {path}",
                     "server": "сервер",
                     "source": "Вихідний код:",
-                    "system_health_error": "Компонент System Health не завантажено. Додайте 'system_health:' в файл 'configuration.yaml'.",
                     "system_health": {
                         "manage": "Керування",
                         "more_info": "додаткова інформація"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "сторінка інтеграцій",
-                    "missing_zha": "Відсутня панель конфігурації ZHA? Налаштування ZHA тепер знаходяться на {integrations_page} в картці ZHA.",
-                    "missing_zwave": "Відсутня панель конфігурації Z-Wave? Налаштування Z-Wave тепер знаходяться на {integrations_page} в картці Z-Wave."
+                    },
+                    "system_health_error": "Компонент System Health не завантажено. Додайте 'system_health:' в файл 'configuration.yaml'."
                 },
                 "integrations": {
                     "add_integration": "Додати інтеграцію",
@@ -1624,7 +1628,6 @@
                         "hub": "Підключено через",
                         "manuf": "виробник: {manufacturer}",
                         "no_area": "Приміщення не вказано",
-                        "options": "Параметри",
                         "reload": "Перезавантажити",
                         "reload_confirm": "Інтеграція була перезавантажена",
                         "reload_restart_confirm": "Перезапустіть Home Assistant, щоб закінчити перезавантаження цієї інтеграції",
@@ -1645,7 +1648,7 @@
                             "open_site": "Відкрити веб-сайт"
                         },
                         "finish": "Закінчити",
-                        "loading_first_time": "Зачекайте, поки інсталюється інтеграція",
+                        "next": "Далі",
                         "not_all_required_fields": "Не всі обов'язкові поля заповнені.",
                         "submit": "Надіслати"
                     },
@@ -1660,7 +1663,6 @@
                         "confirm_delete_ignore_title": "Припинити ігнорування {name}?",
                         "confirm_ignore": "Ви дійсно не бажаєте встановити цю інтеграцію? Ви можете скасувати це, натиснувши кнопку \"Показати проігноровані інтеграції\" в меню в правому верхньому кутку.",
                         "confirm_ignore_title": "Ігнорувати виявлення інтеграції {name}?",
-                        "hide_ignored": "Приховати ігноровані інтеграції",
                         "ignore": "Ігнорувати",
                         "ignored": "Ігнорується",
                         "show_ignored": "Показати ігноровані інтеграції",
@@ -1771,7 +1773,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Налаштувати",
                     "description_listen": "Слухати тему",
                     "description_publish": "Опублікувати дані",
                     "listening_to": "Слухати",
@@ -1785,7 +1786,6 @@
                     "topic": "Тема"
                 },
                 "ozw": {
-                    "button": "Параметри",
                     "common": {
                         "controller": "Контролер",
                         "instance": "Екземпляр",
@@ -1810,6 +1810,11 @@
                         "nodes": "Вузли",
                         "select_instance": "Вибір екземпляра"
                     },
+                    "network": {
+                        "header": "Керування мережею",
+                        "introduction": "Керування мережевими функціями.",
+                        "node_count": "{count} вузлів"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "Всі вузли були опитані",
@@ -1830,10 +1835,9 @@
                         "starting": "Запускається",
                         "unknown": "Невідомо"
                     },
-                    "network": {
-                        "header": "Керування мережею",
-                        "introduction": "Керування мережевими функціями.",
-                        "node_count": "{count} вузлів"
+                    "node": {
+                        "button": "Детальніше про вузол",
+                        "not_found": "Вузол не знайдено"
                     },
                     "node_config": {
                         "header": "Налаштування вузла",
@@ -1863,10 +1867,6 @@
                         "versions": "Отримання відомостей про версії мікропрограми та класи команд",
                         "wakeup": "Налаштування підтримки черг пробудження і повідомлень"
                     },
-                    "node": {
-                        "button": "Детальніше про вузол",
-                        "not_found": "Вузол не знайдено"
-                    },
                     "nodes_table": {
                         "failed": "Збій",
                         "id": "Ідентифікатор",
@@ -1963,6 +1963,7 @@
                         "add_scene": "Додати сцену",
                         "delete_confirm": "Ви впевнені, що хочете видалити цю сцену?",
                         "delete_scene": "Видалити сцену",
+                        "duplicate_scene": "Дублювати сцену",
                         "edit_scene": "Редагувати сцену",
                         "header": "Редактор сцен",
                         "headers": {
@@ -2011,6 +2012,7 @@
                     },
                     "picker": {
                         "add_script": "Додати скрипт",
+                        "dev_script": "Налагодити скрипт",
                         "duplicate": "Дублювати",
                         "duplicate_script": "Дублювати",
                         "edit_script": "Редагувати скрипт",
@@ -2167,7 +2169,6 @@
                         "search_again": "Повторити пошук",
                         "spinner": "Пошук пристроїв ZHA Zigbee ..."
                     },
-                    "button": "Налаштувати",
                     "cluster_attributes": {
                         "attributes_of_cluster": "Атрибути вибраного кластера",
                         "get_zigbee_attribute": "Отримати атрибут Zigbee",
@@ -2274,7 +2275,6 @@
                     "no_zones_created_yet": "Схоже, ви ще не створили жодної зони."
                 },
                 "zwave": {
-                    "button": "Налаштувати",
                     "common": {
                         "index": "Індекс",
                         "instance": "Екземпляр",
@@ -2357,6 +2357,17 @@
                     "values": {
                         "header": "Значення вузлів"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "interview_started": "Пристрій опитується. Це може зайняти деякий час."
+                    },
+                    "common": {
+                        "reconfigure_server": "Налаштувати сервер повторно"
+                    },
+                    "node_config": {
+                        "parameter": "Параметр"
+                    }
                 }
             },
             "custom": {
@@ -2432,22 +2443,6 @@
                     }
                 }
             },
-            "history": {
-                "ranges": {
-                    "last_week": "Минулого тижня",
-                    "this_week": "Цього тижня",
-                    "today": "Сьогодні",
-                    "yesterday": "Вчора"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Минулого тижня",
-                    "this_week": "Цього тижня",
-                    "today": "Сьогодні",
-                    "yesterday": "Вчора"
-                }
-            },
             "lovelace": {
                 "add_entities": {
                     "generated_unsupported": "Цю функцію можна використовувати тільки після отримання контролю над інтерфейсом користувача Lovelace.",
@@ -2551,7 +2546,6 @@
                         "entities": {
                             "description": "Картка \"Entities\" - найпоширеніший тип карт. Вона об'єднує елементи у списки.",
                             "edit_special_row": "Щоб переглянути відомості про цей рядок, натисніть кнопку редагування",
-                            "entity_row_editor": "Редактор рядків сутності",
                             "entity_row": {
                                 "attribute": "Атрибут",
                                 "button": "Кнопка",
@@ -2563,6 +2557,7 @@
                                 "section": "Розділ",
                                 "weblink": "Посилання на веб-сторінку"
                             },
+                            "entity_row_editor": "Редактор рядків сутності",
                             "name": "Об'єкти",
                             "secondary_info_values": {
                                 "brightness": "Яскравість",
@@ -2831,7 +2826,6 @@
                         "unsaved_changes": "Незбережені зміни"
                     },
                     "save_config": {
-                        "cancel": "Залишити як є",
                         "close": "Закрити",
                         "empty_config": "Почати з порожньої панелі",
                         "header": "Візьміть під свій контроль Lovelace UI",
@@ -2860,8 +2854,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Перша картка буде розтягнута на всю ширину. Інші картки і піктограми не будуть відображатися на цій вкладці",
-                            "title": "Панельний режим",
                             "warning_multiple_cards": "На цій вкладці кілька карток. У режимі панелі може відображатися тільки одна картка."
                         }
                     }
@@ -3070,7 +3062,7 @@
                 },
                 "intro": "Чи готові Ви розбудити свій будинок, повернути свою конфіденційність і приєднатися до всесвітньої спільноти?",
                 "restore": {
-                    "description": "Відновлення попереднього стану з образу файлової системи (snapshot)",
+                    "description": "Відновлення попереднього стану з образу файлової системи (backup)",
                     "hide_log": "Приховати повний журнал",
                     "in_progress": "Триває відновлення",
                     "show_log": "Показати повний журнал"
@@ -3150,6 +3142,12 @@
                     "prompt_copy_token": "Скопіюйте Ваш токен доступу. Він більше не буде показаний.",
                     "prompt_name": "Назва токена"
                 },
+                "mfa": {
+                    "confirm_disable": "Ви впевнені, що хочете вимкнути {name} ?",
+                    "disable": "Вимкнути",
+                    "enable": "Увімкнути",
+                    "header": "Модулі багатофакторної аутентифікації"
+                },
                 "mfa_setup": {
                     "close": "Закрити",
                     "step_done": "Налаштування виконано для {step}",
@@ -3157,12 +3155,6 @@
                     "title_aborted": "Скасовано",
                     "title_success": "Успішно!"
                 },
-                "mfa": {
-                    "confirm_disable": "Ви впевнені, що хочете вимкнути {name} ?",
-                    "disable": "Вимкнути",
-                    "enable": "Увімкнути",
-                    "header": "Модулі багатофакторної аутентифікації"
-                },
                 "push_notifications": {
                     "add_device_prompt": {
                         "input_label": "Ім'я пристрою",
@@ -3204,6 +3196,9 @@
                     "primary_color": "Основний колір",
                     "reset": "Скинути"
                 },
+                "time_format": {
+                    "dropdown_label": "Формат часу"
+                },
                 "vibrate": {
                     "description": "Отримувати тактильний відгук при управлінні пристроями",
                     "header": "Вібрувати"
diff --git a/translations/frontend/vi.json b/translations/frontend/vi.json
index 0ea9aa23f4..438bf87e62 100644
--- a/translations/frontend/vi.json
+++ b/translations/frontend/vi.json
@@ -17,6 +17,14 @@
         "shopping_list": "Danh sách mua sắm",
         "states": "Tổng quan"
     },
+    "state": {
+        "default": {
+            "off": "Tắt",
+            "on": "Bật",
+            "unavailable": "Không có sẵn",
+            "unknown": "Chưa biết"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -85,14 +93,6 @@
             "not_home": "Đi vắng"
         }
     },
-    "state": {
-        "default": {
-            "off": "Tắt",
-            "on": "Bật",
-            "unavailable": "Không có sẵn",
-            "unknown": "Chưa biết"
-        }
-    },
     "ui": {
         "auth_store": {
             "ask": "Bạn có muốn lưu thông tin đăng nhập này không?",
@@ -365,10 +365,10 @@
                 "documentation": "tài liệu",
                 "learn_adding_local_media": "Tìm hiểu thêm về cách thêm nội dung đa phương tiện trong {documentation} .",
                 "local_media_files": "Đặt các tệp video, âm thanh và hình ảnh của bạn vào thư mục media để có thể duyệt và phát chúng trong trình duyệt hoặc trên các trình phát đa phương tiện được hỗ trợ.",
+                "media-player-browser": "Trình duyệt Đa phương tiện",
                 "media_browsing_error": "Lỗi trình Duyệt Đa phương tiện",
                 "media_not_supported": "Trình phát Đa phương tiện không hỗ trợ loại này",
                 "media_player": "Trình phát Đa phương tiện",
-                "media-player-browser": "Trình duyệt Đa phương tiện",
                 "no_items": "Không có mục nào",
                 "no_local_media_found": "Không tìm thấy nội dung đa phương tiện cục bộ nào",
                 "no_media_folder": "Có vẻ như bạn chưa tạo thư mục đa phương tiện.",
@@ -630,7 +630,6 @@
                             "introduction": "Hành động là những gì Home Assistant sẽ làm khi tự động hóa được kích hoạt.",
                             "learn_more": "Tìm hiểu thêm về Hành động",
                             "name": "Hành động",
-                            "type_select": "Loại hành động",
                             "type": {
                                 "choose": {
                                     "add_option": "Thêm tùy chọn",
@@ -662,7 +661,6 @@
                                 "repeat": {
                                     "label": "Lặp lại",
                                     "sequence": "Hành động",
-                                    "type_select": "Dạng lặp lại",
                                     "type": {
                                         "count": {
                                             "label": "Đếm"
@@ -675,7 +673,8 @@
                                             "conditions": "Trong khi còn thoả điều kiện",
                                             "label": "Trong khi"
                                         }
-                                    }
+                                    },
+                                    "type_select": "Dạng lặp lại"
                                 },
                                 "service": {
                                     "label": "Gọi dịch vụ"
@@ -692,6 +691,7 @@
                                     "wait_template": "Mẫu chờ"
                                 }
                             },
+                            "type_select": "Loại hành động",
                             "unsupported_action": "Hành động không được hỗ trợ: {action}"
                         },
                         "alias": "Tên",
@@ -704,7 +704,6 @@
                             "introduction": "Điều kiện là tùy chọn và sẽ ngăn chặn việc thực hiện các hành động tiếp theo trừ phi tất cả các điều kiện đều được thoả mãn.",
                             "learn_more": "Tìm hiểu thêm về Điều kiện",
                             "name": "Điều kiện",
-                            "type_select": "Loại điều kiện",
                             "type": {
                                 "device": {
                                     "condition": "Điều kiện"
@@ -757,6 +756,7 @@
                                     "zone": "Vùng"
                                 }
                             },
+                            "type_select": "Loại điều kiện",
                             "unsupported_condition": "Điều kiện không được hỗ trợ bởi Giao diện đồ hoạ: {condition}"
                         },
                         "default_name": "Thêm Tự động hóa",
@@ -791,7 +791,6 @@
                             "introduction": "Bộ khởi động là bất cứ điều gì kích hoạt quá trình xử lý một quy tắc tự động hoá. Có thể chỉ định nhiều Bộ khởi động cho cùng một quy tắc. Khi kích hoạt một bộ khởi động, Home Assistant  sẽ xác nhận các điều kiện, nếu có, và gọi hành động.",
                             "learn_more": "Tìm hiểu thêm về Kích hoạt",
                             "name": "Kích hoạt",
-                            "type_select": "Loại Bộ khởi động",
                             "type": {
                                 "device": {
                                     "trigger": "Kích hoạt"
@@ -847,18 +846,18 @@
                                     "label": "Mẫu",
                                     "value_template": "Mẫu giá trị (tùy chọn)"
                                 },
-                                "time_pattern": {
-                                    "hours": "Giờ",
-                                    "label": "Mẫu thời gian",
-                                    "minutes": "Phút",
-                                    "seconds": "Giây"
-                                },
                                 "time": {
                                     "at": "Lúc",
                                     "label": "Thời gian",
                                     "type_input": "Giá trị của một hỗ trợ dạng ngày/giờ",
                                     "type_value": "Thời gian cố định"
                                 },
+                                "time_pattern": {
+                                    "hours": "Giờ",
+                                    "label": "Mẫu thời gian",
+                                    "minutes": "Phút",
+                                    "seconds": "Giây"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -872,6 +871,7 @@
                                     "zone": "Vùng"
                                 }
                             },
+                            "type_select": "Loại Bộ khởi động",
                             "unsupported_platform": "Nền tảng không được hỗ trợ bởi Giao diện đồ hoạ: {platform}"
                         },
                         "unsaved_confirm": "Bạn đang có thay đổi chưa được lưu. Bạn có chắc muốn huỷ bỏ?"
@@ -1062,10 +1062,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "Xoá",
-                    "filtering_by": "Lọc bởi"
-                },
                 "header": "Cấu hình Home Assistant",
                 "helpers": {
                     "caption": "Người hỗ trợ",
@@ -1108,11 +1104,6 @@
                     "server": "máy chủ",
                     "source": "Nguồn:"
                 },
-                "integration_panel_move": {
-                    "link_integration_page": "trang các tích hợp",
-                    "missing_zha": "Thiếu bảng cấu hình ZHA? Nó đã được chuyển đến mục ZHA trong {integrations_page}.",
-                    "missing_zwave": "Thiếu bảng cấu hình Z-Wave? Nó đã được chuyển đến mục Z-Wave trên {integrations_page} ."
-                },
                 "integrations": {
                     "add_integration": "Thêm tích hợp",
                     "attention": "Cần chú ý",
@@ -1128,7 +1119,6 @@
                         "firmware": "Firmware: {version}",
                         "manuf": "bởi {manufacturer}",
                         "no_area": "Không có khu vực",
-                        "options": "Tùy Chọn",
                         "reload": "Tải lại",
                         "reload_confirm": "Tích hợp đã được tải lại",
                         "reload_restart_confirm": "Khởi động lại Home Assistant để hoàn tất tải lại tích hợp này",
@@ -1148,7 +1138,6 @@
                             "open_site": "Mở trang web"
                         },
                         "finish": "Hoàn thành",
-                        "loading_first_time": "Vui lòng chờ trong khi tích hợp đang được cài đặt",
                         "not_all_required_fields": "Không phải tất cả các trường bắt buộc đều đã được điền.",
                         "submit": "Gửi đi"
                     },
@@ -1160,7 +1149,6 @@
                     "ignore": {
                         "confirm_delete_ignore_title": "Ngừng bỏ qua {name}?",
                         "confirm_ignore_title": "Bỏ qua tự động phát hiện {name}?",
-                        "hide_ignored": "Ẩn các tích hợp bị bỏ qua",
                         "ignore": "Bỏ qua",
                         "ignored": "Đã bỏ qua",
                         "show_ignored": "Hiển thị các tích hợp bị bỏ qua",
@@ -1269,7 +1257,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "Cấu hình",
                     "description_listen": "Nghe một chủ đề",
                     "description_publish": "Công bố một gói tin",
                     "listening_to": "Lắng nghe",
@@ -1286,13 +1273,13 @@
                     "navigation": {
                         "nodes": "Các nút"
                     },
-                    "network_status": {
-                        "unknown": "không xác định"
-                    },
                     "network": {
                         "header": "Quản lý Mạng lưới",
                         "node_count": "{count} nút"
                     },
+                    "network_status": {
+                        "unknown": "không xác định"
+                    },
                     "node": {
                         "button": "Chi tiết Nút",
                         "not_found": "Không tìm thấy nút"
@@ -1531,7 +1518,6 @@
                         "pairing_mode": "Đảm bảo các thiết bị của bạn đang ở chế độ ghép nối. Kiểm tra hướng dẫn đi kèm thiết bị về cách làm điều này.",
                         "spinner": "Tìm kiếm các thiết bị ZHA Zigbee ..."
                     },
-                    "button": "Cấu hình",
                     "clusters": {
                         "header": "Các Cụm"
                     },
@@ -1597,7 +1583,6 @@
                     "no_zones_created_yet": "Có vẻ như bạn chưa tạo ra bất kỳ khu vực nào."
                 },
                 "zwave": {
-                    "button": "Cấu hình",
                     "common": {
                         "index": "Mục lục",
                         "value": "Giá trị"
@@ -1701,22 +1686,6 @@
                     }
                 }
             },
-            "history": {
-                "ranges": {
-                    "last_week": "Tuần trước",
-                    "this_week": "Tuần này",
-                    "today": "Hôm nay",
-                    "yesterday": "Hôm qua"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "Tuần trước",
-                    "this_week": "Tuần này",
-                    "today": "Hôm nay",
-                    "yesterday": "Hôm qua"
-                }
-            },
             "lovelace": {
                 "add_entities": {
                     "generated_unsupported": "Bạn chỉ có thể sử dụng chức năng này khi bạn lấy quyền kiểm soát giao diện Lovelace.",
@@ -1806,7 +1775,6 @@
                         "entities": {
                             "description": "Thẻ Các Thực thể là loại thẻ phổ biến nhất. Nó nhóm các mục với nhau thành một danh sách.",
                             "edit_special_row": "Xem chi tiết của hàng này bằng cách bấm nút chỉnh sửa",
-                            "entity_row_editor": "Trình soạn thảo Thực thể",
                             "entity_row": {
                                 "attribute": "Thuộc tính",
                                 "button": "Nút",
@@ -1818,6 +1786,7 @@
                                 "section": "Phần",
                                 "weblink": "Liên kết Web"
                             },
+                            "entity_row_editor": "Trình soạn thảo Thực thể",
                             "name": "Các Thực thể",
                             "secondary_info_values": {
                                 "brightness": "Độ sáng",
@@ -2007,7 +1976,6 @@
                         "unsaved_changes": "Thay đổi chưa lưu"
                     },
                     "save_config": {
-                        "cancel": "Đừng bận tâm",
                         "close": "Đóng",
                         "empty_config": "Bắt đầu với một bảng điều khiển trống",
                         "header": "Kiểm soát giao diện Lovelace của bạn",
@@ -2025,8 +1993,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "Chế độ này hiển thị thẻ đầu tiên với toàn bộ chiều rộng; các thẻ còn lại sẽ không được hiển thị.",
-                            "title": "Chế độ Bảng điều khiển?",
                             "warning_multiple_cards": "Chế độ xem này chứa nhiều thẻ, nhưng chế độ xem dạng bảng điều khiển chỉ có thể hiển thị 1 thẻ."
                         }
                     }
@@ -2285,6 +2251,12 @@
                     "prompt_copy_token": "Sao chép token truy cập của bạn. Nó sẽ không đươc hiển thị nữa.",
                     "prompt_name": "Tên?"
                 },
+                "mfa": {
+                    "confirm_disable": "Bạn có chắc chắn muốn tắt {name}?",
+                    "disable": "Vô hiệu hóa",
+                    "enable": "Kích hoạt",
+                    "header": "Các mô-đun đa xác thực"
+                },
                 "mfa_setup": {
                     "close": "Đóng",
                     "step_done": "Đã hoàn tất thiết lập cho {step}",
@@ -2292,12 +2264,6 @@
                     "title_aborted": "Bị hủy bỏ",
                     "title_success": "Thành công!"
                 },
-                "mfa": {
-                    "confirm_disable": "Bạn có chắc chắn muốn tắt {name}?",
-                    "disable": "Vô hiệu hóa",
-                    "enable": "Kích hoạt",
-                    "header": "Các mô-đun đa xác thực"
-                },
                 "push_notifications": {
                     "description": "Gửi thông báo tới thiết bị này.",
                     "error_load_platform": "Configure notify.html5.",
diff --git a/translations/frontend/zh-Hans.json b/translations/frontend/zh-Hans.json
index ae0e5929d2..7fc1e8e7b1 100644
--- a/translations/frontend/zh-Hans.json
+++ b/translations/frontend/zh-Hans.json
@@ -17,6 +17,7 @@
         "calendar": "日历",
         "config": "配置",
         "developer_tools": "开发者工具",
+        "energy": "能源",
         "history": "历史",
         "logbook": "日志",
         "mailbox": "邮箱",
@@ -26,6 +27,14 @@
         "shopping_list": "购物清单",
         "states": "概览"
     },
+    "state": {
+        "default": {
+            "off": "关",
+            "on": "开",
+            "unavailable": "不可用",
+            "unknown": "未知"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "离开"
         }
     },
-    "state": {
-        "default": {
-            "off": "关",
-            "on": "开",
-            "unavailable": "不可用",
-            "unknown": "未知"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "加载项未安装"
             }
         },
+        "backup": {
+            "addons": "加载项",
+            "confirm_password": "确认快照密码",
+            "could_not_create": "未能创建快照",
+            "create": "创建",
+            "create_blocked_not_running": "现在无法创建快照，因为系统处于{state}状态。",
+            "created": "创建于",
+            "delete_backup_confirm": "删除",
+            "delete_selected": "删除选定的快照",
+            "enter_password": "请输入密码。",
+            "failed_to_delete": "删除失败",
+            "folders": "文件夹",
+            "name": "名称",
+            "password": "密码",
+            "password_protection": "密码保护",
+            "passwords_not_matching": "密码不匹配",
+            "select_type": "请选择要还原的内容",
+            "selected": "已选择 {number} 项",
+            "type": "类型"
+        },
         "common": {
             "cancel": "取消",
             "close": "关闭",
@@ -366,9 +387,6 @@
                 "text": "您确定要重启已更改的加载项吗？"
             },
             "update": {
-                "create_snapshot": "在更新前为 {name} 创建快照",
-                "snapshot": "快照",
-                "snapshotting": "正在为 {name} 创建快照",
                 "updating": "正在更新 {name} 至版本 {version}"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "仪表盘",
-            "snapshots": "快照",
             "store": "加载项商店",
             "system": "系统"
         },
-        "snapshot": {
-            "addons": "加载项",
-            "available_snapshots": "可用快照",
-            "confirm_password": "确认快照密码",
-            "could_not_create": "未能创建快照",
-            "create": "创建",
-            "create_blocked_not_running": "现在无法创建快照，因为系统处于{state}状态。",
-            "create_snapshot": "创建快照",
-            "created": "创建于",
-            "delete_selected": "删除选定的快照",
-            "delete_snapshot_confirm": "删除",
-            "delete_snapshot_text": "是否要删除这 {number} 个快照？",
-            "delete_snapshot_title": "删除快照",
-            "description": "“快照”使您可以轻松地备份和还原 Home Assistant 实例的所有数据。",
-            "enter_password": "请输入密码。",
-            "failed_to_delete": "删除失败",
-            "folder": {
-                "addons/local": "本地加载项",
-                "homeassistant": "Home Assistant 配置",
-                "media": "媒体",
-                "share": "分享",
-                "ssl": "SSL"
-            },
-            "folders": "文件夹",
-            "full_snapshot": "完整快照",
-            "name": "名称",
-            "no_snapshots": "您还没有快照。",
-            "partial_snapshot": "部分快照",
-            "password": "密码",
-            "password_protected": "密码保护",
-            "password_protection": "密码保护",
-            "passwords_not_matching": "密码不匹配",
-            "security": "安全性",
-            "select_type": "请选择要还原的内容",
-            "selected": "已选择 {number} 项",
-            "type": "类型",
-            "upload_snapshot": "上传快照"
-        },
         "store": {
             "missing_addons": "找不到加载项设置？请在个人资料页面中启用高级模式",
             "no_results_found": "在 {repository} 中未找到结果。",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "结束日期",
+                "ranges": {
+                    "last_week": "上周",
+                    "this_week": "本周",
+                    "today": "今天",
+                    "yesterday": "昨天"
+                },
                 "select": "选定",
                 "start_date": "开始日期"
             },
@@ -815,13 +800,13 @@
                     "was_normal": "正常",
                     "was_opened": "已打开",
                     "was_plugged_in": "已插入",
-                    "was_safe": "[%key_id:6884522%]",
+                    "was_safe": "安全",
                     "was_unlocked": "已解锁",
                     "was_unplugged": "已拔出",
-                    "was_unsafe": "[%key_id:6884523%]"
+                    "was_unsafe": "不安全"
                 },
                 "retrieval_error": "获取日志条目时出错",
-                "show_trace": "显示轨迹"
+                "show_trace": "跟踪执行过程"
             },
             "media-browser": {
                 "audio_not_supported": "您的浏览器不支持音频元素。",
@@ -851,10 +836,10 @@
                 "documentation": "文档",
                 "learn_adding_local_media": "请参阅{documentation}以了解更多关于添加媒体的信息。",
                 "local_media_files": "将视频、音频和图像文件放在媒体目录中，以便在浏览器或支持的媒体播放器上浏览和播放这些文件。",
+                "media-player-browser": "媒体播放浏览器",
                 "media_browsing_error": "媒体浏览错误",
                 "media_not_supported": "浏览器媒体播放器不支持此类型的媒体",
                 "media_player": "媒体播放器",
-                "media-player-browser": "媒体播放浏览器",
                 "no_items": "没有项目",
                 "no_local_media_found": "未找到本地媒体",
                 "no_media_folder": "您还没有创建媒体目录。",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "服务"
             },
+            "statistic-picker": {
+                "learn_more": "详细了解统计",
+                "missing_entity": "没有列出您的实体？",
+                "no_match": "未找到相关统计数据",
+                "no_statistics": "您还没有统计数据",
+                "statistic": "统计数据"
+            },
+            "statistics_charts": {
+                "loading_statistics": "正在加载统计信息...",
+                "no_statistics_found": "没有找到统计信息。",
+                "statistic_types": {
+                    "max": "最大值",
+                    "mean": "平均值",
+                    "min": "最小值",
+                    "sum": "求和"
+                }
+            },
             "target-picker": {
                 "add_area_id": "选择区域",
                 "add_device_id": "选择设备",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "选项"
                 },
+                "loading": {
+                    "loading_flow": "正在初始化 {integration} 的选项，请稍候",
+                    "loading_step": "正在加载 {integration} 的后续步骤"
+                },
                 "success": {
                     "description": "选项已成功保存。"
                 }
@@ -1125,13 +1131,13 @@
                         "core": "通用",
                         "customize": "自定义",
                         "devices": "设备",
+                        "energy": "能源",
                         "entities": "实体注册表",
                         "helpers": "辅助元素",
                         "info": "信息",
                         "integrations": "集成",
                         "logs": "日志",
                         "lovelace": "Lovelace 仪表盘",
-                        "navigate_to": "转到 {panel}",
                         "person": "人员",
                         "scene": "场景",
                         "script": "脚本",
@@ -1360,7 +1366,6 @@
                             "introduction": "“动作”是当自动化条件满足时 Home Assistant 执行的操作。",
                             "learn_more": "详细了解动作",
                             "name": "执行",
-                            "type_select": "动作类型",
                             "type": {
                                 "choose": {
                                     "add_option": "添加选项",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "重复",
                                     "sequence": "动作",
-                                    "type_select": "重复类型",
                                     "type": {
                                         "count": {
                                             "label": "按次数"
@@ -1414,7 +1418,8 @@
                                             "conditions": "While 条件",
                                             "label": "满足条件就循环"
                                         }
-                                    }
+                                    },
+                                    "type_select": "重复类型"
                                 },
                                 "scene": {
                                     "label": "激活场景"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "等待模板"
                                 }
                             },
+                            "type_select": "动作类型",
                             "unsupported_action": "图形界面暂不支持操作：{action}"
                         },
                         "alias": "名称",
@@ -1452,7 +1458,6 @@
                             "introduction": "“环境条件”是自动化流程中的可选部分。除非所有环境条件都符合，否则“动作”不会执行。",
                             "learn_more": "详细了解环境条件",
                             "name": "环境条件",
-                            "type_select": "环境条件类型",
                             "type": {
                                 "and": {
                                     "label": "并且"
@@ -1513,12 +1518,18 @@
                                         "wed": "星期三"
                                     }
                                 },
+                                "trigger": {
+                                    "id": "触发条件 ID",
+                                    "label": "触发条件",
+                                    "no_triggers": "没有可用的触发条件。"
+                                },
                                 "zone": {
                                     "entity": "位置追踪设备",
                                     "label": "地点",
                                     "zone": "地点"
                                 }
                             },
+                            "type_select": "环境条件类型",
                             "unsupported_condition": "图形界面暂不支持环境条件：{condition}"
                         },
                         "copy_to_clipboard": "复制到剪贴板",
@@ -1549,17 +1560,17 @@
                         "move_down": "下移",
                         "move_up": "上移",
                         "save": "保存",
-                        "show_trace": "显示轨迹",
+                        "show_trace": "跟踪执行过程",
                         "triggers": {
                             "add": "添加触发条件",
                             "delete": "删除",
                             "delete_confirm": "确认删除？",
                             "duplicate": "复制",
                             "header": "触发条件",
+                            "id": "触发条件 ID（用于“触发条件”环境条件）",
                             "introduction": "“触发条件”是整个自动化流程的起点。一个自动化规则中可以设置多个触发条件。一旦该条件满足，Home Assistant 将验证“环境条件”是否符合，如果符合，则执行“动作”。",
                             "learn_more": "详细了解触发条件",
                             "name": "触发条件",
-                            "type_select": "触发条件类型",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1625,18 +1636,18 @@
                                     "label": "自定义模板",
                                     "value_template": "数值模板"
                                 },
-                                "time_pattern": {
-                                    "hours": "小时",
-                                    "label": "时间模式",
-                                    "minutes": "分",
-                                    "seconds": "秒"
-                                },
                                 "time": {
                                     "at": "时间为",
                                     "label": "时间",
                                     "type_input": "“日期/时间”辅助元素的值",
                                     "type_value": "固定时间"
                                 },
+                                "time_pattern": {
+                                    "hours": "小时",
+                                    "label": "时间模式",
+                                    "minutes": "分",
+                                    "seconds": "秒"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1650,6 +1661,7 @@
                                     "zone": "地点"
                                 }
                             },
+                            "type_select": "触发条件类型",
                             "unsupported_platform": "图形界面暂不支持平台：{platform}"
                         },
                         "unsaved_confirm": "有更改尚未保存，确定离开页面吗？"
@@ -1782,6 +1794,7 @@
                             "instance_will_be_available": "您的实例将在以下位置可用",
                             "link_learn_how_it_works": "了解其工作原理",
                             "not_connected": "未连接",
+                            "reconnecting": "正在重新连接",
                             "remote_enabled": {
                                 "caption": "自动连接",
                                 "description": "要使 Home Assistant 始终可以远程访问，请启用此选项。"
@@ -1812,9 +1825,9 @@
                             "loading": "载入中...",
                             "manage": "管理",
                             "no_hooks_yet": "您还没有 webhook。您可以配置一个",
+                            "no_hooks_yet2": "或创建一个",
                             "no_hooks_yet_link_automation": "Webhook 自动化",
                             "no_hooks_yet_link_integration": "基于 Webhook 的集成",
-                            "no_hooks_yet2": "或创建一个",
                             "title": "Webhooks"
                         }
                     },
@@ -1929,41 +1942,13 @@
                     "description": "单位制、位置、时区及其他通用参数",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "在启用此功能之前，请确保您已阅读了分析文档页面 {link}，以了解将发送的内容及其存储方式。",
-                                "header": "分析",
-                                "instance_id": "实例ID: {huuid}",
-                                "introduction": "分享您的安装信息，让 Home Assistant 变得更好，并帮助我们与厂商沟通，增加本地控制和注重隐私的功能。",
-                                "learn_more": "我们如何处理您的数据",
-                                "needs_base": "需要启用基础分析才能启用此选项",
-                                "preference": {
-                                    "base": {
-                                        "description": "实例 ID、版本号和安装类型。",
-                                        "title": "基础分析"
-                                    },
-                                    "diagnostics": {
-                                        "description": "发生意外错误时共享崩溃报告。",
-                                        "title": "诊断"
-                                    },
-                                    "statistics": {
-                                        "description": "已使用的实体、用户和其他元素数量。",
-                                        "title": "使用情况统计"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "名称、版本和功能。",
-                                        "title": "使用的集成和加载项"
-                                    },
-                                    "usage": {
-                                        "description": "名称和版本信息。",
-                                        "title": "使用的集成"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "货币",
                                 "edit_requires_storage": "编辑器已禁用，因为配置存储于 configuration.yaml。",
                                 "elevation": "海拔",
                                 "elevation_meters": "米",
                                 "external_url": "外部 URL",
+                                "find_currency_value": "我该填写什么？",
                                 "imperial_example": "华氏、磅",
                                 "internal_url": "内部 URL",
                                 "latitude": "纬度",
@@ -2092,6 +2077,63 @@
                     "update": "更新",
                     "update_device_error": "更新设备失败"
                 },
+                "energy": {
+                    "caption": "能源",
+                    "description": "监测您家中的能源消耗与产出",
+                    "device_consumption": {
+                        "add_stat": "选择要监测能耗的实体",
+                        "dialog": {
+                            "selected_stat_intro": "选择表示设备能耗的实体。"
+                        },
+                        "learn_more": "进一步了解如何开始使用。",
+                        "selected_stat": "能耗监测:",
+                        "sub": "通过监测单个设备的能耗，Home Assistant 可以将能源使用情况细化到每个设备。",
+                        "title": "单个设备"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "使用实时电价实体",
+                                "cost_entity_input": "实时电价实体",
+                                "cost_number": "使用固定价格",
+                                "cost_number_input": "每度电价格",
+                                "cost_number_suffix": "{currency}/度",
+                                "cost_para": "选择 Home Assistant 如何监测消耗电能的费用。",
+                                "cost_stat": "使用监测总费用的实体",
+                                "cost_stat_input": "监测总费用的实体",
+                                "energy_stat": "消耗电能（度）",
+                                "header": "配置用电量",
+                                "no_cost": "不监测电费",
+                                "paragraph": "用电量是从电网流向您家的电能。"
+                            },
+                            "to": {
+                                "cost_entity": "使用实时电价实体",
+                                "cost_entity_input": "实时电价实体",
+                                "cost_number": "使用固定价格",
+                                "cost_number_input": "每度电返还",
+                                "cost_number_suffix": "{currency}/度",
+                                "cost_para": "您是否通过光伏发电等方式将电能卖给电力公司，并得到电费的返还？",
+                                "cost_stat": "使用监测总返款的实体",
+                                "cost_stat_input": "监测总返款的实体",
+                                "energy_stat": "返还给电力公司的电能（度）",
+                                "header": "配置上网电量",
+                                "no_cost": "我不会得到电费返还",
+                                "paragraph": "上网电量是从您家的光伏太阳能板返还给电力公司的电量。"
+                            }
+                        },
+                        "learn_more": "进一步了解如何开始使用。",
+                        "sub": "配置从电网消耗的电量，以及自发电用户返还给电力公司的电量，以便 Home Assistant 可以监测您的全屋能源使用情况。",
+                        "title": "电力公司"
+                    },
+                    "solar": {
+                        "learn_more": "进一步了解如何开始使用。",
+                        "stat_predicted_production": "光伏发电产能预测",
+                        "stat_production": "光伏发电产出",
+                        "stat_return_to_grid": "返还给电力公司的电能",
+                        "sub": "让 Home Assistant 监控您的太阳能板，并向您展示其性能。",
+                        "title": "光伏发电"
+                    }
+                },
                 "entities": {
                     "caption": "实体注册表",
                     "description": "管理已知实体",
@@ -2142,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "清除",
-                    "filtering_by": "正在筛选:",
-                    "show": "显示"
-                },
-                "hassio": {
-                    "button": "配置"
-                },
                 "header": "配置 Home Assistant",
                 "helpers": {
                     "caption": "辅助元素",
@@ -2199,16 +2233,11 @@
                     "server": "服务器",
                     "setup_time": "启动时长",
                     "source": "源：",
-                    "system_health_error": "未加载系统健康组件。请将 'system_health:' 添加到 configuration.yaml",
                     "system_health": {
                         "manage": "管理",
                         "more_info": "更多信息"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "集成页面",
-                    "missing_zha": "找不到 ZHA 配置面板了吗？它已移动到{integrations_page}中的 ZHA 条目。",
-                    "missing_zwave": "找不到 Z-Wave 配置面板了吗？它已移动到{integrations_page}中的 Z-Wave 条目。"
+                    },
+                    "system_health_error": "未加载系统健康组件。请将 'system_health:' 添加到 configuration.yaml"
                 },
                 "integrations": {
                     "add_integration": "添加集成",
@@ -2223,8 +2252,6 @@
                         "depends_on_cloud": "依赖云端服务",
                         "device_unavailable": "设备不可用",
                         "devices": "{count} {count, plural,\n  one {个设备}\n  other {个设备}\n}",
-                        "disable_error": "启用/禁用集成失败",
-                        "disable_restart_confirm": "重启 Home Assistant 以完成此集成的禁用",
                         "disable": {
                             "disable_confirm": "您确定要禁用此配置条目吗？其设备和实体也将被禁用。",
                             "disabled": "已禁用",
@@ -2235,6 +2262,8 @@
                             },
                             "disabled_cause": "通过{cause}禁用"
                         },
+                        "disable_error": "启用/禁用集成失败",
+                        "disable_restart_confirm": "重启 Home Assistant 以完成此集成的禁用",
                         "disabled_polling": "自动轮询刷新数据已禁用",
                         "documentation": "文档",
                         "enable_restart_confirm": "重启 Home Assistant 以完成此集成的启用",
@@ -2242,11 +2271,9 @@
                         "entity_unavailable": "实体不可用",
                         "firmware": "固件：{version}",
                         "hub": "连接于",
-                        "logs": "日志",
-                        "manuf": "by {manufacturer}",
+                        "manuf": "制造商：{manufacturer}",
                         "no_area": "没有区域",
                         "not_loaded": "未加载",
-                        "options": "选项",
                         "provided_by_custom_integration": "由自定义集成提供",
                         "reload": "重载",
                         "reload_confirm": "集成已重新加载",
@@ -2278,7 +2305,11 @@
                             "open_site": "打开网站"
                         },
                         "finish": "完成",
-                        "loading_first_time": "正在安装集成，请稍候",
+                        "loading": {
+                            "fallback_title": "集成",
+                            "loading_flow": "正在设置 {integration}，请稍候",
+                            "loading_step": "正在加载 {integration} 的后续步骤"
+                        },
                         "next": "下一步",
                         "not_all_required_fields": "请填写所有必填字段",
                         "not_loaded": "集成未能加载，请尝试重启 Home Assistant。",
@@ -2295,7 +2326,6 @@
                     "details": "集成详细信息",
                     "disable": {
                         "disabled_integrations": "{number} 个已禁用",
-                        "hide_disabled": "隐藏禁用的集成",
                         "show": "显示",
                         "show_disabled": "显示禁用的集成"
                     },
@@ -2306,7 +2336,6 @@
                         "confirm_delete_ignore_title": "不再忽略 {name} 吗？",
                         "confirm_ignore": "您确定不想设置此集成吗？要撤销此操作，您可以点击右上角菜单中的“显示忽略的集成”。",
                         "confirm_ignore_title": "忽略发现的 {name}？",
-                        "hide_ignored": "隐藏忽略的集成",
                         "ignore": "忽略",
                         "ignored": "被忽略",
                         "show_ignored": "显示忽略的集成",
@@ -2426,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "配置",
                     "description_listen": "监听主题",
                     "description_publish": "发送数据包",
                     "listening_to": "监听",
@@ -2440,7 +2468,6 @@
                     "topic": "主题 (Topic)"
                 },
                 "ozw": {
-                    "button": "配置",
                     "common": {
                         "controller": "控制器",
                         "instance": "实例",
@@ -2465,6 +2492,11 @@
                         "nodes": "节点",
                         "select_instance": "选择实例"
                     },
+                    "network": {
+                        "header": "网络管理",
+                        "introduction": "管理网络功能。",
+                        "node_count": "{count} 个节点"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "已查询所有节点",
@@ -2485,10 +2517,9 @@
                         "starting": "正在启动",
                         "unknown": "未知"
                     },
-                    "network": {
-                        "header": "网络管理",
-                        "introduction": "管理网络功能。",
-                        "node_count": "{count} 个节点"
+                    "node": {
+                        "button": "节点详细信息",
+                        "not_found": "节点未找到"
                     },
                     "node_config": {
                         "header": "节点配置",
@@ -2518,10 +2549,6 @@
                         "versions": "正在获取固件和命令类版本信息",
                         "wakeup": "正在设置对唤醒队列和消息的支持"
                     },
-                    "node": {
-                        "button": "节点详细信息",
-                        "not_found": "节点未找到"
-                    },
                     "nodes_table": {
                         "failed": "故障",
                         "id": "ID",
@@ -2664,10 +2691,12 @@
                         },
                         "save_script": "保存脚本",
                         "sequence": "顺序",
-                        "sequence_sentence": "该脚本的操作顺序。"
+                        "sequence_sentence": "该脚本的操作顺序。",
+                        "show_trace": "跟踪执行过程"
                     },
                     "picker": {
                         "add_script": "添加脚本",
+                        "dev_script": "调试脚本",
                         "duplicate": "制作副本",
                         "duplicate_script": "复制脚本",
                         "edit_script": "编辑脚本",
@@ -2824,7 +2853,6 @@
                         "search_again": "再次搜索",
                         "spinner": "正在查找 ZHA Zigbee 设备......"
                     },
-                    "button": "配置",
                     "cluster_attributes": {
                         "attributes_of_cluster": "所选簇的属性",
                         "get_zigbee_attribute": "获取 Zigbee 属性",
@@ -2854,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "捷径",
-                        "update_button": "更新配置",
-                        "zha_options": {
-                            "default_light_transition": "默认灯光过渡时长（秒）",
-                            "enable_identify_on_join": "设备加入网络时启用识别效果",
-                            "title": "全局选项"
-                        }
+                        "update_button": "更新配置"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "配置完成",
@@ -2941,123 +2964,7 @@
                     "introduction": "地点用于定义世界的某个地方。若某人位于一个地点，则其状态的名称就取自该地点。地点也可用作自动化配置中的触发条件和环境条件。",
                     "no_zones_created_yet": "您还没有建立地点。"
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "取消 inclusion",
-                        "controller_in_inclusion_mode": "您的 Z-Wave 控制器现在处于 inclusion 模式。",
-                        "follow_device_instructions": "请按照设备说明书，触发设备配对。",
-                        "inclusion_failed": "无法添加该节点。请查看日志以了解更多信息。",
-                        "inclusion_finished": "节点已添加。",
-                        "interview_failed": "设备协商失败。日志中会有更多信息。",
-                        "interview_started": "设备正在重新协商。可能需要一段时间。",
-                        "introduction": "此向导将指导您向 Z-Wave 网络添加节点。",
-                        "secure_inclusion_warning": "安全设备需要额外的带宽；安全设备过多可能会降低 Z-Wave 网络的速度。建议仅当设备需要时才使用 secure inclusion，例如门锁和车库开门器。",
-                        "start_inclusion": "开始 inclusion",
-                        "start_secure_inclusion": "开始 secure inclusion",
-                        "title": "添加 Z-Wave 节点",
-                        "use_secure_inclusion": "使用 secure inclusion",
-                        "view_device": "查看设备"
-                    },
-                    "button": "配置",
-                    "common": {
-                        "add_node": "添加节点",
-                        "close": "关闭",
-                        "heal_network": "修复网络",
-                        "home_id": "家庭 ID",
-                        "network": "网络",
-                        "node_id": "节点 ID",
-                        "reconfigure_server": "重新配置服务",
-                        "remove_node": "删除节点"
-                    },
-                    "dashboard": {
-                        "driver_version": "驱动程序版本",
-                        "dump_dead_nodes_text": "有些节点没有响应。这些节点被认为离线，不会完全导出。",
-                        "dump_dead_nodes_title": "有些节点已断线",
-                        "dump_debug": "下载网络转储以便诊断问题",
-                        "dump_not_ready_confirm": "下载",
-                        "dump_not_ready_text": "如果在节点尚未全部就绪的情况下就导出，可能会丢失所需的数据。请等待一段时间以便网络查询所有节点。仍要继续创建转储吗？",
-                        "dump_not_ready_title": "仍有节点未准备就绪",
-                        "header": "管理 Z-Wave 网络",
-                        "home_id": "家庭 ID",
-                        "introduction": "管理 Z-Wave 网络和节点",
-                        "nodes_ready": "节点就绪",
-                        "server_version": "服务器版本"
-                    },
-                    "device_info": {
-                        "device_config": "配置设备",
-                        "node_ready": "节点就绪",
-                        "node_status": "节点状态",
-                        "zwave_info": "Z-Wave 信息"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "网络修复已取消。",
-                        "healing_complete": "网络修复完成。",
-                        "healing_failed": "修复失败。日志中会有更多信息。",
-                        "in_progress": "正在修复网络。可能需要一段时间。",
-                        "introduction": "在此 Z-Wave 网络上启动网络修复。网络修复会使所有设备重新计算它们到控制器的路由。如果您最近挪动了设备或控制器，建议使用此功能。",
-                        "run_in_background": "您可以关闭此对话框，网络修复将在后台继续进行。",
-                        "start_heal": "开始修复",
-                        "stop_heal": "停止修复",
-                        "title": "修复 Z-Wave 网络",
-                        "traffic_warning": "修复过程会在 Z-Wave 网络上产生大量流量。修复期间，设备可能会响应缓慢或完全无响应。"
-                    },
-                    "logs": {
-                        "log_level": "日志级别",
-                        "log_level_changed": "日志级别更改为: {level}",
-                        "subscribed_to_logs": "已订阅 Z-Wave JS 日志消息...",
-                        "title": "Z-Wave JS 日志"
-                    },
-                    "navigation": {
-                        "logs": "日志",
-                        "network": "网络"
-                    },
-                    "network_status": {
-                        "connected": "已连接",
-                        "connecting": "正在连接",
-                        "unknown": "未知"
-                    },
-                    "node_config": {
-                        "attribution": "设备配置参数和描述由 {device_database} 提供。",
-                        "battery_device_notice": "电池供电的设备必须处于唤醒状态才能更新配置。请参阅设备说明书，了解如何唤醒设备。",
-                        "error_device_not_found": "未找到设备",
-                        "header": "Z-Wave 设备配置",
-                        "introduction": "管理并调整所选设备（节点）的具体配置参数。",
-                        "parameter_is_read_only": "此参数为只读。",
-                        "set_param_accepted": "参数已更新。",
-                        "set_param_error": "发生错误。",
-                        "set_param_queued": "参数更改操作已加入队列，将在设备唤醒时更新。",
-                        "zwave_js_device_database": "Z-Wave JS 设备数据库"
-                    },
-                    "node_status": {
-                        "alive": "在线",
-                        "asleep": "睡眠",
-                        "awake": "唤醒",
-                        "dead": "断线",
-                        "unknown": "未知"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "开始重新协商之前，需要唤醒电池供电的设备。有关如何唤醒设备的说明，请参阅设备说明书。",
-                        "in_progress": "设备正在重新协商。可能需要一段时间。",
-                        "interview_complete": "设备协商完成。",
-                        "interview_failed": "设备协商失败。日志中会有更多信息。",
-                        "introduction": "重新协商 Z-Wave 网络上的设备。如果设备功能缺失或不正常，请使用此功能。",
-                        "run_in_background": "您可以关闭此对话框，协商将在后台继续进行。",
-                        "start_reinterview": "开始重新协商",
-                        "title": "重新协商 Z-Wave 设备"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "取消 exclusion",
-                        "controller_in_exclusion_mode": "您的 Z-Wave 控制器现在处于 exclusion 模式。",
-                        "exclusion_failed": "无法删除该节点。请查看日志以了解更多信息。",
-                        "exclusion_finished": "节点 {id} 已从 Z-Wave 网络中删除。",
-                        "follow_device_instructions": "请按照设备说明书，触发设备的 exclusion。",
-                        "introduction": "从 Z-Wave 网络中删除节点，并从 Home Assistant 中删除关联的设备和实体。",
-                        "start_exclusion": "开始 exclusion",
-                        "title": "删除 Z-Wave 节点"
-                    }
-                },
                 "zwave": {
-                    "button": "配置",
                     "common": {
                         "index": "索引",
                         "instance": "实例",
@@ -3146,6 +3053,144 @@
                     "values": {
                         "header": "节点值"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "取消 inclusion",
+                        "controller_in_inclusion_mode": "您的 Z-Wave 控制器现在处于 inclusion 模式。",
+                        "follow_device_instructions": "请按照设备说明书，触发设备配对。",
+                        "inclusion_failed": "无法添加该节点。请查看日志以了解更多信息。",
+                        "inclusion_finished": "节点已添加。",
+                        "interview_failed": "设备协商失败。日志中会有更多信息。",
+                        "interview_started": "设备正在重新协商。可能需要一段时间。",
+                        "introduction": "此向导将指导您向 Z-Wave 网络添加节点。",
+                        "secure_inclusion_warning": "安全设备需要额外的带宽；安全设备过多可能会降低 Z-Wave 网络的速度。建议仅当设备需要时才使用 secure inclusion，例如门锁和车库开门器。",
+                        "start_inclusion": "开始 inclusion",
+                        "start_secure_inclusion": "开始 secure inclusion",
+                        "title": "添加 Z-Wave 节点",
+                        "use_secure_inclusion": "使用 secure inclusion",
+                        "view_device": "查看设备"
+                    },
+                    "common": {
+                        "add_node": "添加节点",
+                        "close": "关闭",
+                        "heal_network": "修复网络",
+                        "home_id": "家庭 ID",
+                        "network": "网络",
+                        "node_id": "节点 ID",
+                        "reconfigure_server": "重新配置服务",
+                        "remove_node": "删除节点",
+                        "source": "源"
+                    },
+                    "dashboard": {
+                        "driver_version": "驱动程序版本",
+                        "dump_dead_nodes_text": "有些节点没有响应。这些节点被认为离线，不会完全导出。",
+                        "dump_dead_nodes_title": "有些节点已断线",
+                        "dump_debug": "下载网络转储以便诊断问题",
+                        "dump_not_ready_confirm": "下载",
+                        "dump_not_ready_text": "如果在节点尚未全部就绪的情况下就导出，可能会丢失所需的数据。请等待一段时间以便网络查询所有节点。仍要继续创建转储吗？",
+                        "dump_not_ready_title": "仍有节点未准备就绪",
+                        "header": "管理 Z-Wave 网络",
+                        "home_id": "家庭 ID",
+                        "introduction": "管理 Z-Wave 网络和节点",
+                        "nodes_ready": "节点就绪",
+                        "server_version": "服务器版本"
+                    },
+                    "device_info": {
+                        "device_config": "配置设备",
+                        "heal_node": "修复节点",
+                        "node_ready": "节点就绪",
+                        "node_status": "节点状态",
+                        "reinterview_device": "重新协商设备",
+                        "remove_failed": "删除故障设备",
+                        "zwave_info": "Z-Wave 信息"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "网络修复已取消。",
+                        "healing_complete": "网络修复完成。",
+                        "healing_failed": "修复失败。日志中会有更多信息。",
+                        "in_progress": "正在修复网络。可能需要一段时间。",
+                        "introduction": "在此 Z-Wave 网络上启动网络修复。网络修复会使所有设备重新计算它们到控制器的路由。如果您最近挪动了设备或控制器，建议使用此功能。",
+                        "run_in_background": "您可以关闭此对话框，网络修复将在后台继续进行。",
+                        "start_heal": "开始修复",
+                        "stop_heal": "停止修复",
+                        "title": "修复 Z-Wave 网络",
+                        "traffic_warning": "修复过程会在 Z-Wave 网络上产生大量流量。修复期间，设备可能会响应缓慢或完全无响应。"
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} 已修复。",
+                        "healing_failed": "{device} 无法修复。",
+                        "healing_failed_check_logs": "日志中会有更多信息。",
+                        "in_progress": "{device} 修复正在进行。",
+                        "introduction": "通知 {device} 重新计算它们到控制器的路由。如果您最近挪动了设备或控制器，此功能有助于解决通信问题。",
+                        "network_heal_in_progress": "Z-Wave 网络修复正在进行中。请等待其完成后再修复单个设备。",
+                        "start_heal": "修复设备",
+                        "title": "修复 Z-Wave 设备",
+                        "traffic_warning": "修复过程会在 Z-Wave 网络上产生大量流量。修复期间，设备可能会响应缓慢或完全无响应。"
+                    },
+                    "logs": {
+                        "log_level": "日志级别",
+                        "log_level_changed": "日志级别更改为: {level}",
+                        "subscribed_to_logs": "已订阅 Z-Wave JS 日志消息...",
+                        "title": "Z-Wave JS 日志"
+                    },
+                    "navigation": {
+                        "logs": "日志",
+                        "network": "网络"
+                    },
+                    "network_status": {
+                        "connected": "已连接",
+                        "connecting": "正在连接",
+                        "unknown": "未知"
+                    },
+                    "node_config": {
+                        "attribution": "设备配置参数和描述由 {device_database} 提供。",
+                        "battery_device_notice": "电池供电的设备必须处于唤醒状态才能更新配置。请参阅设备说明书，了解如何唤醒设备。",
+                        "error_device_not_found": "未找到设备",
+                        "header": "Z-Wave 设备配置",
+                        "introduction": "管理并调整所选设备（节点）的具体配置参数。",
+                        "parameter": "参数",
+                        "parameter_is_read_only": "此参数为只读。",
+                        "set_param_accepted": "参数已更新。",
+                        "set_param_error": "发生错误。",
+                        "set_param_queued": "参数更改操作已加入队列，将在设备唤醒时更新。",
+                        "zwave_js_device_database": "Z-Wave JS 设备数据库"
+                    },
+                    "node_status": {
+                        "alive": "在线",
+                        "asleep": "睡眠",
+                        "awake": "唤醒",
+                        "dead": "断线",
+                        "unknown": "未知"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "开始重新协商之前，需要唤醒电池供电的设备。有关如何唤醒设备的说明，请参阅设备说明书。",
+                        "in_progress": "设备正在重新协商。可能需要一段时间。",
+                        "interview_complete": "设备协商完成。",
+                        "interview_failed": "设备协商失败。日志中会有更多信息。",
+                        "introduction": "重新协商 Z-Wave 网络上的设备。如果设备功能缺失或不正常，请使用此功能。",
+                        "run_in_background": "您可以关闭此对话框，协商将在后台继续进行。",
+                        "start_reinterview": "开始重新协商",
+                        "title": "重新协商 Z-Wave 设备"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "设备正在删除。",
+                        "introduction": "从 Z-Wave 网络中删除故障设备。如果设备损坏导致无法正常排除设备，请使用此选项。",
+                        "removal_failed": "无法从 Z-Wave 网络中删除该设备。",
+                        "removal_finished": "已将节点 {id} 从 Z-Wave 网络中删除。",
+                        "remove_device": "删除设备",
+                        "title": "删除故障的 Z-Wave 设备"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "取消 exclusion",
+                        "controller_in_exclusion_mode": "您的 Z-Wave 控制器现在处于 exclusion 模式。",
+                        "exclusion_failed": "无法删除该节点。请查看日志以了解更多信息。",
+                        "exclusion_finished": "节点 {id} 已从 Z-Wave 网络中删除。",
+                        "follow_device_instructions": "请按照设备说明书，触发设备的 exclusion。",
+                        "introduction": "从 Z-Wave 网络中删除节点，并从 Home Assistant 中删除关联的设备和实体。",
+                        "start_exclusion": "开始 exclusion",
+                        "title": "删除 Z-Wave 节点"
+                    }
                 }
             },
             "custom": {
@@ -3228,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "返回",
-                "supervisor": {
-                    "ask": "寻求帮助",
-                    "observer": "检查 Observer",
-                    "reboot": "请尝试重启主机",
-                    "system_health": "检查系统状态",
-                    "title": "无法加载 Supervisor 面板！",
-                    "wait": "如果系统刚刚启动，请确保已等候足够的时间以便 Supervisor 启动完成。"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "上周",
-                    "this_week": "本周",
-                    "today": "今天",
-                    "yesterday": "昨天"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "上周",
-                    "this_week": "本周",
-                    "today": "今天",
-                    "yesterday": "昨天"
+            "energy": {
+                "charts": {
+                    "by_device": "设备能耗",
+                    "solar": "太阳能",
+                    "stat_house_energy_meter": "总能耗"
+                },
+                "setup": {
+                    "back": "后退",
+                    "done": "看看我的能源仪表盘！",
+                    "next": "下一步"
                 }
             },
             "lovelace": {
@@ -3366,7 +3396,6 @@
                         "entities": {
                             "description": "“实体”卡片是最常见的卡片。它将项目汇聚成列表。",
                             "edit_special_row": "点击编辑按钮可查看该行的详细信息",
-                            "entity_row_editor": "实体行编辑器",
                             "entity_row": {
                                 "attribute": "属性",
                                 "button": "按钮",
@@ -3378,6 +3407,7 @@
                                 "section": "部分",
                                 "weblink": "网页链接"
                             },
+                            "entity_row_editor": "实体行编辑器",
                             "name": "实体",
                             "secondary_info_values": {
                                 "brightness": "亮度",
@@ -3404,6 +3434,7 @@
                         "gauge": {
                             "description": "“表盘”卡片是基础卡片，用于直观地展示传感器数据。",
                             "name": "表盘",
+                            "needle_gauge": "显示指针？",
                             "severity": {
                                 "define": "设置分级变色？",
                                 "green": "绿色",
@@ -3416,6 +3447,7 @@
                             "attribute": "属性",
                             "camera_image": "相机实体",
                             "camera_view": "相机视图",
+                            "days_to_show": "要显示的天数",
                             "double_tap_action": "双击动作",
                             "entities": "实体",
                             "entity": "实体",
@@ -3529,6 +3561,10 @@
                             "integration_not_loaded": "此卡片需要先配置好 `shopping_list` 集成。",
                             "name": "购物清单"
                         },
+                        "statistics-graph": {
+                            "description": "“统计图表”卡片用于为每一个列出的实体显示统计图表。",
+                            "name": "统计图表"
+                        },
                         "thermostat": {
                             "description": "“温控器”卡片用于控制恒温器实体，改变其设定温度和模式。",
                             "name": "温控器"
@@ -3598,6 +3634,12 @@
                         "tab_badges": "徽章",
                         "tab_settings": "设置",
                         "tab_visibility": "可见性",
+                        "type": "视图类型",
+                        "types": {
+                            "masonry": "瀑布流（默认）",
+                            "panel": "面板（单张卡片）",
+                            "sidebar": "侧边栏"
+                        },
                         "visibility": {
                             "select_users": "选择要让哪些用户在导航中看到此视图"
                         }
@@ -3652,7 +3694,6 @@
                         "unsaved_changes": "未保存的更改"
                     },
                     "save_config": {
-                        "cancel": "算了吧",
                         "close": "关闭",
                         "empty_config": "从空白仪表盘开始",
                         "header": "自行编辑您的 Lovelace UI",
@@ -3681,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "这将使第一张卡片全屏显示。此视图中的其他卡片和徽章将不会呈现。",
-                            "title": "面板模式？",
                             "warning_multiple_cards": "此视图包含多张卡片，但面板视图只能显示一张卡片。"
                         }
                     }
@@ -3885,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "下一步",
-                    "intro": "共享实例的分析。此数据将在 {link} 公开。"
+                    "finish": "下一步"
                 },
                 "core-config": {
                     "button_detect": "自动检测",
@@ -3910,10 +3948,8 @@
                     "confirm_password": "确认快照密码",
                     "description": "或者，您也可以从以前的快照还原。",
                     "folders": "文件夹",
-                    "full_snapshot": "完整快照",
                     "hide_log": "隐藏完整日志",
                     "in_progress": "正在还原",
-                    "partial_snapshot": "部分快照",
                     "password": "密码",
                     "password_protection": "密码保护",
                     "select_type": "请选择要还原的内容",
@@ -3995,6 +4031,12 @@
                     "prompt_copy_token": "请复制您的访问令牌。它不会再显示出来。",
                     "prompt_name": "为令牌指定名称"
                 },
+                "mfa": {
+                    "confirm_disable": "您确定要禁用 {name} 吗？",
+                    "disable": "禁用",
+                    "enable": "启用",
+                    "header": "多因素身份验证模块"
+                },
                 "mfa_setup": {
                     "close": "关闭",
                     "step_done": "{step} 设置完成",
@@ -4002,12 +4044,6 @@
                     "title_aborted": "中止",
                     "title_success": "成功！"
                 },
-                "mfa": {
-                    "confirm_disable": "您确定要禁用 {name} 吗？",
-                    "disable": "禁用",
-                    "enable": "启用",
-                    "header": "多因素身份验证模块"
-                },
                 "number_format": {
                     "description": "选择数字的格式。",
                     "dropdown_label": "数字格式",
diff --git a/translations/frontend/zh-Hant.json b/translations/frontend/zh-Hant.json
index 07dd92713c..5abbdb6733 100644
--- a/translations/frontend/zh-Hant.json
+++ b/translations/frontend/zh-Hant.json
@@ -17,6 +17,7 @@
         "calendar": "行事曆",
         "config": "設定",
         "developer_tools": "開發工具",
+        "energy": "能源",
         "history": "歷史",
         "logbook": "日誌",
         "mailbox": "郵箱",
@@ -26,6 +27,14 @@
         "shopping_list": "購物清單",
         "states": "總覽"
     },
+    "state": {
+        "default": {
+            "off": "關閉",
+            "on": "開啟",
+            "unavailable": "不可用",
+            "unknown": "未知"
+        }
+    },
     "state_attributes": {
         "climate": {
             "fan_mode": {
@@ -94,14 +103,6 @@
             "not_home": "離家"
         }
     },
-    "state": {
-        "default": {
-            "off": "關閉",
-            "on": "開啟",
-            "unavailable": "不可用",
-            "unknown": "未知"
-        }
-    },
     "supervisor": {
         "addon": {
             "configuration": {
@@ -267,6 +268,26 @@
                 "not_installed": "附加元件未安裝"
             }
         },
+        "backup": {
+            "addons": "附加元件",
+            "confirm_password": "確認系統備份密碼",
+            "could_not_create": "無法製作系統備份",
+            "create": "新增",
+            "create_blocked_not_running": "由於系統為 {state} 狀態，無法製作系統備份。",
+            "created": "建立",
+            "delete_backup_confirm": "刪除",
+            "delete_selected": "刪除已選擇系統備份",
+            "enter_password": "請輸入密碼。",
+            "failed_to_delete": "刪除失敗",
+            "folders": "資料夾",
+            "name": "系統備份名稱",
+            "password": "系統備份密碼",
+            "password_protection": "密碼保護",
+            "passwords_not_matching": "密碼不相符",
+            "select_type": "選擇所要回復內容",
+            "selected": "已選擇 {number} 個",
+            "type": "系統備份類型"
+        },
         "common": {
             "cancel": "取消",
             "close": "關閉",
@@ -366,9 +387,6 @@
                 "text": "是否要套用變更重啟附加元件？"
             },
             "update": {
-                "create_snapshot": "於更新前製作 {name} 系統備份",
-                "snapshot": "系統備份",
-                "snapshotting": "製作 {name} 系統備份",
                 "updating": "更新 {name} 至 {version} 版"
             }
         },
@@ -383,48 +401,9 @@
         },
         "panel": {
             "dashboard": "主面板",
-            "snapshots": "系統備份",
             "store": "附加元件商店",
             "system": "系統"
         },
-        "snapshot": {
-            "addons": "附加元件",
-            "available_snapshots": "可用系統備份",
-            "confirm_password": "確認系統備份密碼",
-            "could_not_create": "無法製作系統備份",
-            "create": "新增",
-            "create_blocked_not_running": "由於系統為 {state} 狀態，無法製作系統備份。",
-            "create_snapshot": "製作系統備份",
-            "created": "建立",
-            "delete_selected": "刪除已選擇系統備份",
-            "delete_snapshot_confirm": "刪除",
-            "delete_snapshot_text": "是否要刪除 {number} {number, plural,\n  one {個系統備份}\n  other {個系統備份}\n}？",
-            "delete_snapshot_title": "刪除系統備份",
-            "description": "系統備份可供您快速的備份與還原 Home Assistant 所有資料。",
-            "enter_password": "請輸入密碼。",
-            "failed_to_delete": "刪除失敗",
-            "folder": {
-                "addons/local": "本地附加元件",
-                "homeassistant": "Home Assistant 設定",
-                "media": "媒體",
-                "share": "共享",
-                "ssl": "SSL"
-            },
-            "folders": "資料夾",
-            "full_snapshot": "全系統備份",
-            "name": "系統備份名稱",
-            "no_snapshots": "目前沒有任何系統備份",
-            "partial_snapshot": "部分系統備份",
-            "password": "系統備份密碼",
-            "password_protected": "密碼保護未顯示",
-            "password_protection": "密碼保護",
-            "passwords_not_matching": "密碼不相符",
-            "security": "加密",
-            "select_type": "選擇所要回復內容",
-            "selected": "已選擇 {number} 個",
-            "type": "系統備份類型",
-            "upload_snapshot": "上傳系統備份"
-        },
         "store": {
             "missing_addons": "找不到附加元件？於個人頁面中開啟進階模式",
             "no_results_found": "於 {repository} 找不到相符結果。",
@@ -760,6 +739,12 @@
             },
             "date-range-picker": {
                 "end_date": "結束日期",
+                "ranges": {
+                    "last_week": "上週",
+                    "this_week": "本週",
+                    "today": "今天",
+                    "yesterday": "昨天"
+                },
                 "select": "選擇",
                 "start_date": "開始日期"
             },
@@ -851,10 +836,10 @@
                 "documentation": "相關文件",
                 "learn_adding_local_media": "詳細了解如何新增媒體{documentation}。",
                 "local_media_files": "將影片、音效及影像檔案放置於媒體資料夾、將可以透過瀏覽器或支援的媒體播放器進行瀏覽與播放。",
+                "media-player-browser": "媒體播放器瀏覽器",
                 "media_browsing_error": "媒體瀏覽錯誤",
                 "media_not_supported": "瀏覽器媒體播放器不支援此類型媒體",
                 "media_player": "媒體播放器",
-                "media-player-browser": "媒體播放器瀏覽器",
                 "no_items": "沒有項目",
                 "no_local_media_found": "找不到本地端媒體",
                 "no_media_folder": "看起來您還沒有建立任何媒體資料夾。",
@@ -924,6 +909,23 @@
             "service-picker": {
                 "service": "服務"
             },
+            "statistic-picker": {
+                "learn_more": "詳細了解統計資料",
+                "missing_entity": "為何我的實體沒在列表上？",
+                "no_match": "找不到相符統計資料",
+                "no_statistics": "目前沒有任何統計資料",
+                "statistic": "統計資料"
+            },
+            "statistics_charts": {
+                "loading_statistics": "正在載入統計資料...",
+                "no_statistics_found": "找不到統計資料。",
+                "statistic_types": {
+                    "max": "最高",
+                    "mean": "平均",
+                    "min": "最低",
+                    "sum": "總和"
+                }
+            },
             "target-picker": {
                 "add_area_id": "選擇區域",
                 "add_device_id": "選擇裝置",
@@ -1112,6 +1114,10 @@
                 "form": {
                     "header": "選項"
                 },
+                "loading": {
+                    "loading_flow": "請稍候、{integration} 正在初始化選項",
+                    "loading_step": "載入 {integration} 下一步驟"
+                },
                 "success": {
                     "description": "選項已儲存。"
                 }
@@ -1125,13 +1131,13 @@
                         "core": "一般設定",
                         "customize": "自訂化",
                         "devices": "裝置",
+                        "energy": "能源",
                         "entities": "實體",
                         "helpers": "助手",
                         "info": "更多資訊",
                         "integrations": "整合",
                         "logs": "記錄",
                         "lovelace": "Lovelace 主面板",
-                        "navigate_to": "導航至 {panel}",
                         "person": "人員",
                         "scene": "場景",
                         "script": "腳本",
@@ -1360,7 +1366,6 @@
                             "introduction": "「動作」為自動化觸發後，Home Assistant 所執行的自動化。",
                             "learn_more": "詳細了解動作",
                             "name": "動作",
-                            "type_select": "觸發後動作類別",
                             "type": {
                                 "choose": {
                                     "add_option": "新增選項",
@@ -1401,7 +1406,6 @@
                                 "repeat": {
                                     "label": "重複",
                                     "sequence": "觸發後動作",
-                                    "type_select": "重複類型",
                                     "type": {
                                         "count": {
                                             "label": "計次"
@@ -1414,7 +1418,8 @@
                                             "conditions": "當條件發生",
                                             "label": "當"
                                         }
-                                    }
+                                    },
+                                    "type_select": "重複類型"
                                 },
                                 "scene": {
                                     "label": "啟用場景"
@@ -1434,6 +1439,7 @@
                                     "wait_template": "等待模板"
                                 }
                             },
+                            "type_select": "觸發後動作類別",
                             "unsupported_action": "視覺化編輯器不支援觸發動作：{action}"
                         },
                         "alias": "名稱",
@@ -1452,7 +1458,6 @@
                             "introduction": "「觸發判斷」為自動化規則中，選項使用的部分。可以用於滿足所有條件方執行、以避免誤觸發自動化。",
                             "learn_more": "詳細了解觸發判斷",
                             "name": "判斷式",
-                            "type_select": "觸發判斷類別",
                             "type": {
                                 "and": {
                                     "label": "及"
@@ -1524,6 +1529,7 @@
                                     "zone": "區域"
                                 }
                             },
+                            "type_select": "觸發判斷類別",
                             "unsupported_condition": "視覺化編輯器不支援觸發判斷：{condition}"
                         },
                         "copy_to_clipboard": "複製至剪貼簿",
@@ -1565,7 +1571,6 @@
                             "introduction": "「觸發條件」為可使設定好的自動化開始運作。可以針對一個自動化設定多個觸發條件。一旦觸發後，Home Assistant 會檢查觸發判斷式，並開始執行動作。",
                             "learn_more": "詳細了解觸發條件",
                             "name": "觸發自動化",
-                            "type_select": "觸發條件類型",
                             "type": {
                                 "device": {
                                     "extra_fields": {
@@ -1631,18 +1636,18 @@
                                     "label": "模板",
                                     "value_template": "數值模板"
                                 },
-                                "time_pattern": {
-                                    "hours": "小時",
-                                    "label": "時間模式",
-                                    "minutes": "分鐘",
-                                    "seconds": "秒鐘"
-                                },
                                 "time": {
                                     "at": "時間於",
                                     "label": "時間",
                                     "type_input": "日期/時間協助數值",
                                     "type_value": "固定時間"
                                 },
+                                "time_pattern": {
+                                    "hours": "小時",
+                                    "label": "時間模式",
+                                    "minutes": "分鐘",
+                                    "seconds": "秒鐘"
+                                },
                                 "webhook": {
                                     "label": "Webhook",
                                     "webhook_id": "Webhook ID"
@@ -1656,6 +1661,7 @@
                                     "zone": "區域"
                                 }
                             },
+                            "type_select": "觸發條件類型",
                             "unsupported_platform": "視覺化編輯器不支援平台：{platform}"
                         },
                         "unsaved_confirm": "設定尚未儲存，確定要放棄嗎？"
@@ -1788,6 +1794,7 @@
                             "instance_will_be_available": "您的裝置將可透過下方連結使用",
                             "link_learn_how_it_works": "了解如何運作",
                             "not_connected": "未連線",
+                            "reconnecting": "重新連線中",
                             "remote_enabled": {
                                 "caption": "自動連線",
                                 "description": "開啟此選項以確定 Home Assistant 保持遠端存取功能。"
@@ -1818,9 +1825,9 @@
                             "loading": "正在載入...",
                             "manage": "管理",
                             "no_hooks_yet": "看起來您尚未建立 Webhook，可藉由設定 ",
+                            "no_hooks_yet2": "或新增一組",
                             "no_hooks_yet_link_automation": "Webhook 自動化",
                             "no_hooks_yet_link_integration": "Webhook 整合",
-                            "no_hooks_yet2": "或新增一組",
                             "title": "Webhooks"
                         }
                     },
@@ -1935,41 +1942,13 @@
                     "description": "單位系統、座標、時區與其他一般設定",
                     "section": {
                         "core": {
-                            "analytics": {
-                                "documentation": "於開啟前，請先確定您已經瀏覽分析資料文件頁面 {link}、並了解所要傳送的資料及相關資料如何儲存。",
-                                "header": "分析資料",
-                                "instance_id": "實例 ID：{huuid}",
-                                "introduction": "分享安裝資訊將有助於協助 Home Assistant 改善、並協助說服更多製造廠商包含本地端控制與隱私權相關功能。",
-                                "learn_more": "資料會如何處理。",
-                                "needs_base": "需要開啟基本分析、方能使用此選項",
-                                "preference": {
-                                    "base": {
-                                        "description": "實例 ID、版本與安裝類型。",
-                                        "title": "基本分析"
-                                    },
-                                    "diagnostics": {
-                                        "description": "當發生位預期錯誤時，分享當機回報。",
-                                        "title": "診斷資料"
-                                    },
-                                    "statistics": {
-                                        "description": "已使用實體、使用者與其他元素總數。",
-                                        "title": "統計資訊"
-                                    },
-                                    "usage_supervisor": {
-                                        "description": "名稱、版本與功能。",
-                                        "title": "已使用整合與附加元件"
-                                    },
-                                    "usage": {
-                                        "description": "名稱與版本資訊。",
-                                        "title": "已使用整合"
-                                    }
-                                }
-                            },
                             "core_config": {
+                                "currency": "貨幣",
                                 "edit_requires_storage": "由於 configuration.yaml 內已儲存設定，編輯功能已關閉。",
                                 "elevation": "海拔",
                                 "elevation_meters": "公尺",
                                 "external_url": "外部 URL",
+                                "find_currency_value": "尋找數值",
                                 "imperial_example": "華氏、磅",
                                 "internal_url": "內部 URL",
                                 "latitude": "緯度",
@@ -2098,6 +2077,63 @@
                     "update": "更新",
                     "update_device_error": "更新裝置失敗"
                 },
+                "energy": {
+                    "caption": "能源",
+                    "description": "監控能源產量與耗電量",
+                    "device_consumption": {
+                        "add_stat": "選擇所要追蹤能源的實體",
+                        "dialog": {
+                            "selected_stat_intro": "選擇代表能能源用量裝置之實體。"
+                        },
+                        "learn_more": "關於如何開始更詳細資訊。",
+                        "selected_stat": "追蹤能源",
+                        "sub": "追蹤個別裝置的能源使用量可供 Home Assistant 依據裝置分析能源使用量。",
+                        "title": "個別裝置"
+                    },
+                    "grid": {
+                        "flow_dialog": {
+                            "from": {
+                                "cost_entity": "獨立價格實體",
+                                "cost_entity_input": "包含價格實體",
+                                "cost_number": "使用固定價格",
+                                "cost_number_input": "每 kWh 價格",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "選擇 Home Assistant 如何追蹤耗電量成本。",
+                                "cost_stat": "獨立實體以追蹤總成本",
+                                "cost_stat_input": "總成本實體",
+                                "energy_stat": "耗電量（kWh）",
+                                "header": "設定電網耗電量",
+                                "no_cost": "不追蹤成本",
+                                "paragraph": "電網耗電量為由電網流向你家的能源量。"
+                            },
+                            "to": {
+                                "cost_entity": "獨立費率實體",
+                                "cost_entity_input": "包含費率實體",
+                                "cost_number": "使用固定費率",
+                                "cost_number_input": "每 kWh 費率",
+                                "cost_number_suffix": "{currency}/kWh",
+                                "cost_para": "當將能源回送回電網時，是否回收資金？",
+                                "cost_stat": "獨立實體以追蹤總回收金額",
+                                "cost_stat_input": "總回購金額實體",
+                                "energy_stat": "回送電網能源（kWh）",
+                                "header": "設定電網生產",
+                                "no_cost": "未收取回購",
+                                "paragraph": "電網生產為由您的太陽能面板回流至電網的能源量。"
+                            }
+                        },
+                        "learn_more": "關於如何開始更詳細資訊。",
+                        "sub": "設定不同來自電網耗電，以及假如有生產電能、回送電網的能源補貼額。將可供 Home Assistant 追蹤整個家庭的能源使用量。",
+                        "title": "電網"
+                    },
+                    "solar": {
+                        "learn_more": "關於如何開始更詳細資訊。",
+                        "stat_predicted_production": "太陽能產量預估",
+                        "stat_production": "太陽能產量",
+                        "stat_return_to_grid": "回送電網太陽能",
+                        "sub": "由 Home Assistant 監控太陽能面板並了解其效能。",
+                        "title": "太陽能面板"
+                    }
+                },
                 "entities": {
                     "caption": "實體",
                     "description": "管理已知實體",
@@ -2148,14 +2184,6 @@
                         }
                     }
                 },
-                "filtering": {
-                    "clear": "清除",
-                    "filtering_by": "篩選",
-                    "show": "顯示"
-                },
-                "hassio": {
-                    "button": "設定"
-                },
                 "header": "設定 Home Assistant",
                 "helpers": {
                     "caption": "助手",
@@ -2205,16 +2233,11 @@
                     "server": "伺服器",
                     "setup_time": "設定時間",
                     "source": "來源：",
-                    "system_health_error": "系統健康元件未載入。請於 configuration.yaml 內加入「system_health:」",
                     "system_health": {
                         "manage": "管理",
                         "more_info": "更多資訊"
-                    }
-                },
-                "integration_panel_move": {
-                    "link_integration_page": "整合頁面",
-                    "missing_zha": "找不到 ZHA 設定頁面嗎？目前已經移至 {integrations_page}  中的 ZHA 實體。",
-                    "missing_zwave": "找不到 Z-Wave 設定頁面嗎？目前已經移至 {integrations_page}  中的 Z-Wave 實體。"
+                    },
+                    "system_health_error": "系統健康元件未載入。請於 configuration.yaml 內加入「system_health:」"
                 },
                 "integrations": {
                     "add_integration": "新增整合",
@@ -2226,11 +2249,9 @@
                         "configure": "設定",
                         "delete": "刪除",
                         "delete_confirm": "確定要刪除此整合？",
-                        "depends_on_cloud": "跟隨雲服務",
+                        "depends_on_cloud": "使用雲服務",
                         "device_unavailable": "裝置不可用",
                         "devices": "{count} {count, plural,\n  one {個裝置}\n  other {個裝置}\n}",
-                        "disable_error": "開啟或關閉整合失敗",
-                        "disable_restart_confirm": "重啟 Home Assistant 以完成整合關閉",
                         "disable": {
                             "disable_confirm": "確定要關閉此設定實體？其裝置與實體將會關閉。",
                             "disabled": "已關閉",
@@ -2241,6 +2262,8 @@
                             },
                             "disabled_cause": "由 {cause} 關閉。"
                         },
+                        "disable_error": "開啟或關閉整合失敗",
+                        "disable_restart_confirm": "重啟 Home Assistant 以完成整合關閉",
                         "disabled_polling": "自動輪詢更新資料已關閉。",
                         "documentation": "相關文件",
                         "enable_restart_confirm": "重啟 Home Assistant 以完成整合開啟",
@@ -2248,12 +2271,10 @@
                         "entity_unavailable": "實體不可用",
                         "firmware": "韌體：{version}",
                         "hub": "連線：",
-                        "logs": "日誌",
                         "manuf": "廠牌：{manufacturer}",
                         "no_area": "無分區",
                         "not_loaded": "未載入",
-                        "options": "選項",
-                        "provided_by_custom_integration": "由自訂整合提供",
+                        "provided_by_custom_integration": "自行安裝整合",
                         "reload": "重新載入",
                         "reload_confirm": "整合已重新載入",
                         "reload_restart_confirm": "重啟 Home Assistant 以完成整合重新載入",
@@ -2284,7 +2305,11 @@
                             "open_site": "開啟網站"
                         },
                         "finish": "完成",
-                        "loading_first_time": "請稍候、正在安裝整合",
+                        "loading": {
+                            "fallback_title": "整合",
+                            "loading_flow": "請稍候、{integration} 正在設定",
+                            "loading_step": "載入 {integration} 下一步驟"
+                        },
                         "next": "下一步",
                         "not_all_required_fields": "所有所需欄位都需要填寫。",
                         "not_loaded": "整合無法載入，請重啟 Home Assistant。",
@@ -2301,7 +2326,6 @@
                     "details": "整合詳細資訊",
                     "disable": {
                         "disabled_integrations": "{number} 個已關閉",
-                        "hide_disabled": "隱藏已關閉整合",
                         "show": "顯示",
                         "show_disabled": "顯示已關閉整合"
                     },
@@ -2312,7 +2336,6 @@
                         "confirm_delete_ignore_title": "停止忽略{name}？",
                         "confirm_ignore": "確定不設定此整合？可以於右上方的選單中點選「顯示已忽略整合」、以還原此動作。",
                         "confirm_ignore_title": "忽略所發現的{name}？",
-                        "hide_ignored": "隱藏已忽略整合",
                         "ignore": "忽略",
                         "ignored": "已忽略",
                         "show_ignored": "顯示已忽略整合",
@@ -2336,10 +2359,10 @@
                 "logs": {
                     "caption": "記錄",
                     "clear": "清除",
-                    "custom_integration": "自訂整合",
+                    "custom_integration": "自行安裝整合",
                     "description": "檢視 Home Assistant 日誌",
                     "details": "記錄詳細資料（{level}）",
-                    "error_from_custom_integration": "自訂整合產生錯誤。",
+                    "error_from_custom_integration": "自行安裝整合產生錯誤。",
                     "level": {
                         "critical": "緊急",
                         "debug": "除錯",
@@ -2432,7 +2455,6 @@
                     }
                 },
                 "mqtt": {
-                    "button": "設定",
                     "description_listen": "監聽主題",
                     "description_publish": "發佈封包",
                     "listening_to": "監聽：",
@@ -2446,7 +2468,6 @@
                     "topic": "主題"
                 },
                 "ozw": {
-                    "button": "設定",
                     "common": {
                         "controller": "控制器",
                         "instance": "裝置",
@@ -2471,6 +2492,11 @@
                         "nodes": "節點",
                         "select_instance": "選擇實體"
                     },
+                    "network": {
+                        "header": "網路管理",
+                        "introduction": "管理網路方面功能。",
+                        "node_count": "{count} 個節點"
+                    },
                     "network_status": {
                         "details": {
                             "driverallnodesqueried": "已查詢所有節點。",
@@ -2491,10 +2517,9 @@
                         "starting": "開始",
                         "unknown": "未知"
                     },
-                    "network": {
-                        "header": "網路管理",
-                        "introduction": "管理網路方面功能。",
-                        "node_count": "{count} 個節點"
+                    "node": {
+                        "button": "節點詳細資訊",
+                        "not_found": "找不到節點"
                     },
                     "node_config": {
                         "header": "節點設定",
@@ -2524,10 +2549,6 @@
                         "versions": "獲得韌體與命令 Class 版本資訊",
                         "wakeup": "設定喚醒序列與訊息之支援"
                     },
-                    "node": {
-                        "button": "節點詳細資訊",
-                        "not_found": "找不到節點"
-                    },
                     "nodes_table": {
                         "failed": "失敗",
                         "id": "ID",
@@ -2711,7 +2732,7 @@
                             "input_number": "輸入數字",
                             "input_select": "輸入選擇",
                             "input_text": "輸入文字",
-                            "introduction": "Home Assistant 中部分設定無須重啟即可重新載入生效。點選重新載入按鈕，即可解除目前 YAML 設定，並重新載入最新設定。",
+                            "introduction": "Home Assistant 中部分設定無須重啟即可重新載入生效。點選下方選項即可解除目前 YAML 設定，並重新載入最新設定。",
                             "min_max": "最低/最高實體",
                             "mqtt": "手動設定 MQTT 實體",
                             "person": "人員",
@@ -2832,7 +2853,6 @@
                         "search_again": "再次搜尋",
                         "spinner": "正在搜尋 ZHA Zigbee 裝置..."
                     },
-                    "button": "設定",
                     "cluster_attributes": {
                         "attributes_of_cluster": "獲取所選叢集屬性。",
                         "get_zigbee_attribute": "獲取 Zigbee 屬性",
@@ -2862,12 +2882,7 @@
                     },
                     "configuration_page": {
                         "shortcuts_title": "捷徑",
-                        "update_button": "更新設定",
-                        "zha_options": {
-                            "default_light_transition": "預設燈光轉換時間（秒）",
-                            "enable_identify_on_join": "當裝置加入網路時、開啟識別效果",
-                            "title": "Global 選項"
-                        }
+                        "update_button": "更新設定"
                     },
                     "device_pairing_card": {
                         "CONFIGURED": "設定完成",
@@ -2949,123 +2964,7 @@
                     "introduction": "區域允許您指定地球上的特定區域，當人員進入到此區域時、狀態會顯示為該區域名字。區域同時也能夠作為自動化的觸發器或條件設定。",
                     "no_zones_created_yet": "看起來您還沒有新增任何區域。"
                 },
-                "zwave_js": {
-                    "add_node": {
-                        "cancel_inclusion": "取消登記",
-                        "controller_in_inclusion_mode": "Z-Wave 控制器目前處於登記模式。",
-                        "follow_device_instructions": "跟隨裝置隨附的說明書以觸發裝置上的配對功能。",
-                        "inclusion_failed": "節點無法新增，請參閱日誌以獲得更詳細資訊。",
-                        "inclusion_finished": "節點已經新增。",
-                        "interview_failed": "裝置探訪失敗。日誌中可能包含其他相關資訊。",
-                        "interview_started": "正在探訪裝置，可能需要一點時間。",
-                        "introduction": "導引將帶領你於 Z-Wave 網路中新增節點。",
-                        "secure_inclusion_warning": "加密裝置需要額外的頻寬，過多的加密裝置可能拖慢您的 Z-Wave 網路。建議您僅於需要時才使用加密裝置登記、例如門鎖或車庫開門裝置。",
-                        "start_inclusion": "開始登記",
-                        "start_secure_inclusion": "開始加密登記",
-                        "title": "新增 Z-Wave 節點",
-                        "use_secure_inclusion": "使用加密登記",
-                        "view_device": "檢視裝置"
-                    },
-                    "button": "設定",
-                    "common": {
-                        "add_node": "新增節點",
-                        "close": "關閉",
-                        "heal_network": "修復網路",
-                        "home_id": "家庭 ID",
-                        "network": "網路",
-                        "node_id": "節點 ID",
-                        "reconfigure_server": "重新設定伺服器",
-                        "remove_node": "移除節點"
-                    },
-                    "dashboard": {
-                        "driver_version": "驅動程式版本",
-                        "dump_dead_nodes_text": "部分節點沒有回應、可能為失效狀態。將不會完全進行匯出。",
-                        "dump_dead_nodes_title": "部分節點已經失效",
-                        "dump_debug": "下載網路匯出資料以協助診斷問題",
-                        "dump_not_ready_confirm": "下載",
-                        "dump_not_ready_text": "假如您於所有節點尚未就緒時執行匯出，將會遺失所需要的資料。建驗讓網路擁有足夠的時間查詢所有節點。是否要繼續匯出動作？",
-                        "dump_not_ready_title": "尚未準備好所有節點",
-                        "header": "管理 Z-Wave 網路",
-                        "home_id": "家庭 ID",
-                        "introduction": "管理 Z-Wave 網路與節點",
-                        "nodes_ready": "就緒節點",
-                        "server_version": "伺服器版本"
-                    },
-                    "device_info": {
-                        "device_config": "設定裝置",
-                        "node_ready": "就緒節點",
-                        "node_status": "節點狀態",
-                        "zwave_info": "Z-Wave 資訊"
-                    },
-                    "heal_network": {
-                        "healing_cancelled": "網路修復已取消。",
-                        "healing_complete": "網路修復已完成。",
-                        "healing_failed": "修復失敗。日誌中可能包含其他相關資訊。",
-                        "in_progress": "網路修復進行中，可能需要一點時間。",
-                        "introduction": "於 Z-Wave 網路開始網路修復。網路修復將導致所有裝置重新計算其連回控制器的路徑，檢如近期有移動裝置或控制器的話，建議執行此動作。",
-                        "run_in_background": "可以關閉此對話框、網路修復將於背景繼續執行。",
-                        "start_heal": "開始修復",
-                        "stop_heal": "停止修復",
-                        "title": "修復 Z-Wave 網路",
-                        "traffic_warning": "修復過程將對 Z-Wave 網路產生大量流量，過程中可能會導致裝置回應減緩（或失去回應）。"
-                    },
-                    "logs": {
-                        "log_level": "日誌記錄等級",
-                        "log_level_changed": "日誌等級變更為：{level}",
-                        "subscribed_to_logs": "訂閱 Z-Wave JS 日誌訊息...",
-                        "title": "Z-Wave JS 日誌"
-                    },
-                    "navigation": {
-                        "logs": "日誌",
-                        "network": "網路"
-                    },
-                    "network_status": {
-                        "connected": "已連線",
-                        "connecting": "連線中",
-                        "unknown": "未知"
-                    },
-                    "node_config": {
-                        "attribution": "由 {device_database} 所提供之裝置設定參數與說明",
-                        "battery_device_notice": "電池供電裝置必須喚醒以更新其設定。請參考您的裝置手冊以了解如何喚醒裝置。",
-                        "error_device_not_found": "找不到裝置",
-                        "header": "Z-Wave 裝置設定",
-                        "introduction": "管理與調整所選擇裝置 (節點) 之特定設定參數",
-                        "parameter_is_read_only": "此參數為唯讀。",
-                        "set_param_accepted": "參數已更新。",
-                        "set_param_error": "發生錯誤。",
-                        "set_param_queued": "參數變更已排序、將會於裝置喚醒時更新。",
-                        "zwave_js_device_database": "Z-Wave JS 裝置資料庫"
-                    },
-                    "node_status": {
-                        "alive": "線上",
-                        "asleep": "睡眠",
-                        "awake": "喚醒",
-                        "dead": "失效",
-                        "unknown": "未知"
-                    },
-                    "reinterview_node": {
-                        "battery_device_warning": "電池供電裝置必須先喚醒以重新探訪。請參考您的裝置手冊以了解如何喚醒裝置。",
-                        "in_progress": "正在探訪裝置，可能需要一點時間。",
-                        "interview_complete": "裝置探訪完成。",
-                        "interview_failed": "裝置探訪失敗。日誌中可能包含其他相關資訊。",
-                        "introduction": "重新探訪 Z-Wave 網路中的裝置。假如裝置缺少、或者功能不正確時，請使用此選項。",
-                        "run_in_background": "可以關閉此對話框、探訪將於背景繼續執行。",
-                        "start_reinterview": "開始重新探訪",
-                        "title": "重新探訪 Z-Wave 裝置"
-                    },
-                    "remove_node": {
-                        "cancel_exclusion": "取消排除",
-                        "controller_in_exclusion_mode": "Z-Wave 控制器目前處於排除模式。",
-                        "exclusion_failed": "節點無法移除，請參閱以日誌以獲得更詳細資訊。",
-                        "exclusion_finished": "已經自 Z-Wave 網路中移除節點 {id}。",
-                        "follow_device_instructions": "跟隨裝置隨附的說明書以觸發裝置上的排除功能。",
-                        "introduction": "Remove a node from 自 Z-Wave 網路移除節點、並自 Home Assistant 移除相關裝置與實體。",
-                        "start_exclusion": "開始排除",
-                        "title": "移除 Z-Wave 節點"
-                    }
-                },
                 "zwave": {
-                    "button": "設定",
                     "common": {
                         "index": "指數",
                         "instance": "裝置",
@@ -3154,6 +3053,144 @@
                     "values": {
                         "header": "節點數值"
                     }
+                },
+                "zwave_js": {
+                    "add_node": {
+                        "cancel_inclusion": "取消登記",
+                        "controller_in_inclusion_mode": "Z-Wave 控制器目前處於登記模式。",
+                        "follow_device_instructions": "跟隨裝置隨附的說明書以觸發裝置上的配對功能。",
+                        "inclusion_failed": "節點無法新增，請參閱日誌以獲得更詳細資訊。",
+                        "inclusion_finished": "節點已經新增。",
+                        "interview_failed": "裝置探訪失敗。日誌中可能包含其他相關資訊。",
+                        "interview_started": "正在探訪裝置，可能需要一點時間。",
+                        "introduction": "導引將帶領你於 Z-Wave 網路中新增節點。",
+                        "secure_inclusion_warning": "加密裝置需要額外的頻寬，過多的加密裝置可能拖慢您的 Z-Wave 網路。建議您僅於需要時才使用加密裝置登記、例如門鎖或車庫開門裝置。",
+                        "start_inclusion": "開始登記",
+                        "start_secure_inclusion": "開始加密登記",
+                        "title": "新增 Z-Wave 節點",
+                        "use_secure_inclusion": "使用加密登記",
+                        "view_device": "檢視裝置"
+                    },
+                    "common": {
+                        "add_node": "新增節點",
+                        "close": "關閉",
+                        "heal_network": "修復網路",
+                        "home_id": "家庭 ID",
+                        "network": "網路",
+                        "node_id": "節點 ID",
+                        "reconfigure_server": "重新設定伺服器",
+                        "remove_node": "移除節點",
+                        "source": "來源"
+                    },
+                    "dashboard": {
+                        "driver_version": "驅動程式版本",
+                        "dump_dead_nodes_text": "部分節點沒有回應、可能為失效狀態。將不會完全進行匯出。",
+                        "dump_dead_nodes_title": "部分節點已經失效",
+                        "dump_debug": "下載網路匯出資料以協助診斷問題",
+                        "dump_not_ready_confirm": "下載",
+                        "dump_not_ready_text": "假如您於所有節點尚未就緒時執行匯出，將會遺失所需要的資料。建驗讓網路擁有足夠的時間查詢所有節點。是否要繼續匯出動作？",
+                        "dump_not_ready_title": "尚未準備好所有節點",
+                        "header": "管理 Z-Wave 網路",
+                        "home_id": "家庭 ID",
+                        "introduction": "管理 Z-Wave 網路與節點",
+                        "nodes_ready": "就緒節點",
+                        "server_version": "伺服器版本"
+                    },
+                    "device_info": {
+                        "device_config": "設定裝置",
+                        "heal_node": "修復節點",
+                        "node_ready": "就緒節點",
+                        "node_status": "節點狀態",
+                        "reinterview_device": "重新探訪裝置",
+                        "remove_failed": "移除失效裝置",
+                        "zwave_info": "Z-Wave 資訊"
+                    },
+                    "heal_network": {
+                        "healing_cancelled": "網路修復已取消。",
+                        "healing_complete": "網路修復已完成。",
+                        "healing_failed": "修復失敗。日誌中可能包含其他相關資訊。",
+                        "in_progress": "網路修復進行中，可能需要一點時間。",
+                        "introduction": "於 Z-Wave 網路開始網路修復。網路修復將導致所有裝置重新計算其連回控制器的路徑，檢如近期有移動裝置或控制器的話，建議執行此動作。",
+                        "run_in_background": "可以關閉此對話框、網路修復將於背景繼續執行。",
+                        "start_heal": "開始修復",
+                        "stop_heal": "停止修復",
+                        "title": "修復 Z-Wave 網路",
+                        "traffic_warning": "修復過程將對 Z-Wave 網路產生大量流量，過程中可能會導致裝置回應減緩（或失去回應）。"
+                    },
+                    "heal_node": {
+                        "healing_complete": "{device} 已經修復。",
+                        "healing_failed": "{device} 無法修復。",
+                        "healing_failed_check_logs": "日誌中可能包含其他相關資訊。",
+                        "in_progress": "{device} 正在修復。",
+                        "introduction": "通知 {device} 更新以返回控制器之路徑。假如近期有移動裝置或控制器、此動作將有助於改善其通訊問題。",
+                        "network_heal_in_progress": "Z-Wave 網路修復正在進行中，請稍候其完成後、進行其他裝置修復。",
+                        "start_heal": "修復裝置",
+                        "title": "修復 Z-Wave 裝置",
+                        "traffic_warning": "修復過程將對 Z-Wave 網路產生大量流量，過程中可能會導致裝置回應減緩（或失去回應）。"
+                    },
+                    "logs": {
+                        "log_level": "日誌記錄等級",
+                        "log_level_changed": "日誌等級變更為：{level}",
+                        "subscribed_to_logs": "訂閱 Z-Wave JS 日誌訊息...",
+                        "title": "Z-Wave JS 日誌"
+                    },
+                    "navigation": {
+                        "logs": "日誌",
+                        "network": "網路"
+                    },
+                    "network_status": {
+                        "connected": "已連線",
+                        "connecting": "連線中",
+                        "unknown": "未知"
+                    },
+                    "node_config": {
+                        "attribution": "由 {device_database} 所提供之裝置設定參數與說明",
+                        "battery_device_notice": "電池供電裝置必須喚醒以更新其設定。請參考您的裝置手冊以了解如何喚醒裝置。",
+                        "error_device_not_found": "找不到裝置",
+                        "header": "Z-Wave 裝置設定",
+                        "introduction": "管理與調整所選擇裝置 (節點) 之特定設定參數",
+                        "parameter": "參數",
+                        "parameter_is_read_only": "此參數為唯讀。",
+                        "set_param_accepted": "參數已更新。",
+                        "set_param_error": "發生錯誤。",
+                        "set_param_queued": "參數變更已排序、將會於裝置喚醒時更新。",
+                        "zwave_js_device_database": "Z-Wave JS 裝置資料庫"
+                    },
+                    "node_status": {
+                        "alive": "線上",
+                        "asleep": "睡眠",
+                        "awake": "喚醒",
+                        "dead": "失效",
+                        "unknown": "未知"
+                    },
+                    "reinterview_node": {
+                        "battery_device_warning": "電池供電裝置必須先喚醒以重新探訪。請參考您的裝置手冊以了解如何喚醒裝置。",
+                        "in_progress": "正在探訪裝置，可能需要一點時間。",
+                        "interview_complete": "裝置探訪完成。",
+                        "interview_failed": "裝置探訪失敗。日誌中可能包含其他相關資訊。",
+                        "introduction": "重新探訪 Z-Wave 網路中的裝置。假如裝置缺少、或者功能不正確時，請使用此選項。",
+                        "run_in_background": "可以關閉此對話框、探訪將於背景繼續執行。",
+                        "start_reinterview": "開始重新探訪",
+                        "title": "重新探訪 Z-Wave 裝置"
+                    },
+                    "remove_failed_node": {
+                        "in_progress": "裝置移除正在進行中。",
+                        "introduction": "由 Z-Wave 網路中移除失效裝置。假如因為設備損壞而無法正常排除裝置時，請使用此選項。",
+                        "removal_failed": "無法自 Z-Wave 網路中移除裝置。",
+                        "removal_finished": "已經自 Z-Wave 網路中移除節點 {id}。",
+                        "remove_device": "移除裝置",
+                        "title": "移除失效 Z-Wave 裝置"
+                    },
+                    "remove_node": {
+                        "cancel_exclusion": "取消排除",
+                        "controller_in_exclusion_mode": "Z-Wave 控制器目前處於排除模式。",
+                        "exclusion_failed": "節點無法移除，請參閱以日誌以獲得更詳細資訊。",
+                        "exclusion_finished": "已經自 Z-Wave 網路中移除節點 {id}。",
+                        "follow_device_instructions": "跟隨裝置隨附的說明書以觸發裝置上的排除功能。",
+                        "introduction": "Remove a node from 自 Z-Wave 網路移除節點、並自 Home Assistant 移除相關裝置與實體。",
+                        "start_exclusion": "開始排除",
+                        "title": "移除 Z-Wave 節點"
+                    }
                 }
             },
             "custom": {
@@ -3236,31 +3273,16 @@
                     }
                 }
             },
-            "error": {
-                "go_back": "上一步",
-                "supervisor": {
-                    "ask": "尋求協助",
-                    "observer": "檢查 Observer",
-                    "reboot": "嘗試重啟主機",
-                    "system_health": "檢查系統健康狀態",
-                    "title": "無法載入 Supervisor 面板！",
-                    "wait": "假如為剛剛啟動，請確認已經給予 Supervisor 足夠時間進行啟動。"
-                }
-            },
-            "history": {
-                "ranges": {
-                    "last_week": "上週",
-                    "this_week": "本週",
-                    "today": "今天",
-                    "yesterday": "昨天"
-                }
-            },
-            "logbook": {
-                "ranges": {
-                    "last_week": "上週",
-                    "this_week": "本週",
-                    "today": "今天",
-                    "yesterday": "昨天"
+            "energy": {
+                "charts": {
+                    "by_device": "裝置耗電量",
+                    "solar": "太陽能",
+                    "stat_house_energy_meter": "總能源耗電量"
+                },
+                "setup": {
+                    "back": "上一步",
+                    "done": "顯示能源面板！",
+                    "next": "下一步"
                 }
             },
             "lovelace": {
@@ -3374,7 +3396,6 @@
                         "entities": {
                             "description": "實體列表面板為最常用的面板。將實體分組為列表使用。",
                             "edit_special_row": "點選編輯按鈕以檢視此列詳細資訊",
-                            "entity_row_editor": "實體編輯器",
                             "entity_row": {
                                 "attribute": "屬性",
                                 "button": "按鈕",
@@ -3386,6 +3407,7 @@
                                 "section": "部分",
                                 "weblink": "網站連結"
                             },
+                            "entity_row_editor": "實體編輯器",
                             "name": "實體",
                             "secondary_info_values": {
                                 "brightness": "亮度",
@@ -3412,6 +3434,7 @@
                         "gauge": {
                             "description": "量表式面板可供視覺化檢視傳感器資料。",
                             "name": "量表式面板",
+                            "needle_gauge": "顯示指針？",
                             "severity": {
                                 "define": "定義嚴重度？",
                                 "green": "綠色",
@@ -3424,6 +3447,7 @@
                             "attribute": "屬性",
                             "camera_image": "攝影機實體",
                             "camera_view": "攝影機視角",
+                            "days_to_show": "顯示天數",
                             "double_tap_action": "雙點擊觸發",
                             "entities": "實體",
                             "entity": "實體",
@@ -3537,6 +3561,10 @@
                             "integration_not_loaded": "此面板需要先設定「shopping_list」整合。",
                             "name": "購物清單面板"
                         },
+                        "statistics-graph": {
+                            "description": "統計圖式面板可供顯示每個列表實體統計資料圖表。",
+                            "name": "統計圖"
+                        },
                         "thermostat": {
                             "description": "溫控器面板可供控制溫控實體、可允許變更溫度與模式。",
                             "name": "溫控器面板"
@@ -3606,6 +3634,12 @@
                         "tab_badges": "圓標圖示",
                         "tab_settings": "設定",
                         "tab_visibility": "顯示選項",
+                        "type": "面板類型",
+                        "types": {
+                            "masonry": "瀑布流式（預設）",
+                            "panel": "面板式（單卡）",
+                            "sidebar": "側邊欄式"
+                        },
                         "visibility": {
                             "select_users": "選擇可觀看此視圖的使用者"
                         }
@@ -3660,7 +3694,6 @@
                         "unsaved_changes": "未儲存的變更"
                     },
                     "save_config": {
-                        "cancel": "我再想想",
                         "close": "關閉",
                         "empty_config": "以空白主面板開始",
                         "header": "自行編輯 Lovelace UI",
@@ -3689,8 +3722,6 @@
                     },
                     "view": {
                         "panel_mode": {
-                            "description": "將會以全寬度製作第一張面板，其他面板與圓標圖示將不會顯示。",
-                            "title": "面板模式？",
                             "warning_multiple_cards": "此視圖包含超過一張面板，但面板視圖僅能顯示一張面板。"
                         }
                     }
@@ -3893,8 +3924,7 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "下一步",
-                    "intro": "分享實例分析資料，資料將可透過 {link} 連結公開取得"
+                    "finish": "下一步"
                 },
                 "core-config": {
                     "button_detect": "偵測",
@@ -3916,12 +3946,10 @@
                 "restore": {
                     "addons": "附加元件",
                     "confirm_password": "確認系統備份密碼",
-                    "description": "或者可以自之前的 Snapshot 進行回復。",
+                    "description": "或者可以自之前的 Backup 進行回復。",
                     "folders": "資料夾",
-                    "full_snapshot": "全系統備份",
                     "hide_log": "隱藏完整日誌",
                     "in_progress": "回復進行中",
-                    "partial_snapshot": "部分系統備份",
                     "password": "系統備份密碼",
                     "password_protection": "密碼保護",
                     "select_type": "選擇所要回復內容",
@@ -4003,6 +4031,12 @@
                     "prompt_copy_token": "複製存取密鑰，將不會再次顯示。",
                     "prompt_name": "為權杖命名"
                 },
+                "mfa": {
+                    "confirm_disable": "確定要關閉{name}？",
+                    "disable": "關閉",
+                    "enable": "開啟",
+                    "header": "多步驟驗證模組"
+                },
                 "mfa_setup": {
                     "close": "關閉",
                     "step_done": "{step}已設定完成",
@@ -4010,12 +4044,6 @@
                     "title_aborted": "已中止",
                     "title_success": "成功！"
                 },
-                "mfa": {
-                    "confirm_disable": "確定要關閉{name}？",
-                    "disable": "關閉",
-                    "enable": "開啟",
-                    "header": "多步驟驗證模組"
-                },
                 "number_format": {
                     "description": "選擇數字顯示格式。",
                     "dropdown_label": "數字格式",
diff --git a/yarn.lock b/yarn.lock
index 50b861edd9..3b25b90ef6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1869,10 +1869,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lit/reactive-element@npm:^1.0.0-rc.2":
-  version: 1.0.0-rc.2
-  resolution: "@lit/reactive-element@npm:1.0.0-rc.2"
-  checksum: 89f9c912341a70d8b4318b5846ac5682f4aaa6b5135e6f8d69b37eb70d928cedfd1eca2df87bf3c37e735fd283374e1f978af6a152f60e6f0ef0e5607e30c208
+"@lit/reactive-element@npm:1.0.0-rc.3":
+  version: 1.0.0-rc.3
+  resolution: "@lit/reactive-element@npm:1.0.0-rc.3"
+  checksum: b86169dadde635e8d5b43543948f692036c88f3d07912d10f4812d6e5fea14d2c6f85f63031c135cfeb22eae3b0eba3489ebc0731ed9a882853fa33e5d3fb81a
   languageName: node
   linkType: hard
 
@@ -8950,7 +8950,7 @@ fsevents@~2.3.1:
     leaflet: ^1.7.1
     leaflet-draw: ^1.0.4
     lint-staged: ^11.0.1
-    lit: ^2.0.0-rc.2
+    lit: ^2.0.0-rc.3
     lit-analyzer: ^1.2.1
     lit-vaadin-helpers: ^0.1.3
     lodash.template: ^4.5.0
@@ -10523,22 +10523,22 @@ fsevents@~2.3.1:
   languageName: node
   linkType: hard
 
-"lit-element@npm:3.0.0-rc.2":
-  version: 3.0.0-rc.2
-  resolution: "lit-element@npm:3.0.0-rc.2"
+"lit-element@npm:3.0.0-rc.3":
+  version: 3.0.0-rc.3
+  resolution: "lit-element@npm:3.0.0-rc.3"
   dependencies:
     "@lit/reactive-element": ^1.0.0-rc.2
-    lit-html: ^2.0.0-rc.3
-  checksum: 983b1bcc2bdcafc2afbfe66fcbde49eddc379ec0e331b949b1676010eef4a9b06d1ef8b0d62077195f87d710996c257de4cbbd71f40501e81352c1f7da207bce
+    lit-html: ^2.0.0-rc.4
+  checksum: ad02be1c2e9b3df21bff287267cb3cd7cb879475db1c328fc2ee380316330d1c8faaac1ea302d931c1fbba2641cb10c3f95ca143be41b96390a4b158e0298bb7
   languageName: node
   linkType: hard
 
-"lit-html@npm:2.0.0-rc.3":
-  version: 2.0.0-rc.3
-  resolution: "lit-html@npm:2.0.0-rc.3"
+"lit-html@npm:2.0.0-rc.4":
+  version: 2.0.0-rc.4
+  resolution: "lit-html@npm:2.0.0-rc.4"
   dependencies:
     "@types/trusted-types": ^1.0.1
-  checksum: 6e7f6411f1749dd925d6bb2ff9af9d9fc5bede25c6cf3ef45b7d1fcd888a43096fa6be555fee43626ea1be1c2a82a282d73ce90a7465c775aed03bc1a8398cac
+  checksum: 31c1965f6b06f2d98d9cdd88ee0d90ada5256ff4259966ada0ef8ac46c5a1d382d304e67681243b2b7dac36bf5226dc378484fc4131c3f3b179340535b1ace31
   languageName: node
   linkType: hard
 
@@ -10551,14 +10551,14 @@ fsevents@~2.3.1:
   languageName: node
   linkType: hard
 
-"lit@npm:^2.0.0-rc.1, lit@npm:^2.0.0-rc.2":
-  version: 2.0.0-rc.2
-  resolution: "lit@npm:2.0.0-rc.2"
+"lit@npm:^2.0.0-rc.3":
+  version: 2.0.0-rc.3
+  resolution: "lit@npm:2.0.0-rc.3"
   dependencies:
     "@lit/reactive-element": ^1.0.0-rc.2
     lit-element: ^3.0.0-rc.2
-    lit-html: ^2.0.0-rc.3
-  checksum: 4adc81ee8836a5d2808408931cf7b7ff8de0851513c6120d1a0b980f2eaca735044db817fbe5b810b64e12a463656fdd63e4437760e219a6011c97f74996217f
+    lit-html: ^2.0.0-rc.4
+  checksum: 404d503d9d1745b6c5d2c93632b16ca7a2aaaabbfdd3974a98b653e519e08acff9507f853aa43de2061d8a7b235d1ca87620c11b729c67617c2e3008359a64c9
   languageName: node
   linkType: hard